Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

make_project: don't generate Apache 2.4 directives because they break 2.2 

... but put in comments saying what changes are needed.
This commit is contained in:
David Anderson 2014-08-18 00:14:58 -07:00
parent bb25de5481
commit 2fa78ba328
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/make_project
View File

@ -324,15 +324,14 @@ print >>open(httpd_conf_template_filename,'w'), '''
# Note: projects/*/keys/ should NOT be readable! # Note: projects/*/keys/ should NOT be readable!
# in the following, "Order" and "Allow" are for Apache 2.2; # in the following, the "Order" and "Allow" lines are for Apache 2.2;
# "Require" is for Apache 2.4 # replace them with "Require all granted" for Apache 2.4
<Directory "%(proot)s/html"> <Directory "%(proot)s/html">
Options Indexes FollowSymlinks MultiViews Options Indexes FollowSymlinks MultiViews
AllowOverride AuthConfig AllowOverride AuthConfig
Order allow,deny Order allow,deny
Allow from all Allow from all
Require all granted
</Directory> </Directory>
<Directory "%(proot)s/cgi-bin"> <Directory "%(proot)s/cgi-bin">
@ -340,7 +339,6 @@ print >>open(httpd_conf_template_filename,'w'), '''
AllowOverride AuthConfig AllowOverride AuthConfig
Order allow,deny Order allow,deny
Allow from all Allow from all
Require all granted
</Directory> </Directory>
''' %locals() ''' %locals()