From 3dd68e095aa3f0df310bbffe760e51a2aab15508 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Wed, 6 Sep 2017 11:51:06 +0200 Subject: [PATCH 1/4] clean install --- scripts/install | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index 99199ba..30abcfb 100644 --- a/scripts/install +++ b/scripts/install @@ -68,9 +68,6 @@ sudo gitlab-ctl reconfigure -# Set permissions to app files -# you may need to make some file and/or directory writeable by www-data (nginx user) -# sudo chown -R root: $src_path # Modify Nginx configuration file and copy it to Nginx conf directory From a25dcfcb25b3cd1b2b9efd63961126aef3121822 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Sat, 28 Oct 2017 12:21:01 +0200 Subject: [PATCH 2/4] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index b4e5fd9..fc59bbf 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ -location YNH_WWW_PATH { +location / { - proxy_pass http://localhost:PORT; + proxy_pass http://localhost:__PORT__; proxy_set_header Host $host; proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From a7df8b8ce09f193d3febbeae8c81e3db77aca858 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Sat, 28 Oct 2017 12:35:54 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17612bf..6621009 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitlab for Yunohost -ETAT=WORKING +ETAT=INPROGRESS - [Yunohost project](https://yunohost.org) - [gitlab website](https://gitlab.com) From 969042706119fb990962242427282aaba100ef00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sat, 5 Jan 2019 00:13:07 +0100 Subject: [PATCH 4/4] Fix CI --- scripts/_common.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7d7908f..13761e2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -112,5 +112,13 @@ setup_source() { echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \ || ynh_die "Corrupt source" - dpkg -i $src_filename + #Fix for the CI + if sudo grep -qa container=lxc /proc/1/environ; + then + dpkg -i $src_filename || true # This command will fail in lxc env + sed -i 's/command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"/command \"cat \/etc\/sysctl.conf\"/g' $final_path/embedded/cookbooks/package/resources/sysctl.rb + sudo gitlab-ctl reconfigure + else + dpkg -i $src_filename + fi; } \ No newline at end of file