kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 335_phpmyadmin_sso_broken

This commit is contained in:
Kienan Stewart 2019-05-14 12:19:39 -04:00
parent f3207ec2f1 845a6b7f72
commit caae003c60
No known key found for this signature in database
GPG Key ID: 075A846E78FE47EA
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/alternc/templates/apache2/vhost-both.conf
View File

@ -11,7 +11,7 @@
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" ' php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
php_admin_flag mail.add_x_header on php_admin_flag mail.add_x_header on
Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
AllowOverride AuthConfig FileInfo Limit Options Indexes AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
</Directory> </Directory>
</VirtualHost> </VirtualHost>
@ -29,7 +29,7 @@
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" ' php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
php_admin_flag mail.add_x_header on php_admin_flag mail.add_x_header on
Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
AllowOverride AuthConfig FileInfo Limit Options Indexes AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
</Directory> </Directory>
SSLEngine On SSLEngine On

2
etc/alternc/templates/apache2/vhost-http.conf
View File

@ -30,7 +30,7 @@
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" ' php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
php_admin_flag mail.add_x_header on php_admin_flag mail.add_x_header on
Options -MultiViews -FollowSymLinks +SymLinksIfOwnerMatch Options -MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
AllowOverride AuthConfig FileInfo Limit Options Indexes AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
Order allow,deny Order allow,deny
Allow from all Allow from all
Require all granted Require all granted

2
etc/alternc/templates/apache2/vhost-https.conf
View File

@ -24,7 +24,7 @@
php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" ' php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
php_admin_flag mail.add_x_header on php_admin_flag mail.add_x_header on
Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
AllowOverride AuthConfig FileInfo Limit Options Indexes AllowOverride AuthConfig FileInfo Limit Options Indexes Options=All,MultiViews
</Directory> </Directory>
SSLEngine On SSLEngine On