Commit 172b4f3c authored by Kevin Daudt's avatar Kevin Daudt 💻
Browse files

gitlab: fix nginx migration

The files in /etc/gitlab/nginx need to be migrated, not in /etc/nginx.
parent 0930ce26
......@@ -44,8 +44,9 @@ install_conf() {
fi
if [ ! -f "/etc/gitlab/nginx/http.d/default.conf" ]; then
if [ -f "/etc/gitlab/nginx/conf.d/default.conf" ]; then
# migrate from conf.d to http.d
mv /etc/gitlab/nginx/conf.d /etc/nginx/http.d
echo "Migrating nginx config from conf.d to http.d"
install -Dm0644 /etc/gitlab/nginx/conf.d/* -t /etc/gitlab/nginx/http.d/
rm -r /etc/gitlab/nginx/conf.d
else
install -Dm644 /home/git/gitlab/lib/support/nginx/gitlab \
/etc/gitlab/nginx/http.d/default.conf
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment