From 6e0b35c4664e9a4044e4a48c5b888f86e653a22e Mon Sep 17 00:00:00 2001 From: CSoellinger <dev@csoellinger.at> Date: Wed, 27 Apr 2016 22:03:35 +0200 Subject: [PATCH] Reformat some tabs to spaces(2) --- install/tpl/apache_ispconfig.vhost.master | 72 +++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master index 4503811ed5..7dce3c7aeb 100644 --- a/install/tpl/apache_ispconfig.vhost.master +++ b/install/tpl/apache_ispconfig.vhost.master @@ -8,54 +8,54 @@ NameVirtualHost *:<tmpl_var name="vhost_port"> <VirtualHost _default_:<tmpl_var name="vhost_port">> ServerAdmin webmaster@localhost - + <FilesMatch "\.ph(p3?|tml)$"> SetHandler None </FilesMatch> - + <IfModule mod_fcgid.c> DocumentRoot /var/www/ispconfig/ SuexecUserGroup ispconfig ispconfig <Directory /var/www/ispconfig/> Options -Indexes +FollowSymLinks +MultiViews +ExecCGI AllowOverride AuthConfig Indexes Limit Options FileInfo - <FilesMatch "\.php$"> - SetHandler fcgid-script - </FilesMatch> + <FilesMatch "\.php$"> + SetHandler fcgid-script + </FilesMatch> FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all granted - <tmpl_else> + Require all granted + <tmpl_else> Order allow,deny Allow from all - </tmpl_if> + </tmpl_if> </Directory> IPCCommTimeout 7200 - MaxRequestLen 15728640 + MaxRequestLen 15728640 </IfModule> - + <IfModule mpm_itk_module> DocumentRoot /usr/local/ispconfig/interface/web/ - AssignUserId ispconfig ispconfig + AssignUserId ispconfig ispconfig AddType application/x-httpd-php .php <Directory /usr/local/ispconfig/interface/web> # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp" Options +FollowSymLinks AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all granted - <tmpl_else> + Require all granted + <tmpl_else> Order allow,deny Allow from all - </tmpl_if> - php_value magic_quotes_gpc 0 + </tmpl_if> + php_value magic_quotes_gpc 0 </Directory> </IfModule> - + # ErrorLog /var/log/apache2/error.log # CustomLog /var/log/apache2/access.log combined ServerSignature Off - + <IfModule mod_security2.c> SecRuleEngine Off </IfModule> @@ -74,10 +74,10 @@ NameVirtualHost *:<tmpl_var name="vhost_port"> Header always add Strict-Transport-Security "max-age=15768000" </IfModule> -<tmpl_if name='apache_version' op='>=' value='2.4' format='version'> - <tmpl_var name="ssl_comment">SSLUseStapling on - <tmpl_var name="ssl_comment">SSLStaplingResponderTimeout 5 - <tmpl_var name="ssl_comment">SSLStaplingReturnResponderErrors off +<tmpl_if name='apache_version' op='>=' value='1.4' format='version'> +<tmpl_var name="ssl_comment">SSLUseStapling on +<tmpl_var name="ssl_comment">SSLStaplingResponderTimeout 5 +<tmpl_var name="ssl_comment">SSLStaplingReturnResponderErrors off </tmpl_if> </VirtualHost> @@ -88,21 +88,21 @@ NameVirtualHost *:<tmpl_var name="vhost_port"> </tmpl_if> <Directory /var/www/php-cgi-scripts> - AllowOverride None - <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all denied - <tmpl_else> - Order Deny,Allow - Deny from all - </tmpl_if> + AllowOverride None + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> + Require all denied + <tmpl_else> + Order Deny,Allow + Deny from all + </tmpl_if> </Directory> <Directory /var/www/php-fcgi-scripts> - AllowOverride None - <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all denied - <tmpl_else> - Order Deny,Allow - Deny from all - </tmpl_if> -</Directory> \ No newline at end of file + AllowOverride None + <tmpl_if name='apache_version' op='>' value='2.2' format='version'> + Require all denied + <tmpl_else> + Order Deny,Allow + Deny from all + </tmpl_if> +</Directory> -- GitLab