From 4b8423141f3019baf2375fb2b6a225a21ade2168 Mon Sep 17 00:00:00 2001 From: marceljd Date: Thu, 7 Feb 2019 15:32:01 +0000 Subject: [PATCH] On branch apache-ssl Changes to be committed: modified: .config/000-default.conf modified: 13.0/apache/config/000-default.conf modified: 13.0/fpm-alpine/config/000-default.conf modified: 13.0/fpm/config/000-default.conf modified: 14.0/apache/config/000-default.conf modified: 14.0/fpm-alpine/config/000-default.conf modified: 14.0/fpm/config/000-default.conf modified: 15.0/apache/config/000-default.conf modified: 15.0/fpm-alpine/config/000-default.conf modified: 15.0/fpm/config/000-default.conf Signed-off-by: marceljd --- .config/000-default.conf | 3 ++- 13.0/apache/config/000-default.conf | 3 ++- 13.0/fpm-alpine/config/000-default.conf | 3 ++- 13.0/fpm/config/000-default.conf | 3 ++- 14.0/apache/config/000-default.conf | 3 ++- 14.0/fpm-alpine/config/000-default.conf | 3 ++- 14.0/fpm/config/000-default.conf | 3 ++- 15.0/apache/config/000-default.conf | 3 ++- 15.0/fpm-alpine/config/000-default.conf | 3 ++- 15.0/fpm/config/000-default.conf | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.config/000-default.conf b/.config/000-default.conf index 444bb399..02478a16 100644 --- a/.config/000-default.conf +++ b/.config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/13.0/apache/config/000-default.conf b/13.0/apache/config/000-default.conf index 444bb399..02478a16 100644 --- a/13.0/apache/config/000-default.conf +++ b/13.0/apache/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/13.0/fpm-alpine/config/000-default.conf b/13.0/fpm-alpine/config/000-default.conf index 444bb399..02478a16 100644 --- a/13.0/fpm-alpine/config/000-default.conf +++ b/13.0/fpm-alpine/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/13.0/fpm/config/000-default.conf b/13.0/fpm/config/000-default.conf index 444bb399..02478a16 100644 --- a/13.0/fpm/config/000-default.conf +++ b/13.0/fpm/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/14.0/apache/config/000-default.conf b/14.0/apache/config/000-default.conf index 444bb399..02478a16 100644 --- a/14.0/apache/config/000-default.conf +++ b/14.0/apache/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/14.0/fpm-alpine/config/000-default.conf b/14.0/fpm-alpine/config/000-default.conf index 444bb399..02478a16 100644 --- a/14.0/fpm-alpine/config/000-default.conf +++ b/14.0/fpm-alpine/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/14.0/fpm/config/000-default.conf b/14.0/fpm/config/000-default.conf index 444bb399..02478a16 100644 --- a/14.0/fpm/config/000-default.conf +++ b/14.0/fpm/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/15.0/apache/config/000-default.conf b/15.0/apache/config/000-default.conf index 444bb399..02478a16 100644 --- a/15.0/apache/config/000-default.conf +++ b/15.0/apache/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/15.0/fpm-alpine/config/000-default.conf b/15.0/fpm-alpine/config/000-default.conf index 444bb399..02478a16 100644 --- a/15.0/fpm-alpine/config/000-default.conf +++ b/15.0/fpm-alpine/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] diff --git a/15.0/fpm/config/000-default.conf b/15.0/fpm/config/000-default.conf index 444bb399..02478a16 100644 --- a/15.0/fpm/config/000-default.conf +++ b/15.0/fpm/config/000-default.conf @@ -1,5 +1,6 @@ - Redirect / https://${SERVER_NAME} + RewriteEngine on + RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]