realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor tmpfiles.d/ conf files

Browse source
This commit is contained in:
Sruthi Chandran 2019-03-15 18:43:32 +05:30
parent cd21646c66
commit 2f1aa4583f
7 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/conf/gitlab-common.defaults vendored
View file

@ -15,9 +15,9 @@ gitlab_nginx_log=/var/log/gitlab
gitlab_ssl_path=/etc/gitlab/ssl gitlab_ssl_path=/etc/gitlab/ssl
gitlab_shell_root=/usr/share/gitlab-shell gitlab_shell_root=/usr/share/gitlab-shell
gitlab_shell_log=/var/log/gitlab-shell gitlab_shell_log=/var/log/gitlab-shell
gitlab_tmpfiles_example=/usr/lib/gitlab/templates/tmpfiles.d/gitlab.conf.example gitlab_common_tmpfiles_example=/usr/lib/gitlab-common/templates/tmpfiles.d/gitlab-common.conf.example
gitlab_tmpfiles_private=/var/lib/gitlab/tmpfiles.d-gitlab.conf gitlab_common_tmpfiles_private=/var/lib/gitlab/tmpfiles.d-gitlab-common.conf
gitlab_tmpfiles=/usr/lib/tmpfiles.d/gitlab.conf gitlab_common_tmpfiles=/usr/lib/tmpfiles.d/gitlab-common.conf
nginx_user=www-data nginx_user=www-data
nginx_conf_example=/usr/lib/gitlab/templates/nginx.conf.example nginx_conf_example=/usr/lib/gitlab/templates/nginx.conf.example
nginx_ssl_conf_example=/usr/lib/gitlab/templates/nginx.ssl.conf.example nginx_ssl_conf_example=/usr/lib/gitlab/templates/nginx.ssl.conf.example

1
debian/conf/tmpfiles.d/gitlab-common.conf.example vendored Normal file
View file

@ -0,0 +1 @@
d /run/gitlab 2750 GITLAB_USER www-data -

1
debian/conf/tmpfiles.d/gitlab.conf.example → debian/conf/tmpfiles.d/gitlab.conf vendored
View file

@ -1,2 +1 @@
d /run/gitlab 2750 GITLAB_USER www-data -
L /run/gitlab/cache - - - - /var/cache/gitlab L /run/gitlab/cache - - - - /var/cache/gitlab

1
debian/gitlab-common.install vendored
View file

@ -1,2 +1,3 @@
debian/adduser.sh usr/lib/gitlab-common/scripts debian/adduser.sh usr/lib/gitlab-common/scripts
debian/conf/gitlab-common.defaults usr/lib/gitlab-common debian/conf/gitlab-common.defaults usr/lib/gitlab-common
debian/conf/tmpfiles.d/gitlab-common.conf.example usr/lib/gitlab-common/templates/tmpfiles.d

7
debian/gitlab-common.postinst vendored
View file

@ -58,6 +58,13 @@ case "$1" in
echo "Registering ${gitlab_common_conf} via ucf" echo "Registering ${gitlab_common_conf} via ucf"
ucf --debconf-ok --three-way ${gitlab_common_conf_private} ${gitlab_common_conf} ucf --debconf-ok --three-way ${gitlab_common_conf_private} ${gitlab_common_conf}
ucfr gitlab-common ${gitlab_common_conf} ucfr gitlab-common ${gitlab_common_conf}
# Manage tmpfiles.d/gitlab-common.conf via ucf
cp ${gitlab_common_tmpfiles_example} ${gitlab_common_tmpfiles_private}
sed -i "s/GITLAB_USER/${gitlab_user}/" ${gitlab_common_tmpfiles_private}
echo "Registering ${gitlab_common_tmpfiles} via ucf"
ucf --debconf-ok --three-way ${gitlab_common_tmpfiles_private} ${gitlab_common_tmpfiles}
ucfr gitlab-common ${gitlab_common_tmpfiles}
;; ;;
triggered) triggered)

2
debian/gitlab.install vendored
View file

@ -6,7 +6,7 @@ debian/conf/resque.yml etc/gitlab
debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates
debian/conf/*.target lib/systemd/system debian/conf/*.target lib/systemd/system
debian/conf/smtp_settings.rb etc/gitlab/initializers debian/conf/smtp_settings.rb etc/gitlab/initializers
debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d debian/conf/tmpfiles.d/gitlab.conf /usr/lib/tmpfiles.d/
debian/conf/nginx.conf.example usr/lib/gitlab/templates debian/conf/nginx.conf.example usr/lib/gitlab/templates
debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
debian/gems-compat/* usr/share/gitlab/vendor/gems debian/gems-compat/* usr/share/gitlab/vendor/gems

7
debian/gitlab.postinst vendored
View file

@ -249,13 +249,6 @@ case "$1" in
fi fi
fi fi
# Manage tmpfiles.d/gitlab.conf via ucf
cp ${gitlab_tmpfiles_example} ${gitlab_tmpfiles_private}
sed -i "s/GITLAB_USER/${gitlab_user}/" ${gitlab_tmpfiles_private}
echo "Registering ${gitlab_tmpfiles} via ucf"
ucf --debconf-ok --three-way ${gitlab_tmpfiles_private} ${gitlab_tmpfiles}
ucfr gitlab ${gitlab_tmpfiles}
# Override User for systemd services # Override User for systemd services
for service in mailroom unicorn sidekiq workhorse; do for service in mailroom unicorn sidekiq workhorse; do
path=/etc/systemd/system/gitlab-${service}.service.d path=/etc/systemd/system/gitlab-${service}.service.d