From c570f1c1961dfd2e472dd376115088599a17ecb5 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Oct 2017 21:30:18 +0200
Subject: [PATCH] Remove GITALY_ENABLED

Since the last version Gitaly is now the way to go. So I removed this variable from the image.

Signed-off-by: solidnerd <niclas@mietz.io>
---
 assets/build/install.sh                   | 2 +-
 assets/runtime/config/gitlabhq/gitlab.yml | 1 -
 assets/runtime/env-defaults               | 1 -
 assets/runtime/functions                  | 7 +------
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 1591447d..5c40ab36 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -329,7 +329,7 @@ directory=${GITLAB_GITALY_INSTALL_DIR}
 environment=HOME=${GITLAB_HOME}
 command=/usr/local/bin/gitaly ${GITLAB_GITALY_INSTALL_DIR}/config.toml
 user=git
-autostart={{GITALY_ENABLED}}
+autostart=true
 autorestart=true
 stdout_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
 stderr_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 3c535bcf..c81158d1 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -480,7 +480,6 @@ production: &base
     # This setting controls whether GitLab uses Gitaly (new component
     # introduced in 9.0). Eventually Gitaly use will become mandatory and
     # this option will disappear.
-    enabled: {{GITALY_ENABLED}}
     token: {{GITALY_TOKEN}}
 
   #
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index fd3c7fe5..efabb573 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -382,7 +382,6 @@ GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-}
 GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-}
 
 ## Gitaly
-GITALY_ENABLED=${GITALY_ENABLED:-true}
 GITALY_TOKEN=${GITALY_TOKEN:-}
 GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket
 GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 5cde49b4..97bb279f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -275,14 +275,11 @@ gitlab_configure_redis() {
 
 gitlab_configure_gitaly() {
   echo "Configuring gitlab::gitaly..."
-  update_template /etc/supervisor/conf.d/gitaly.conf GITALY_ENABLED
-
   update_template ${GITLAB_GITALY_CONFIG} \
     GITALY_SOCKET_PATH \
     GITLAB_REPOS_DIR
 
   update_template ${GITLAB_CONFIG} \
-    GITALY_ENABLED \
     GITALY_TOKEN
 
 }
@@ -1411,9 +1408,7 @@ install_configuration_templates() {
     fi
   fi
 
-  if [[ ${GITALY_ENABLED} == true ]]; then
-    install_template ${GITLAB_USER}: gitaly/config.toml ${GITLAB_GITALY_CONFIG}
-  fi
+  install_template ${GITLAB_USER}: gitaly/config.toml ${GITLAB_GITALY_CONFIG}
 }
 
 configure_gitlab() {