[DRE-commits] [diaspora-installer] 01/02: add www. to nginx conf

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 56ac01cdd6a02819dd7d96576ff5ef5669f45e84
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Dec 30 23:12:50 2016 +0530

    add www. to nginx conf
---
 nginx.conf.example | 4 ++--
 set-env-nginx.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nginx.conf.example b/nginx.conf.example
index 29542a6..5a260a2 100644
--- a/nginx.conf.example
+++ b/nginx.conf.example
@@ -4,13 +4,13 @@ upstream domain11 {
 
 server {
 	listen		80;
-	server_name	SERVERNAME_FIXME;
+	server_name	SERVERNAME_FIXME www.SERVERNAME_FIXME;
 	rewrite		^ https://$server_name$request_uri? permanent;
 }
 
 server {
             listen   	443;
-            server_name SERVERNAME_FIXME;
+            server_name SERVERNAME_FIXME www.SERVERNAME_FIXME;
 
             proxy_set_header   X-Real-IP  $remote_addr;
             proxy_set_header   X-FORWARDED-PROTO https;
diff --git a/set-env-nginx.sh b/set-env-nginx.sh
index 87aaee7..9bb36b0 100755
--- a/set-env-nginx.sh
+++ b/set-env-nginx.sh
@@ -12,7 +12,7 @@ if test -f /etc/nginx/sites-available/diaspora; then
   echo "/etc/nginx/sites-available/diaspora already exist, skipping nginx configuration..."
 else
   if test -f ${nginx_conf_example}; then
-    sed -e "s/SERVERNAME_FIXME/$1/" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
+    sed -e "s/SERVERNAME_FIXME/$1/g" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
     -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/"\
     ${nginx_conf_example} >/etc/nginx/sites-available/diaspora
     ln -fs /etc/nginx/sites-available/diaspora /etc/nginx/sites-enabled/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git