1 |
brianr |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web |
2 |
|
|
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2009-02-04 12:14:05.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2009-02-11 09:36:32.000000000 +0100 |
4 |
|
|
@@ -1,5 +1,7 @@ |
5 |
|
|
{ |
6 |
|
|
-if ((${'zabbix-server'}{'status'} || 'disabled') eq 'enabled'){ |
7 |
|
|
+if ( |
8 |
|
|
+ ((${'zabbix-server'}{'status'} || 'disabled') eq 'enabled') && |
9 |
|
|
+ ((${'zabbix-server'}{'WebAccess'} || 'local') ne 'disabled')){ |
10 |
|
|
|
11 |
|
|
my $access = (${'zabbix-server'}{'WebAccess'} || 'local') eq 'public' ? |
12 |
|
|
'all':"$localAccess $externalSSLAccess"; |