[DRE-commits] [gitlab] 01/05: use ucf for gitlab-shell config
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Fri Jun 3 17:06:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository gitlab.
commit f17c0f5a1b87d1bc7d698bb5d91e5835314849af
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Fri Jun 3 21:46:33 2016 +0530
use ucf for gitlab-shell config
---
debian/conf/gitlab-debian.conf | 2 ++
debian/postinst | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/conf/gitlab-debian.conf b/debian/conf/gitlab-debian.conf
index 1d05bc0..2db79ff 100644
--- a/debian/conf/gitlab-debian.conf
+++ b/debian/conf/gitlab-debian.conf
@@ -8,6 +8,8 @@ gitlab_yml_private=/var/lib/gitlab/gitlab.yml
gitlab_yml=/etc/gitlab/gitlab.yml
gitlab_debian_conf_private=/var/lib/gitlab/gitlab-debian.conf
gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
+gitlab_shell_config_private=/var/lib/gitlab-shell-config.yml
+gitlab_shell_config=/etc/gitlab-shell/config.yml
gitlab_nginx_log=/var/log/gitlab
gitlab_ssl_path=/etc/gitlab/ssl
gitlab_shell_root=/usr/share/gitlab-shell
diff --git a/debian/postinst b/debian/postinst
index 785b89c..081097b 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -103,7 +103,12 @@ EOF
echo "Updating gitlab_url in gitlab-shell configuration..."
sed -i \
"s/gitlab_url: http*:\/\/.*/gitlab_url: ${gl_proto}:\/\/${GITLAB_HOST}/"\
- ${gitlab_shell_root}/config.yml
+ ${gitlab_shell_config_private}
+
+ # Manage gitlab-shell's config.yml via ucf
+ echo "Registering ${gitlab_shell_config} via ucf"
+ ucf --debconf-ok --three-way ${gitlab_shell_config_private} ${gitlab_shell_config}
+ ucfr gitlab ${gitlab_shell_config}
fi
mkdir -p /etc/gitlab/ssl
if [ -f "${nginx_ssl_conf_example_gz}" ]; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git
More information about the Pkg-ruby-extras-commits
mailing list