Skip to content

Commit 1da57c0

Browse files
author
Marius Cramer
committed
Changed {tmpl_if} to <tmpl_if> - coding guidelines
1 parent 101ed23 commit 1da57c0

File tree

3 files changed

+66
-66
lines changed

3 files changed

+66
-66
lines changed

‎server/conf/apache_apps.vhost.master‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<Directory {tmpl_var name='apps_vhost_dir'}>
2222
Options FollowSymLinks
2323
AllowOverride None
24-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
24+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
2525
Require all granted
26-
{tmpl_else}
26+
<tmpl_else>
2727
Order allow,deny
2828
Allow from all
29-
{/tmpl_if}
29+
</tmpl_if>
3030
</Directory>
3131
</IfModule>
3232

@@ -38,12 +38,12 @@
3838
AllowOverride AuthConfig Indexes Limit Options FileInfo
3939
AddHandler fcgid-script .php
4040
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
41-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
41+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
4242
Require all granted
43-
{tmpl_else}
43+
<tmpl_else>
4444
Order allow,deny
4545
Allow from all
46-
{/tmpl_if}
46+
</tmpl_if>
4747
</Directory>
4848
</IfModule>
4949

‎server/conf/apache_ispconfig.conf.master‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,100 +8,100 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
88

99
<Directory /var/www/clients>
1010
AllowOverride None
11-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
11+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
1212
Require all deny
13-
{tmpl_else}
13+
<tmpl_else>
1414
Order Deny,Allow
1515
Deny from all
16-
{/tmpl_if}
16+
</tmpl_if>
1717
</Directory>
1818

1919
# Do not allow access to the root file system of the server for security reasons
2020
<Directory />
2121
AllowOverride None
22-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
22+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
2323
Require all deny
24-
{tmpl_else}
24+
<tmpl_else>
2525
Order Deny,Allow
2626
Deny from all
27-
{/tmpl_if}
27+
</tmpl_if>
2828
</Directory>
2929

3030
<Directory /var/www/conf>
3131
AllowOverride None
32-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
32+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
3333
Require all deny
34-
{tmpl_else}
34+
<tmpl_else>
3535
Order Deny,Allow
3636
Deny from all
37-
{/tmpl_if}
37+
</tmpl_if>
3838
</Directory>
3939

4040
# Except of the following directories that contain website scripts
4141
<Directory /usr/share/phpmyadmin>
42-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
42+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
4343
Require all granted
44-
{tmpl_else}
44+
<tmpl_else>
4545
Order allow,deny
4646
Allow from all
47-
{/tmpl_if}
47+
</tmpl_if>
4848
</Directory>
4949

5050
<Directory /usr/share/phpMyAdmin>
51-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
51+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
5252
Require all granted
53-
{tmpl_else}
53+
<tmpl_else>
5454
Order allow,deny
5555
Allow from all
56-
{/tmpl_if}
56+
</tmpl_if>
5757
</Directory>
5858

5959
<Directory /usr/share/squirrelmail>
60-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
60+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
6161
Require all granted
62-
{tmpl_else}
62+
<tmpl_else>
6363
Order allow,deny
6464
Allow from all
65-
{/tmpl_if}
65+
</tmpl_if>
6666
</Directory>
6767

6868
# Allow access to mailman on OpenSuSE
6969
<Directory /usr/lib/mailman/cgi-bin>
70-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
70+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
7171
Require all granted
72-
{tmpl_else}
72+
<tmpl_else>
7373
Order allow,deny
7474
Allow from all
75-
{/tmpl_if}
75+
</tmpl_if>
7676
</Directory>
7777

7878
<Directory /usr/lib/mailman/icons>
79-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
79+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
8080
Require all granted
81-
{tmpl_else}
81+
<tmpl_else>
8282
Order allow,deny
8383
Allow from all
84-
{/tmpl_if}
84+
</tmpl_if>
8585
</Directory>
8686

8787
<Directory /var/lib/mailman/archives/>
8888
Options +FollowSymLinks
89-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
89+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
9090
Require all granted
91-
{tmpl_else}
91+
<tmpl_else>
9292
Order allow,deny
9393
Allow from all
94-
{/tmpl_if}
94+
</tmpl_if>
9595
</Directory>
9696

9797
# allow path to awstats and alias for awstats icons
9898
<Directory /usr/share/awstats>
99-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
99+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
100100
Require all granted
101-
{tmpl_else}
101+
<tmpl_else>
102102
Order allow,deny
103103
Allow from all
104-
{/tmpl_if}
104+
</tmpl_if>
105105
</Directory>
106106

107107
Alias /awstats-icon "/usr/share/awstats/icon"

‎server/conf/vhost.conf.master‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
33
AllowOverride None
4-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
4+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
55
Require all deny
6-
{tmpl_else}
6+
<tmpl_else>
77
Order Deny,Allow
88
Deny from all
9-
{/tmpl_if}
9+
</tmpl_if>
1010
</Directory>
1111

1212
<tmpl_loop name="vhosts">
@@ -59,12 +59,12 @@
5959
<Directory {tmpl_var name='web_document_root_www'}>
6060
Options FollowSymLinks
6161
AllowOverride <tmpl_var name='allow_override'>
62-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
62+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
6363
Require all granted
64-
{tmpl_else}
64+
<tmpl_else>
6565
Order allow,deny
6666
Allow from all
67-
{/tmpl_if}
67+
</tmpl_if>
6868
<tmpl_if name='ssi' op='==' value='y'>
6969

7070
# ssi enabled
@@ -74,25 +74,25 @@
7474
</tmpl_if>
7575
<tmpl_if name='php' op='==' value='no'>
7676
<Files ~ '.php[s3-6]{0,1}$'>
77-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
77+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
7878
Require all denied
79-
{tmpl_else}
79+
<tmpl_else>
8080
Order allow,deny
8181
Deny from all
8282
Allow from none
83-
{/tmpl_if}
83+
</tmpl_if>
8484
</Files>
8585
</tmpl_if>
8686
</Directory>
8787
<Directory {tmpl_var name='web_document_root'}>
8888
Options FollowSymLinks
8989
AllowOverride <tmpl_var name='allow_override'>
90-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
90+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
9191
Require all granted
92-
{tmpl_else}
92+
<tmpl_else>
9393
Order allow,deny
9494
Allow from all
95-
{/tmpl_if}
95+
</tmpl_if>
9696
<tmpl_if name='ssi' op='==' value='y'>
9797

9898
# ssi enabled
@@ -102,13 +102,13 @@
102102
</tmpl_if>
103103
<tmpl_if name='php' op='==' value='no'>
104104
<Files ~ '.php[s3-6]{0,1}$'>
105-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
105+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
106106
Require all denied
107-
{tmpl_else}
107+
<tmpl_else>
108108
Order allow,deny
109109
Deny from all
110110
Allow from none
111-
{/tmpl_if}
111+
</tmpl_if>
112112
</Files>
113113
</tmpl_if>
114114
</Directory>
@@ -161,12 +161,12 @@
161161
<tmpl_if name='cgi' op='==' value='y'>
162162
# cgi enabled
163163
<Directory {tmpl_var name='document_root'}/cgi-bin>
164-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
164+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
165165
Require all granted
166-
{tmpl_else}
166+
<tmpl_else>
167167
Order allow,deny
168168
Allow from all
169-
{/tmpl_if}
169+
</tmpl_if>
170170
</Directory>
171171
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
172172
AddHandler cgi-script .cgi
@@ -213,12 +213,12 @@
213213
Action php5-cgi /php5-cgi
214214
AddHandler php5-cgi .php .php3 .php4 .php5
215215
<Directory {tmpl_var name='cgi_starter_path'}>
216-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
216+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
217217
Require all granted
218-
{tmpl_else}
218+
<tmpl_else>
219219
Order allow,deny
220220
Allow from all
221-
{/tmpl_if}
221+
</tmpl_if>
222222
</Directory>
223223
</tmpl_if>
224224
<tmpl_if name='php' op='==' value='fast-cgi'>
@@ -252,35 +252,35 @@
252252
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
253253
Options +ExecCGI
254254
AllowOverride <tmpl_var name='allow_override'>
255-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
255+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
256256
Require all granted
257-
{tmpl_else}
257+
<tmpl_else>
258258
Order allow,deny
259259
Allow from all
260-
{/tmpl_if}
260+
</tmpl_if>
261261
</Directory>
262262
<Directory {tmpl_var name='web_document_root'}>
263263
AddHandler fcgid-script .php .php3 .php4 .php5
264264
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
265265
Options +ExecCGI
266266
AllowOverride <tmpl_var name='allow_override'>
267-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
267+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
268268
Require all granted
269-
{tmpl_else}
269+
<tmpl_else>
270270
Order allow,deny
271271
Allow from all
272-
{/tmpl_if}
272+
</tmpl_if>
273273
</Directory>
274274
</tmpl_if>
275275
<tmpl_if name='php' op='==' value='php-fpm'>
276276
<IfModule mod_fastcgi.c>
277277
<Directory {tmpl_var name='document_root'}/cgi-bin>
278-
{tmpl_if name='apache_version' op='>' value='2.2' format='version'}
278+
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
279279
Require all granted
280-
{tmpl_else}
280+
<tmpl_else>
281281
Order allow,deny
282282
Allow from all
283-
{/tmpl_if}
283+
</tmpl_if>
284284
</Directory>
285285
AddHandler php5-fcgi .php
286286
Action php5-fcgi /php5-fcgi

0 commit comments

Comments
 (0)