This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via 1188993760d30ead0e04850f59d1918645f7399f (commit)
from cd6b5140f102b99b73c73a69cde8198c31200b88 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1188993760d30ead0e04850f59d1918645f7399f
commit 1188993760d30ead0e04850f59d1918645f7399f
Author: Franck Villaume <[email protected]>
Date: Mon Apr 30 18:30:24 2018 +0200
do not rely on ssl-off.inc since ssl-off.inc can make automatic https
redirection and vhost does not support https yet
diff --git a/src/templates/httpd.vhosts.tmpl b/src/templates/httpd.vhosts.tmpl
index 9890f7b..06fdb5a 100644
--- a/src/templates/httpd.vhosts.tmpl
+++ b/src/templates/httpd.vhosts.tmpl
@@ -11,5 +11,7 @@
</Directory>
Include ${FF__core__config_path}/httpd.conf.d/block-trace.inc
Include ${FF__core__config_path}/httpd.conf.d/log.inc
- Include ${FF__core__config_path}/httpd.conf.d/ssl-off.inc
+ <IfModule apache_ssl.c>
+ SSLDisable
+ </IfModule>
</VirtualHost>
-----------------------------------------------------------------------
Summary of changes:
src/templates/httpd.vhosts.tmpl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
