Skip to content
Snippets Groups Projects
Commit 06f989c6 authored by jurgenhaas's avatar jurgenhaas
Browse files

Cleanup

parent cd87b296
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
templates/etc-apache2-sites-available-default
+ 30
− 30
View file @ 06f989c6
<VirtualHost *:80>
ServerAdmin {{apache_server_admin}}
ServerAdmin {{apache_server_admin}}
DocumentRoot /var/www/{{apache_server_default_root}}
DocumentRoot /var/www/{{apache_server_default_root}}
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/{{apache_server_default_root}}/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/{{apache_server_default_root}}/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
{% if apache_auth %}
AuthType {{apache_auth.type}}
AuthName "{{apache_auth.name}}"
AuthUserFile /var/www/passwords/{{apache_auth.user}}
Require user {{apache_auth.user}}
AuthType {{apache_auth.type}}
AuthName "{{apache_auth.name}}"
AuthUserFile /var/www/passwords/{{apache_auth.user}}
Require user {{apache_auth.user}}
{% else %}
Order allow,deny
allow from all
Order allow,deny
allow from all
{% endif %}
</Directory>
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog ${APACHE_LOG_DIR}/access.log combined env=!forwarded
CustomLog ${APACHE_LOG_DIR}/access.log proxy env=forwarded
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog ${APACHE_LOG_DIR}/access.log combined env=!forwarded
CustomLog ${APACHE_LOG_DIR}/access.log proxy env=forwarded
Alias /apc-status /var/www/apc/apc.php
<Directory "/var/www/apc/apc.php">
Options Indexes MultiViews FollowSymLinks
AllowOverride All
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
</Directory>
Alias /apc-status /var/www/apc/apc.php
<Directory "/var/www/apc/apc.php">
Options Indexes MultiViews FollowSymLinks
AllowOverride All
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
</Directory>
{% for alias in apache_server_default_aliases %}
Alias /sysadmin/ "/var/www/{{alias.path}}/"
......
templates/etc-apache2-sites-available-default-ssl
+ 29
− 29
View file @ 06f989c6
......@@ -5,27 +5,27 @@ NameVirtualHost *:443
{% if certs.domain is defined %}
ServerName {{ certs.domain }}
{% endif %}
ServerAdmin {{apache_server_admin}}
ServerAdmin {{apache_server_admin}}
DocumentRoot /var/www/{{apache_server_default_root}}
DocumentRoot /var/www/{{apache_server_default_root}}
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/{{apache_server_default_root}}/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/{{apache_server_default_root}}/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined env=!forwarded
CustomLog ${APACHE_LOG_DIR}/ssl_access.log proxy env=forwarded
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined env=!forwarded
CustomLog ${APACHE_LOG_DIR}/ssl_access.log proxy env=forwarded
{% for alias in apache_server_default_aliases %}
Alias /sysadmin/ "/var/www/{{alias.path}}/"
......@@ -42,17 +42,17 @@ NameVirtualHost *:443
{{cert.type}} /etc/ssl/private/{{cert.file}}
{% endfor %}
<FilesMatch "\.(cgi|shtml|phtml|php)$">
SSLOptions +StdEnvVars
</FilesMatch>
<Directory /usr/lib/cgi-bin>
SSLOptions +StdEnvVars
</Directory>
BrowserMatch "MSIE [2-6]" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
# MSIE 7 and newer should be able to use keepalive
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
<FilesMatch "\.(cgi|shtml|phtml|php)$">
SSLOptions +StdEnvVars
</FilesMatch>
<Directory /usr/lib/cgi-bin>
SSLOptions +StdEnvVars
</Directory>
BrowserMatch "MSIE [2-6]" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
# MSIE 7 and newer should be able to use keepalive
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
</VirtualHost>
{% if certs.redirects is defined %}
{% for alias in certs.redirects %}
......
templates/etc-apache2-sites-available-vhost
+ 16
− 16
View file @ 06f989c6
<VirtualHost *:80>
ServerAdmin {{apache_server_admin}}
ServerName {{item.domain}}
ServerAlias {{item.alias}}
ServerAdmin {{apache_server_admin}}
ServerName {{item.domain}}
ServerAlias {{item.alias}}
DocumentRoot /var/www/{{item.path}}
DocumentRoot /var/www/{{item.path}}
<Directory /var/www/{{item.path}}/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
<Directory /var/www/{{item.path}}/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog ${APACHE_LOG_DIR}/access.log combined env=!forwarded
CustomLog ${APACHE_LOG_DIR}/access.log proxy env=forwarded
ErrorLog ${APACHE_LOG_DIR}/error.log
LogLevel warn
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog ${APACHE_LOG_DIR}/access.log combined env=!forwarded
CustomLog ${APACHE_LOG_DIR}/access.log proxy env=forwarded
{% for alias in item.aliases %}
Alias /sysadmin/ "/var/www/{{alias.path}}/"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment