From c6c3d3bf65d57299dacdfb5b279824b913a9d264 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Sun, 17 Jan 2016 00:41:07 +0100 Subject: [PATCH] Bug 15303 Followup: apache port 80 servername/alias and typo --- debian/docs/koha-create.xml | 2 +- debian/templates/apache-site-https.conf.in | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml index ad78f87..a485ba8 100644 --- a/debian/docs/koha-create.xml +++ b/debian/docs/koha-create.xml @@ -180,7 +180,7 @@ - Set up a https-only website with letsencrypt cerificates + Set up a https-only website with letsencrypt certificates diff --git a/debian/templates/apache-site-https.conf.in b/debian/templates/apache-site-https.conf.in index a5c28f0..44a4fc8 100644 --- a/debian/templates/apache-site-https.conf.in +++ b/debian/templates/apache-site-https.conf.in @@ -2,9 +2,11 @@ # redirect http to https # #nohttps -# RewriteEngine On #nohttps -# RewriteCond %{HTTPS} !=on #nohttps -# RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] #nohttps +# ServerName __OPACSERVER__ #nohttps +# ServerAlias __INTRASERVER__ #nohttps +# RewriteEngine On #nohttps +# RewriteCond %{HTTPS} !=on #nohttps +# RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] #nohttps # #nohttps # OPAC -- 2.1.4