From af6577c93f361d221722f75edad4e7e41bbfee57 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Tue, 22 Jul 2014 20:17:34 +0530
Subject: [PATCH] removed GITLAB_SUPPORT configuration option

---
 Changelog.md | 1 +
 README.md    | 5 ++---
 assets/init  | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 94308207..692dbcb1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 # Changelog
 
 **latest**
+- removed GITLAB_SUPPORT configuration option
 - upgrade to gitlab-ce 7.1.0
 - clone gitlab-ce and gitlab-shell sources from the git repo.
 - disable pam authentication module in sshd
diff --git a/README.md b/README.md
index eda3a3d0..505ee2a3 100644
--- a/README.md
+++ b/README.md
@@ -555,7 +555,7 @@ By default, our own server certificate [gitlab.crt](#generation-of-self-signed-c
 docker run --name=gitlab -d -h git.local.host \
   -v /opt/gitlab/data:/home/git/data \
   -v /opt/gitlab/mysql:/var/lib/mysql \
-  -e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' -e 'GITLAB_SUPPORT=support@local.host' \
+  -e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' \
   -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \
   sameersbn/gitlab:7.1.0
 ```
@@ -566,7 +566,7 @@ If you are using an external mysql database
 docker run --name=gitlab -d -h git.local.host \
   -v /opt/gitlab/data:/home/git/data \
   -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \
-  -e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' -e 'GITLAB_SUPPORT=support@local.host' \
+  -e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' \
   -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \
   sameersbn/gitlab:7.1.0
 ```
@@ -593,7 +593,6 @@ Below is the complete list of available options that can be used to customize yo
 - **GITLAB_HOST**: The hostname of the GitLab server. Defaults to localhost
 - **GITLAB_PORT**: The port of the GitLab server. Defaults to 80 for plain http and 443 when https is enabled.
 - **GITLAB_EMAIL**: The email address for the GitLab server.  Defaults to example@example.com.
-- **GITLAB_SUPPORT**: The support email address for the GitLab server. Defaults to support@localhost.
 - **GITLAB_SIGNUP**: Enable or disable user signups. Default is false.
 - **GITLAB_SIGNIN**: If set to false, standard login form won't be shown on the sign-in page. Default is true.
 - **GITLAB_PROJECTS_LIMIT**: Set default projects limit. Defaults to 100.
diff --git a/assets/init b/assets/init
index 7e5b9832..1e3631b5 100755
--- a/assets/init
+++ b/assets/init
@@ -8,7 +8,6 @@ GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22}
 GITLAB_HTTPS=${GITLAB_HTTPS:-false}
 GITLAB_HTTPS_ONLY=${GITLAB_HTTPS_ONLY:-true}
 GITLAB_EMAIL=${GITLAB_EMAIL:-example@example.com}
-GITLAB_SUPPORT=${GITLAB_SUPPORT:-support@localhost}
 GITLAB_SIGNUP=${GITLAB_SIGNUP:-false}
 GITLAB_SIGNIN=${GITLAB_SIGNIN:-true}
 GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-100}
@@ -262,7 +261,6 @@ sudo -u git -H sed 's/{{GITLAB_HOST}}/'"${GITLAB_HOST}"'/' -i /home/git/gitlab/c
 sudo -u git -H sed 's/{{GITLAB_PORT}}/'"${GITLAB_PORT}"'/' -i /home/git/gitlab/config/gitlab.yml
 sudo -u git -H sed 's/{{GITLAB_HTTPS}}/'"${GITLAB_HTTPS}"'/' -i /home/git/gitlab/config/gitlab.yml
 sudo -u git -H sed 's/{{GITLAB_EMAIL}}/'"${GITLAB_EMAIL}"'/' -i /home/git/gitlab/config/gitlab.yml
-sudo -u git -H sed 's/{{GITLAB_SUPPORT}}/'"${GITLAB_SUPPORT}"'/' -i /home/git/gitlab/config/gitlab.yml
 sudo -u git -H sed 's/{{GITLAB_BACKUP_EXPIRY}}/'"${GITLAB_BACKUP_EXPIRY}"'/' -i /home/git/gitlab/config/gitlab.yml
 sudo -u git -H sed 's/{{GITLAB_MAX_SIZE}}/'"${GITLAB_MAX_SIZE}"'/' -i /home/git/gitlab/config/gitlab.yml