From 43fd407293e1fb692f4f4b07bb80367b1d650a3d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 22 Jun 2015 16:54:34 +0530 Subject: [PATCH] gitlab-shell: update `config.yml` to version from `2.6.3` --- assets/config/gitlab-shell/config.yml | 4 ++++ entrypoint.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/assets/config/gitlab-shell/config.yml b/assets/config/gitlab-shell/config.yml index 0e556214..df407e9c 100644 --- a/assets/config/gitlab-shell/config.yml +++ b/assets/config/gitlab-shell/config.yml @@ -25,6 +25,10 @@ repos_path: "{{GITLAB_DATA_DIR}}/repositories" # File used as authorized_keys for gitlab user auth_file: "{{GITLAB_HOME}}/.ssh/authorized_keys" +# File that contains the secret key for verifying access to GitLab. +# Default is .gitlab_shell_secret in the root directory. +secret_file: "{{GITLAB_SHELL_INSTALL_DIR}}/.gitlab_shell_secret" + # Redis settings used for pushing commit notices to gitlab redis: bin: /usr/bin/redis-cli diff --git a/entrypoint.sh b/entrypoint.sh index 28798a72..448ca5ff 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -417,6 +417,7 @@ sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_HOME}},'"${GITLAB_HOME}"',g' -i ${GITL sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_LOG_DIR}},'"${GITLAB_LOG_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_DATA_DIR}},'"${GITLAB_DATA_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_BACKUP_DIR}},'"${GITLAB_BACKUP_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml +sudo -u ${GITLAB_USER} -H sed 's,{{GITLAB_SHELL_INSTALL_DIR}},'"${GITLAB_SHELL_INSTALL_DIR}"',g' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml sudo -u ${GITLAB_USER} -H sed 's/{{SSL_SELF_SIGNED}}/'"${SSL_SELF_SIGNED}"'/' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml sudo -u ${GITLAB_USER} -H sed 's/{{REDIS_HOST}}/'"${REDIS_HOST}"'/' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml sudo -u ${GITLAB_USER} -H sed 's/{{REDIS_PORT}}/'"${REDIS_PORT}"'/' -i ${GITLAB_SHELL_INSTALL_DIR}/config.yml