Skip to content
Snippets Groups Projects
Commit 4784d558 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'conf-forgotten' into 'develop' 

Add changes from install/tpl

See merge request ispconfig/ispconfig3!1136
parents d7151cce 9bd65ce9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
install/tpl/apache_ispconfig.conf.master
+ 1
− 1
View file @ 4784d558
...@@ -136,7 +136,7 @@ Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-know ...@@ -136,7 +136,7 @@ Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-know
Allow from all Allow from all
</tmpl_if> </tmpl_if>
<IfModule mpm_itk_module> <IfModule mpm_itk_module>
AssignUserId www-data www-data AssignUserId ispconfig ispconfig
</IfModule> </IfModule>
</Directory> </Directory>
......
server/conf/apache_ispconfig.conf.master
+ 84
− 58
View file @ 4784d558
...@@ -15,24 +15,24 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m ...@@ -15,24 +15,24 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
<Directory /var/www/clients> <Directory /var/www/clients>
AllowOverride None 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 denied Require all denied
<tmpl_else> <tmpl_else>
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
# Do not allow access to the root file system of the server for security reasons # Do not allow access to the root file system of the server for security reasons
<Directory /> <Directory />
Options -Indexes Options -Indexes
AllowOverride None 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 denied Require all denied
<tmpl_else> <tmpl_else>
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /var/www> <Directory /var/www>
...@@ -41,103 +41,103 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m ...@@ -41,103 +41,103 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
<Directory /var/www/conf> <Directory /var/www/conf>
AllowOverride None 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 denied Require all denied
<tmpl_else> <tmpl_else>
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
# Except of the following directories that contain website scripts # Except of the following directories that contain website scripts
<Directory /usr/share/phpmyadmin> <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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /usr/share/phpMyAdmin> <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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /srv/www/htdocs> <Directory /srv/www/htdocs>
<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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /usr/share/squirrelmail> <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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
# Allow access to mailman on OpenSuSE # Allow access to mailman on OpenSuSE
<Directory /usr/lib/mailman/cgi-bin> <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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /usr/lib/mailman/icons> <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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
<Directory /var/lib/mailman/archives/> <Directory /var/lib/mailman/archives/>
Options +FollowSymLinks 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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
# allow path to awstats and alias for awstats icons # allow path to awstats and alias for awstats icons
<Directory /usr/share/awstats> <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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
</Directory> </Directory>
Alias /awstats-icon "/usr/share/awstats/icon" Alias /awstats-icon "/usr/share/awstats/icon"
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge> <Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
<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 Require all granted
<tmpl_else> <tmpl_else>
Order allow,deny Order allow,deny
Allow from all Allow from all
</tmpl_if> </tmpl_if>
<IfModule mpm_itk_module> <IfModule mpm_itk_module>
AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'> AssignUserId ispconfig ispconfig
</IfModule> </IfModule>
</Directory> </Directory>
NameVirtualHost *:80 NameVirtualHost *:80
...@@ -145,3 +145,29 @@ NameVirtualHost *:443 ...@@ -145,3 +145,29 @@ NameVirtualHost *:443
<tmpl_loop name="ip_adresses"> <tmpl_loop name="ip_adresses">
NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"} NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
</tmpl_loop> </tmpl_loop>
<tmpl_if name='apache_version' op='>=' value='2.3.3' format='version'>
<IfModule mod_ssl.c>
<tmpl_var name="ssl_comment">SSLStaplingCache shmcb:/var/run/ocsp(128000)
</IfModule>
</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>
</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>
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