update install file and nginx conf files
This commit is contained in:
parent
4a0116a160
commit
0c01eefe99
1
debian/conf/gitlab-debian.conf.example
vendored
1
debian/conf/gitlab-debian.conf.example
vendored
|
@ -24,4 +24,5 @@ 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/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_site_private=/var/lib/gitlab/nginx.conf
|
nginx_site_private=/var/lib/gitlab/nginx.conf
|
||||||
|
|
2
debian/gitlab.docs
vendored
2
debian/gitlab.docs
vendored
|
@ -1,4 +1,2 @@
|
||||||
README.md
|
README.md
|
||||||
debian/README.Debian
|
debian/README.Debian
|
||||||
debian/conf/nginx.conf.example
|
|
||||||
debian/conf/nginx.ssl.conf.example
|
|
||||||
|
|
8
debian/install
vendored
8
debian/install
vendored
|
@ -1,12 +1,14 @@
|
||||||
debian/conf/gitlab etc/default
|
debian/conf/gitlab etc/default
|
||||||
debian/conf/unicorn.rb etc/gitlab
|
debian/conf/unicorn.rb etc/gitlab
|
||||||
debian/conf/database.yml etc/gitlab
|
debian/conf/database.yml etc/gitlab
|
||||||
debian/conf/gitlab.yml.example usr/share/doc/gitlab
|
debian/conf/gitlab.yml.example usr/lib/gitlab/templates
|
||||||
debian/conf/resque.yml etc/gitlab
|
debian/conf/resque.yml etc/gitlab
|
||||||
debian/conf/gitlab-debian.conf.example usr/share/doc/gitlab
|
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/share/doc/gitlab/tmpfiles.d
|
debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d
|
||||||
|
debian/conf/nginx.conf.example usr/lib/gitlab/templates
|
||||||
|
debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
|
||||||
debian/adduser.sh usr/lib/gitlab/scripts
|
debian/adduser.sh usr/lib/gitlab/scripts
|
||||||
debian/grantpriv.sh usr/lib/gitlab/scripts
|
debian/grantpriv.sh usr/lib/gitlab/scripts
|
||||||
debian/rake-tasks.sh usr/lib/gitlab/scripts
|
debian/rake-tasks.sh usr/lib/gitlab/scripts
|
||||||
|
|
2
debian/postinst
vendored
2
debian/postinst
vendored
|
@ -162,6 +162,8 @@ EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p /etc/gitlab/ssl
|
mkdir -p /etc/gitlab/ssl
|
||||||
|
nginx_conf_example=${nginx_ssl_conf_example}
|
||||||
|
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in a new issue