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

use /usr/lib/gitlab/templates for config templates

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2017-02-20 16:41:19 +05:30
parent b241eca5c4
commit 379bb93191
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
debian/conf/gitlab-debian.conf.example vendored
View file

@ -4,13 +4,13 @@ gitlab_app_root=/usr/share/gitlab
gitlab_data_dir=/var/lib/gitlab gitlab_data_dir=/var/lib/gitlab
gitlab_cache_path=/var/cache/gitlab gitlab_cache_path=/var/cache/gitlab
gitlab_scripts=/usr/lib/gitlab/scripts gitlab_scripts=/usr/lib/gitlab/scripts
gitlab_yml_example=/usr/share/doc/gitlab/gitlab.yml.example gitlab_yml_example=/usr/lib/gitlab/templates/gitlab.yml.example
gitlab_yml_private=/var/lib/gitlab/gitlab.yml gitlab_yml_private=/var/lib/gitlab/gitlab.yml
gitlab_yml=/etc/gitlab/gitlab.yml gitlab_yml=/etc/gitlab/gitlab.yml
gitlab_debian_conf_example=/usr/share/doc/gitlab/gitlab-debian.conf.example gitlab_debian_conf_example=/usr/lib/gitlab/gitlab-debian.conf.example
gitlab_debian_conf_private=/var/lib/gitlab/gitlab-debian.conf gitlab_debian_conf_private=/var/lib/gitlab/gitlab-debian.conf
gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
gitlab_shell_config_example=/usr/share/doc/gitlab-shell/config.yml.example gitlab_shell_config_example=/usr/lib/gitlab-shell/config.yml.example
gitlab_shell_config_private=/var/lib/gitlab/gitlab-shell-config.yml gitlab_shell_config_private=/var/lib/gitlab/gitlab-shell-config.yml
gitlab_shell_config=/etc/gitlab-shell/config.yml gitlab_shell_config=/etc/gitlab-shell/config.yml
gitlab_nginx_log=/var/log/gitlab gitlab_nginx_log=/var/log/gitlab
@ -19,10 +19,9 @@ gitlab_shell_root=/usr/share/gitlab-shell
gitlab_shell_log=/var/log/gitlab-shell gitlab_shell_log=/var/log/gitlab-shell
gitlab_log_dir=/var/log/gitlab gitlab_log_dir=/var/log/gitlab
gitlab_pid_path=/run/gitlab gitlab_pid_path=/run/gitlab
gitlab_tmpfiles_example=/usr/share/doc/gitlab/tmpfiles.d/gitlab.conf.example gitlab_tmpfiles_example=/usr/lib/gitlab/templates/tmpfiles.d/gitlab.conf.example
gitlab_tmpfiles_private=/var/lib/gitlab/tmpfiles.d-gitlab.conf gitlab_tmpfiles_private=/var/lib/gitlab/tmpfiles.d-gitlab.conf
gitlab_tmpfiles=/usr/lib/tmpfiles.d/gitlab.conf gitlab_tmpfiles=/usr/lib/tmpfiles.d/gitlab.conf
nginx_user=www-data nginx_user=www-data
nginx_conf_example=/usr/share/doc/gitlab/nginx.conf.example nginx_conf_example=/usr/lib/gitlab/templates/nginx.conf.example
nginx_ssl_conf_example_gz=/usr/share/doc/gitlab/nginx.ssl.conf.example.gz
nginx_site_private=/var/lib/gitlab/nginx.conf nginx_site_private=/var/lib/gitlab/nginx.conf

7
debian/postinst vendored
View file

@ -162,13 +162,6 @@ EOF
fi fi
mkdir -p /etc/gitlab/ssl mkdir -p /etc/gitlab/ssl
if [ -f "${nginx_ssl_conf_example_gz}" ]; then
# undo dh_installdocs auto compress
export nginx_conf_example_tmp=$(mktemp)
zcat ${nginx_ssl_conf_example_gz} > ${nginx_conf_example_tmp}
export nginx_conf_example=${nginx_conf_example_tmp}
fi
# Check if letsencrypt option is selected # Check if letsencrypt option is selected
db_get gitlab/letsencrypt db_get gitlab/letsencrypt
if [ "${RET}" = "true" ]; then if [ "${RET}" = "true" ]; then