From 1da57c0728fab8c5cf20fab2c091b1686f5bd838 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 07 Feb 2014 03:54:48 -0500 Subject: [PATCH] Changed {tmpl_if} to <tmpl_if> - coding guidelines --- server/conf/vhost.conf.master | 60 ++++++++++---------- server/conf/apache_apps.vhost.master | 12 ++-- server/conf/apache_ispconfig.conf.master | 60 ++++++++++---------- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/server/conf/apache_apps.vhost.master b/server/conf/apache_apps.vhost.master index 49f829a..99665df 100644 --- a/server/conf/apache_apps.vhost.master +++ b/server/conf/apache_apps.vhost.master @@ -21,12 +21,12 @@ <Directory {tmpl_var name='apps_vhost_dir'}> Options FollowSymLinks AllowOverride None - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> </IfModule> @@ -38,12 +38,12 @@ AllowOverride AuthConfig Indexes Limit Options FileInfo AddHandler fcgid-script .php FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> </IfModule> diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master index a615198..f9062f5 100644 --- a/server/conf/apache_ispconfig.conf.master +++ b/server/conf/apache_ispconfig.conf.master @@ -8,100 +8,100 @@ <Directory /var/www/clients> AllowOverride None - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all deny - {tmpl_else} + <tmpl_else> Order Deny,Allow Deny from all - {/tmpl_if} + </tmpl_if> </Directory> # Do not allow access to the root file system of the server for security reasons <Directory /> AllowOverride None - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all deny - {tmpl_else} + <tmpl_else> Order Deny,Allow Deny from all - {/tmpl_if} + </tmpl_if> </Directory> <Directory /var/www/conf> AllowOverride None - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all deny - {tmpl_else} + <tmpl_else> Order Deny,Allow Deny from all - {/tmpl_if} + </tmpl_if> </Directory> # Except of the following directories that contain website scripts <Directory /usr/share/phpmyadmin> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> <Directory /usr/share/phpMyAdmin> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> <Directory /usr/share/squirrelmail> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> # Allow access to mailman on OpenSuSE <Directory /usr/lib/mailman/cgi-bin> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> <Directory /usr/lib/mailman/icons> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> <Directory /var/lib/mailman/archives/> Options +FollowSymLinks - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> # allow path to awstats and alias for awstats icons <Directory /usr/share/awstats> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> Alias /awstats-icon "/usr/share/awstats/icon" diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index 0f8a79a..035f3a5 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -1,12 +1,12 @@ <Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}> AllowOverride None - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all deny - {tmpl_else} + <tmpl_else> Order Deny,Allow Deny from all - {/tmpl_if} + </tmpl_if> </Directory> <tmpl_loop name="vhosts"> @@ -59,12 +59,12 @@ <Directory {tmpl_var name='web_document_root_www'}> Options FollowSymLinks AllowOverride <tmpl_var name='allow_override'> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> <tmpl_if name='ssi' op='==' value='y'> # ssi enabled @@ -74,25 +74,25 @@ </tmpl_if> <tmpl_if name='php' op='==' value='no'> <Files ~ '.php[s3-6]{0,1}$'> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all denied - {tmpl_else} + <tmpl_else> Order allow,deny Deny from all Allow from none - {/tmpl_if} + </tmpl_if> </Files> </tmpl_if> </Directory> <Directory {tmpl_var name='web_document_root'}> Options FollowSymLinks AllowOverride <tmpl_var name='allow_override'> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> <tmpl_if name='ssi' op='==' value='y'> # ssi enabled @@ -102,13 +102,13 @@ </tmpl_if> <tmpl_if name='php' op='==' value='no'> <Files ~ '.php[s3-6]{0,1}$'> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all denied - {tmpl_else} + <tmpl_else> Order allow,deny Deny from all Allow from none - {/tmpl_if} + </tmpl_if> </Files> </tmpl_if> </Directory> @@ -161,12 +161,12 @@ <tmpl_if name='cgi' op='==' value='y'> # cgi enabled <Directory {tmpl_var name='document_root'}/cgi-bin> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/ AddHandler cgi-script .cgi @@ -213,12 +213,12 @@ Action php5-cgi /php5-cgi AddHandler php5-cgi .php .php3 .php4 .php5 <Directory {tmpl_var name='cgi_starter_path'}> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> </tmpl_if> <tmpl_if name='php' op='==' value='fast-cgi'> @@ -252,35 +252,35 @@ FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php Options +ExecCGI AllowOverride <tmpl_var name='allow_override'> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> <Directory {tmpl_var name='web_document_root'}> AddHandler fcgid-script .php .php3 .php4 .php5 FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php Options +ExecCGI AllowOverride <tmpl_var name='allow_override'> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> </tmpl_if> <tmpl_if name='php' op='==' value='php-fpm'> <IfModule mod_fastcgi.c> <Directory {tmpl_var name='document_root'}/cgi-bin> - {tmpl_if name='apache_version' op='>' value='2.2' format='version'} + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> Require all granted - {tmpl_else} + <tmpl_else> Order allow,deny Allow from all - {/tmpl_if} + </tmpl_if> </Directory> AddHandler php5-fcgi .php Action php5-fcgi /php5-fcgi -- Gitblit v1.9.1