diff --git a/README.md b/README.md index 1c5cc25..d375638 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 12.9.2 +**Shipped version:** 12.9.3 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index cc49018..9c8711d 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1726,7 +1726,7 @@ nginx['listen_https'] = false ##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source ################################################################################ -grafana['enable'] = false +# grafana['enable'] = true # grafana['log_directory'] = '/var/log/gitlab/grafana' # grafana['home'] = '/var/opt/gitlab/grafana' # grafana['admin_password'] = 'admin' diff --git a/conf/nginx.conf b/conf/nginx.conf index 9d0c3db..21d6e44 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,13 +1,25 @@ location __PATH__/ { - proxy_pass http://localhost:__PORT__; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Ssl on; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + # Adapted from https://gitlab.com/gitlab-org/gitlab-recipes/blob/master/web-server/nginx/gitlab-omnibus-ssl-nginx.conf client_max_body_size __CLIENT_MAX_BODY_SIZE__; + gzip off; + ## https://github.com/gitlabhq/gitlabhq/issues/694 + ## Some requests take more than 30 seconds. + proxy_read_timeout 300; + proxy_connect_timeout 300; + proxy_redirect off; + + proxy_http_version 1.1; + + proxy_pass http://localhost:__PORT__; + + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Ssl on; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; - proxy_set_header Accept-Encoding ""; } diff --git a/manifest.json b/manifest.json index 03e0db3..1510ae8 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.2~ynh1", + "version": "12.9.3~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 1f51378..0b829ca 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.2" +gitlab_version="12.9.3" -gitlab_x86_64_source_sha256="781d21de10c4b88582d25af19cd3d85d9618a995f930d1954ea9dc0fa76d7ea9" +gitlab_x86_64_source_sha256="8260f00f7fcda9118155244415fd865fa53e41bb29047421d06f04a2b249e6f9" -gitlab_arm_source_sha256="09eb415d2e55af64294606e25cfebd508c8cc59218475ed26e99f6baccfe1218" +gitlab_arm_source_sha256="1f99fd0d5d11a3a41cd1e3c018bdf2566a0085999111076c43fca31ff4d1cac1" gitlab_filename="gitlab-ce-${gitlab_version}.deb"