Skip to content

Commit 6910f4e

Browse files
d--jd--j
committed
copy install/tpl/apache_ispconfig.conf.master to server/conf/apache_ispconfig.conf.master
 If you add/remove server IPs the file `/etc/apache2/sites-available/ispconfig.conf` gets recreated and it is missing the alias for Let's Encrypt ACME challenges. Copying over the current install template fixes that. Maybe one could remove this template duplication completely by using `server/conf/apache_ispconfig.conf.master` in the install process? The `Header set Content-Type "text/plain"` was only in `server/conf/apache_ispconfig.conf.master` and not in `install/tpl/apache_ispconfig.conf.master` – is it necessary?
1 parent 2b77ca2 commit 6910f4e

File tree

1 file changed

+64
-58
lines changed

1 file changed

+64
-58
lines changed

‎server/conf/apache_ispconfig.conf.master‎

Lines changed: 64 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,129 +3,135 @@
33
# ISPConfig Logfile configuration for vlogger
44
################################################
55

6-
LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
7-
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
6+
SetEnvIf Request_URI "^/datalogstatus.php$" dontlog
87

9-
<IfModule mod_headers.c>
10-
<LocationMatch "/.well-known/acme-challenge/*">
11-
Header set Content-Type "text/plain"
12-
</LocationMatch>
13-
</IfModule>
8+
LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
9+
CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
1410

1511
<Directory /var/www/clients>
1612
AllowOverride None
17-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
18-
Require all denied
19-
<tmpl_else>
20-
Order Deny,Allow
21-
Deny from all
22-
</tmpl_if>
13+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
14+
Require all denied
15+
<tmpl_else>
16+
Order Deny,Allow
17+
Deny from all
18+
</tmpl_if>
2319
</Directory>
2420

2521
# Do not allow access to the root file system of the server for security reasons
2622
<Directory />
23+
Options -Indexes
2724
AllowOverride None
28-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
29-
Require all denied
30-
<tmpl_else>
31-
Order Deny,Allow
32-
Deny from all
33-
</tmpl_if>
25+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
26+
Require all denied
27+
<tmpl_else>
28+
Order Deny,Allow
29+
Deny from all
30+
</tmpl_if>
3431
</Directory>
3532

3633
<Directory /var/www/conf>
3734
AllowOverride None
38-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
39-
Require all denied
40-
<tmpl_else>
41-
Order Deny,Allow
42-
Deny from all
43-
</tmpl_if>
35+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
36+
Require all denied
37+
<tmpl_else>
38+
Order Deny,Allow
39+
Deny from all
40+
</tmpl_if>
4441
</Directory>
4542

4643
# Except of the following directories that contain website scripts
4744
<Directory /usr/share/phpmyadmin>
48-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
49-
Require all granted
50-
<tmpl_else>
45+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
46+
Require all granted
47+
<tmpl_else>
5148
Order allow,deny
5249
Allow from all
53-
</tmpl_if>
50+
</tmpl_if>
5451
</Directory>
5552

5653
<Directory /usr/share/phpMyAdmin>
57-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
58-
Require all granted
59-
<tmpl_else>
54+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
55+
Require all granted
56+
<tmpl_else>
6057
Order allow,deny
6158
Allow from all
62-
</tmpl_if>
59+
</tmpl_if>
6360
</Directory>
6461

6562
<Directory /srv/www/htdocs>
66-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
67-
Require all granted
68-
<tmpl_else>
63+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
64+
Require all granted
65+
<tmpl_else>
6966
Order allow,deny
7067
Allow from all
71-
</tmpl_if>
68+
</tmpl_if>
7269
</Directory>
7370

7471
<Directory /usr/share/squirrelmail>
75-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
76-
Require all granted
77-
<tmpl_else>
72+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
73+
Require all granted
74+
<tmpl_else>
7875
Order allow,deny
7976
Allow from all
80-
</tmpl_if>
77+
</tmpl_if>
8178
</Directory>
8279

8380
# Allow access to mailman on OpenSuSE
8481
<Directory /usr/lib/mailman/cgi-bin>
85-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
86-
Require all granted
87-
<tmpl_else>
82+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
83+
Require all granted
84+
<tmpl_else>
8885
Order allow,deny
8986
Allow from all
90-
</tmpl_if>
87+
</tmpl_if>
9188
</Directory>
9289

9390
<Directory /usr/lib/mailman/icons>
94-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
95-
Require all granted
96-
<tmpl_else>
91+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
92+
Require all granted
93+
<tmpl_else>
9794
Order allow,deny
9895
Allow from all
99-
</tmpl_if>
96+
</tmpl_if>
10097
</Directory>
10198

10299
<Directory /var/lib/mailman/archives/>
103100
Options +FollowSymLinks
104-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
105-
Require all granted
106-
<tmpl_else>
101+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
102+
Require all granted
103+
<tmpl_else>
107104
Order allow,deny
108105
Allow from all
109-
</tmpl_if>
106+
</tmpl_if>
110107
</Directory>
111108

112109
# allow path to awstats and alias for awstats icons
113110
<Directory /usr/share/awstats>
114-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
115-
Require all granted
116-
<tmpl_else>
111+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
112+
Require all granted
113+
<tmpl_else>
117114
Order allow,deny
118115
Allow from all
119-
</tmpl_if>
116+
</tmpl_if>
120117
</Directory>
121118

122119
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
123120
Alias /awstats-icon "/usr/share/awstats/icon"
124121
</tmpl_if>
125122

123+
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
124+
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
125+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
126+
Require all granted
127+
<tmpl_else>
128+
Order allow,deny
129+
Allow from all
130+
</tmpl_if>
131+
</Directory>
132+
126133
NameVirtualHost *:80
127134
NameVirtualHost *:443
128135
<tmpl_loop name="ip_adresses">
129136
NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
130137
</tmpl_loop>
131-

0 commit comments

Comments
 (0)