From 749a286553d36cffef0656e33abb0103ac17dbb8 Mon Sep 17 00:00:00 2001 From: kay0u Date: Tue, 30 Apr 2019 14:22:34 +0200 Subject: [PATCH 1/2] Update gitlab to 11.10.2 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.11.10.1.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.11.10.1.sh diff --git a/README.md b/README.md index 586b5b4..8c5394f 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:** 11.10.1 +**Shipped version:** 11.10.2 ## Screenshots diff --git a/manifest.json b/manifest.json index b549547..9685fdc 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "11.10.1~ynh1", + "version": "11.10.2~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.11.10.1.sh b/scripts/upgrade.d/upgrade.11.10.1.sh new file mode 100644 index 0000000..366e291 --- /dev/null +++ b/scripts/upgrade.d/upgrade.11.10.1.sh @@ -0,0 +1,7 @@ +gitlab_version="11.10.1" + +gitlab_x86_64_source_sha256="cffde1c3875c2864c3e954dd1077acde3cc87d8f8963309d2ac4455d621748eb" + +gitlab_arm_source_sha256="f414dbfaa074843c0f693e8d5cd63d6fd913c7a39358ebcb55f5be664aaf5916" + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 366e291..f004207 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ -gitlab_version="11.10.1" +gitlab_version="11.10.2" -gitlab_x86_64_source_sha256="cffde1c3875c2864c3e954dd1077acde3cc87d8f8963309d2ac4455d621748eb" +gitlab_x86_64_source_sha256="40732062a4f6f70043d7cb56c647b23353c8bf7ed42cf676f77d0376237b8736" -gitlab_arm_source_sha256="f414dbfaa074843c0f693e8d5cd63d6fd913c7a39358ebcb55f5be664aaf5916" +gitlab_arm_source_sha256="204d30853de173569718e045d2d7ac6fba266aa0f14e345a5ba431bfbf3daea6" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 48216ce96789df952883bb5633a30b293cd0b9ac Mon Sep 17 00:00:00 2001 From: kay0u Date: Tue, 30 Apr 2019 14:39:59 +0200 Subject: [PATCH 2/2] Update gitlab.rb --- conf/gitlab.rb | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 4b944b3..09183ae 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1,3 +1,20 @@ +################################################################################ +################################################################################ +## FOR YUNOHOST USERS ## +################################################################################ +################################################################################ + +# Please do not modify this file, it will be reset with the next update. +# You can create or modify the file: +# /etc/gitlab/gitlab-persistent.rb +# and add all the configuration you want. +# Options you add in gitlab-presistent.rb will overide these one, +# but you can use options and documentations in this file to know what +# is it possible to do. + +################################################################################ +################################################################################ + ## GitLab configuration settings ##! This file is generated during initial installation and **is not** modified ##! during upgrades. @@ -720,6 +737,10 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # gitlab_shell['auth_file'] = "/var/opt/gitlab/.ssh/authorized_keys" +### Migration to Go feature flags +###! Docs: https://gitlab.com/gitlab-org/gitlab-shell#migration-to-go-feature-flags +# gitlab_shell['migration'] = { enabled: true, features: [] } + ### Git trace log file. ###! If set, git commands receive GIT_TRACE* environment variables ###! Docs: https://git-scm.com/book/es/v2/Git-Internals-Environment-Variables#Debugging @@ -1525,17 +1546,37 @@ nginx['listen_https'] = false # grafana['gitlab_secret'] = 'GITLAB_SECRET' # grafana['env_directory'] = '/opt/gitlab/etc/grafana/env' # grafana['allowed_groups'] = [] -# grafana['gitlab_auth_endpoint'] = "http://gitlab.example.com/oauth/authorize" -# grafana['gitlab_token_endpoint'] = "http://gitlab.example.com/oauth/token" -# grafana['gitlab_user_api_endpoint'] = "http://gitlab.example.com/api/v4/user" +# grafana['gitlab_auth_sign_up'] = true # grafana['env'] = { # 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" # } +### Dashboards +# +# See: http://docs.grafana.org/administration/provisioning/#dashboards +# +# NOTE: Setting this will override the default. +# +# grafana['dashboards'] = [ +# { +# 'name' => 'GitLab Omnibus', +# 'orgId' => 1, +# 'folder' => 'GitLab Omnibus', +# 'type' => 'file', +# 'disableDeletion' => true, +# 'updateIntervalSeconds' => 600, +# 'options' => { +# 'path' => '/opt/gitlab/embedded/service/grafana-dashboards', +# } +# } +# ] + ### Datasources # # See: http://docs.grafana.org/administration/provisioning/#example-datasource-config-file # +# NOTE: Setting this will override the default. +# # grafana['datasources'] = [ # { # 'name' => 'GitLab Omnibus', @@ -1578,6 +1619,7 @@ nginx['listen_https'] = false # gitaly['prometheus_grpc_latency_buckets'] = "[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]" # gitaly['auth_token'] = '' # gitaly['auth_transitioning'] = false # When true, auth is logged to Prometheus but NOT enforced +# gitaly['graceful_restart_timeout'] = '1m' # Grace time for a gitaly process to finish ongoing requests # gitaly['ruby_max_rss'] = 300000000 # RSS threshold in bytes for triggering a gitaly-ruby restart # gitaly['ruby_graceful_restart_timeout'] = '10m' # Grace time for a gitaly-ruby process to finish ongoing requests # gitaly['ruby_restart_delay'] = '5m' # Period of sustained high RSS that needs to be observed before restarting gitaly-ruby