summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-11-11 13:57:38 (GMT)
committerRenato Botelho <garga@FreeBSD.org>2014-11-11 13:57:38 (GMT)
commit992f60d0fb3f309dafe5465f69c1af45a839d227 (patch)
tree48055b8f8d919590ded77a8b9fc5bd7fe92e2ada
parenteacdbc4d6a41690fc6e703f767eee573c7e046c6 (diff)
downloadunivnautes-992f60d0fb3f309dafe5465f69c1af45a839d227.zip
univnautes-992f60d0fb3f309dafe5465f69c1af45a839d227.tar.gz
univnautes-992f60d0fb3f309dafe5465f69c1af45a839d227.tar.bz2
Set proxy env vars on interactive shell and also on crontab to make all scripts be able to use it. Ticket #3789
-rw-r--r--etc/inc/services.inc7
-rw-r--r--root/.shrc9
-rw-r--r--root/.tcshrc9
3 files changed, 25 insertions, 0 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 608d412..2ab55ec 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -2272,6 +2272,13 @@ function configure_cron() {
$crontab_contents .= "# " .gettext( "Created:") . " " . date("F j, Y, g:i a") . "\n";
$crontab_contents .= "#\n";
+ if (isset($config['system']['proxyurl']) && !empty($config['system']['proxyurl'])) {
+ $http_proxy = $config['system']['proxyurl'];
+ if (isset($config['system']['proxyport']) && !empty($config['system']['proxyport']))
+ $http_proxy .= ':' . $config['system']['proxyport'];
+ $crontab_contents .= "HTTP_PROXY={$http_proxy}";
+ }
+
foreach ($config['cron']['item'] as $item) {
$crontab_contents .= "\n{$item['minute']}\t";
$crontab_contents .= "{$item['hour']}\t";
diff --git a/root/.shrc b/root/.shrc
index 700597a..6f3c2fc 100644
--- a/root/.shrc
+++ b/root/.shrc
@@ -1,3 +1,12 @@
+HTTP_PROXY=`/usr/local/bin/xmllint --xpath 'string(//pfsense/system/proxyurl)' /conf/config.xml`
+if [ "${HTTP_PROXY}" != "" ]; then
+ HTTP_PROXY_PORT=`/usr/local/bin/xmllint --xpath 'string(//pfsense/system/proxyport)' /conf/config.xml`
+ if [ "${HTTP_PROXY_PORT}" != "" ]; then
+ HTTP_PROXY="${HTTP_PROXY}:${HTTP_PROXY_PORT}"
+ fi
+ export HTTP_PROXY
+fi
+
# Detect interactive logins and display the shell
if [ -n "${SSH_TTY}" -o "${TERM}" = "cons25" ]; then
/etc/rc.initial
diff --git a/root/.tcshrc b/root/.tcshrc
index e03cc94..38cf897 100644
--- a/root/.tcshrc
+++ b/root/.tcshrc
@@ -19,3 +19,12 @@ if ($term == "xterm" || $term == "vt100" || $term == "vt102" || $term == "vt220"
bindkey "\e[7~" beginning-of-line # Home rxvt/konsole
bindkey "\e[8~" end-of-line # End rxvt/konsole
endif
+
+set http_proxy=`/usr/local/bin/xmllint --xpath 'string(//pfsense/system/proxyurl)' /conf/config.xml`
+if (${http_proxy} != "") then
+ set http_proxy_port=`/usr/local/bin/xmllint --xpath 'string(//pfsense/system/proxyport)' /conf/config.xml`
+ if (${http_proxy_port} != "") then
+ set http_proxy="${http_proxy}:${http_proxy_port}"
+ endif
+ setenv HTTP_PROXY ${http_proxy}
+endif