YunoHost-Apps/gitlab_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/gitlab_ynh.git synced 2024-09-03 18:36:35 +02:00
Code Issues Activity Actions

Merge branch 'testing' into packagingV2

Browse source
This commit is contained in:
Kay0u 2023-06-06 11:59:16 +02:00
commit adcbb8b5fe
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
11 changed files with 182 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features
**Shipped version:** 15.10.0~ynh1 **Shipped version:** 16.0.1~ynh1
**Demo:** https://gitlab.com/explore **Demo:** https://gitlab.com/explore

2
README_fr.md
View file

@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD
**Version incluse :** 15.10.0~ynh1 **Version incluse :** 16.0.1~ynh1
**Démo :** https://gitlab.com/explore **Démo :** https://gitlab.com/explore

51
conf/gitlab.rb
View file

@ -133,7 +133,6 @@ external_url '__GENERATED_EXTERNAL_URL__'
# gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt' # gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt'
### GitLab user privileges ### GitLab user privileges
# gitlab_rails['gitlab_default_can_create_group'] = true
# gitlab_rails['gitlab_username_changing_enabled'] = true # gitlab_rails['gitlab_username_changing_enabled'] = true
### Default Theme ### Default Theme
@ -746,6 +745,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
# gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails" # gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails"
# gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails" # gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails"
# gitlab_rails['log_group'] = nil
#### Change the initial default admin password and shared runner registration tokens. #### Change the initial default admin password and shared runner registration tokens.
####! **Only applicable on initial setup, changing these settings after database ####! **Only applicable on initial setup, changing these settings after database
@ -801,7 +801,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
### Gitlab decomposed database settings ### Gitlab decomposed database settings
###! Docs: https://docs.gitlab.com/omnibus/settings/database.html ###! Docs: https://docs.gitlab.com/omnibus/settings/database.html
# gitlab_rails['databases']['ci']['enable'] = false # gitlab_rails['databases']['ci']['enable'] = true
# gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production' # gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production'
# gitlab_rails['databases']['ci']['database_tasks'] = false # gitlab_rails['databases']['ci']['database_tasks'] = false
@ -1207,7 +1207,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__
# gitlab_shell['log_level'] = 'INFO' # gitlab_shell['log_level'] = 'INFO'
# gitlab_shell['log_format'] = 'json' # gitlab_shell['log_format'] = 'json'
# gitlab_shell['http_settings'] = { user: 'username', password: 'password', ca_file: '/etc/ssl/cert.pem', ca_path: '/etc/pki/tls/certs'} # gitlab_shell['http_settings'] = { user: 'username', password: 'password', ca_file: '/etc/ssl/cert.pem', ca_path: '/etc/pki/tls/certs'}
# gitlab_shell['log_directory'] = "/var/log/gitlab/gitlab-shell/" # gitlab_shell['log_directory'] = "/var/log/gitlab/gitlab-shell"
# gitlab_shell['auth_file'] = "/var/opt/gitlab/.ssh/authorized_keys" # gitlab_shell['auth_file'] = "/var/opt/gitlab/.ssh/authorized_keys"
@ -1310,7 +1310,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__
# postgresql['hot_standby'] = "off" # postgresql['hot_standby'] = "off"
### SSL settings ### SSL settings
# See https://www.postgresql.org/docs/12/static/runtime-config-connection.html#GUC-SSL-CERT-FILE for more details # See https://www.postgresql.org/docs/13/static/runtime-config-connection.html#GUC-SSL-CERT-FILE for more details
# postgresql['ssl'] = 'on' # postgresql['ssl'] = 'on'
# postgresql['hostssl'] = false # postgresql['hostssl'] = false
# postgresql['ssl_ciphers'] = 'HIGH:MEDIUM:+3DES:!aNULL:!SSLv3:!TLSv1' # postgresql['ssl_ciphers'] = 'HIGH:MEDIUM:+3DES:!aNULL:!SSLv3:!TLSv1'
@ -1399,7 +1399,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__
# } # }
# ] # ]
# } # }
# See https://www.postgresql.org/docs/12/static/auth-pg-hba-conf.html for an explanation # See https://www.postgresql.org/docs/13/static/auth-pg-hba-conf.html for an explanation
# of the values # of the values
### Version settings ### Version settings
@ -1423,6 +1423,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__
# redis['hz'] = 10 # redis['hz'] = 10
# redis['dir'] = "/var/opt/gitlab/redis" # redis['dir'] = "/var/opt/gitlab/redis"
# redis['log_directory'] = "/var/log/gitlab/redis" # redis['log_directory'] = "/var/log/gitlab/redis"
# redis['log_group'] = nil
# redis['username'] = "gitlab-redis" # redis['username'] = "gitlab-redis"
# redis['group'] = "gitlab-redis" # redis['group'] = "gitlab-redis"
# redis['maxclients'] = "10000" # redis['maxclients'] = "10000"
@ -1435,6 +1436,7 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__
# redis['tcp_keepalive'] = "300" # redis['tcp_keepalive'] = "300"
# redis['uid'] = nil # redis['uid'] = nil
# redis['gid'] = nil # redis['gid'] = nil
# redis['startup_delay'] = 0
### Redis TLS settings ### Redis TLS settings
###! To run Redis over TLS, specify values for the following settings ###! To run Redis over TLS, specify values for the following settings
@ -1467,6 +1469,10 @@ sidekiq['listen_port'] = __PORT_SIDEKIQ__
#} #}
# #
###! Configure timeout (in seconds) for runit's sv commands used for managing
###! the Redis service
# redis['runit_sv_timeout'] = nil
###! **To enable only Redis service in this machine, uncomment ###! **To enable only Redis service in this machine, uncomment
###! one of the lines below (choose master or replica instance types).** ###! one of the lines below (choose master or replica instance types).**
###! Docs: https://docs.gitlab.com/omnibus/settings/redis.html ###! Docs: https://docs.gitlab.com/omnibus/settings/redis.html
@ -1639,6 +1645,7 @@ nginx['listen_https'] = false
### Advanced settings ### Advanced settings
# nginx['dir'] = "/var/opt/gitlab/nginx" # nginx['dir'] = "/var/opt/gitlab/nginx"
# nginx['log_directory'] = "/var/log/gitlab/nginx" # nginx['log_directory'] = "/var/log/gitlab/nginx"
# nginx['log_group'] = nil
# nginx['error_log_level'] = "error" # nginx['error_log_level'] = "error"
# nginx['worker_processes'] = 4 # nginx['worker_processes'] = 4
# nginx['worker_connections'] = 10240 # nginx['worker_connections'] = 10240
@ -1697,6 +1704,7 @@ nginx['listen_https'] = false
# logging['logrotate_method'] = "copytruncate" # see 'man logrotate' # logging['logrotate_method'] = "copytruncate" # see 'man logrotate'
# logging['logrotate_postrotate'] = nil # no postrotate command by default # logging['logrotate_postrotate'] = nil # no postrotate command by default
# logging['logrotate_dateformat'] = nil # use date extensions for rotated files rather than numbers e.g. a value of "-%Y-%m-%d" would give rotated files like production.log-2016-03-09.gz # logging['logrotate_dateformat'] = nil # use date extensions for rotated files rather than numbers e.g. a value of "-%Y-%m-%d" would give rotated files like production.log-2016-03-09.gz
# logging['log_group'] = nil # assign this group to specified log directories and use it for runit-managed logs, can be overridden per-service
### UDP log forwarding ### UDP log forwarding
##! Docs: http://docs.gitlab.com/omnibus/settings/logs.html#udp-log-forwarding ##! Docs: http://docs.gitlab.com/omnibus/settings/logs.html#udp-log-forwarding
@ -1711,6 +1719,7 @@ nginx['listen_https'] = false
##! remote port to ship log messages to via UDP ##! remote port to ship log messages to via UDP
# logging['udp_log_shipping_port'] = 514 # logging['udp_log_shipping_port'] = 514
################################################################################ ################################################################################
## Logrotate ## Logrotate
##! Docs: https://docs.gitlab.com/omnibus/settings/logs.html#logrotate ##! Docs: https://docs.gitlab.com/omnibus/settings/logs.html#logrotate
@ -1718,6 +1727,7 @@ nginx['listen_https'] = false
################################################################################ ################################################################################
# logrotate['enable'] = true # logrotate['enable'] = true
# logrotate['log_directory'] = "/var/log/gitlab/logrotate" # logrotate['log_directory'] = "/var/log/gitlab/logrotate"
# logrotate['log_group'] = nil
################################################################################ ################################################################################
## Users and groups accounts ## Users and groups accounts
@ -1819,6 +1829,7 @@ nginx['listen_https'] = false
# gitlab_pages['use_http2'] = true # gitlab_pages['use_http2'] = true
# gitlab_pages['dir'] = "/var/opt/gitlab/gitlab-pages" # gitlab_pages['dir'] = "/var/opt/gitlab/gitlab-pages"
# gitlab_pages['log_directory'] = "/var/log/gitlab/gitlab-pages" # gitlab_pages['log_directory'] = "/var/log/gitlab/gitlab-pages"
# gitlab_pages['log_group'] = nil
# gitlab_pages['artifacts_server'] = true # gitlab_pages['artifacts_server'] = true
# gitlab_pages['artifacts_server_url'] = nil # Defaults to external_url + '/api/v4' # gitlab_pages['artifacts_server_url'] = nil # Defaults to external_url + '/api/v4'
@ -2034,6 +2045,7 @@ nginx['listen_https'] = false
##! Directories for GitLab KAS ##! Directories for GitLab KAS
# gitlab_kas['dir'] = '/var/opt/gitlab/gitlab-kas' # gitlab_kas['dir'] = '/var/opt/gitlab/gitlab-kas'
# gitlab_kas['log_directory'] = '/var/log/gitlab/gitlab-kas' # gitlab_kas['log_directory'] = '/var/log/gitlab/gitlab-kas'
# gitlab_kas['log_group'] = nil
# gitlab_kas['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env' # gitlab_kas['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env'
################################################################################ ################################################################################
@ -2151,6 +2163,7 @@ nginx['listen_https'] = false
# prometheus['shell'] = '/bin/sh' # prometheus['shell'] = '/bin/sh'
# prometheus['home'] = '/var/opt/gitlab/prometheus' # prometheus['home'] = '/var/opt/gitlab/prometheus'
# prometheus['log_directory'] = '/var/log/gitlab/prometheus' # prometheus['log_directory'] = '/var/log/gitlab/prometheus'
# prometheus['log_group'] = nil
# prometheus['rules_files'] = ['/var/opt/gitlab/prometheus/rules/*.rules'] # prometheus['rules_files'] = ['/var/opt/gitlab/prometheus/rules/*.rules']
# prometheus['scrape_interval'] = 15 # prometheus['scrape_interval'] = 15
# prometheus['scrape_timeout'] = 15 # prometheus['scrape_timeout'] = 15
@ -2228,6 +2241,7 @@ nginx['listen_https'] = false
# alertmanager['enable'] = true # alertmanager['enable'] = true
# alertmanager['home'] = '/var/opt/gitlab/alertmanager' # alertmanager['home'] = '/var/opt/gitlab/alertmanager'
# alertmanager['log_directory'] = '/var/log/gitlab/alertmanager' # alertmanager['log_directory'] = '/var/log/gitlab/alertmanager'
# alertmanager['log_group'] = nil
# alertmanager['admin_email'] = 'admin@example.com' # alertmanager['admin_email'] = 'admin@example.com'
# alertmanager['flags'] = { # alertmanager['flags'] = {
# 'web.listen-address' => "localhost:9093", # 'web.listen-address' => "localhost:9093",
@ -2251,6 +2265,7 @@ nginx['listen_https'] = false
# node_exporter['enable'] = true # node_exporter['enable'] = true
# node_exporter['home'] = '/var/opt/gitlab/node-exporter' # node_exporter['home'] = '/var/opt/gitlab/node-exporter'
# node_exporter['log_directory'] = '/var/log/gitlab/node-exporter' # node_exporter['log_directory'] = '/var/log/gitlab/node-exporter'
# node_exporter['log_group'] = nil
# node_exporter['flags'] = { # node_exporter['flags'] = {
# 'collector.textfile.directory' => "/var/opt/gitlab/node-exporter/textfile_collector" # 'collector.textfile.directory' => "/var/opt/gitlab/node-exporter/textfile_collector"
# } # }
@ -2274,6 +2289,7 @@ nginx['listen_https'] = false
# redis_exporter['enable'] = true # redis_exporter['enable'] = true
# redis_exporter['log_directory'] = '/var/log/gitlab/redis-exporter' # redis_exporter['log_directory'] = '/var/log/gitlab/redis-exporter'
# redis_exporter['log_group'] = nil
# redis_exporter['flags'] = { # redis_exporter['flags'] = {
# 'redis.addr' => "unix:///var/opt/gitlab/redis/redis.socket", # 'redis.addr' => "unix:///var/opt/gitlab/redis/redis.socket",
# } # }
@ -2298,6 +2314,7 @@ nginx['listen_https'] = false
# postgres_exporter['enable'] = true # postgres_exporter['enable'] = true
# postgres_exporter['home'] = '/var/opt/gitlab/postgres-exporter' # postgres_exporter['home'] = '/var/opt/gitlab/postgres-exporter'
# postgres_exporter['log_directory'] = '/var/log/gitlab/postgres-exporter' # postgres_exporter['log_directory'] = '/var/log/gitlab/postgres-exporter'
# postgres_exporter['log_group'] = nil
# postgres_exporter['flags'] = {} # postgres_exporter['flags'] = {}
# postgres_exporter['listen_address'] = 'localhost:9187' # postgres_exporter['listen_address'] = 'localhost:9187'
# postgres_exporter['env_directory'] = '/opt/gitlab/etc/postgres-exporter/env' # postgres_exporter['env_directory'] = '/opt/gitlab/etc/postgres-exporter/env'
@ -2319,6 +2336,7 @@ nginx['listen_https'] = false
# pgbouncer_exporter['enable'] = false # pgbouncer_exporter['enable'] = false
# pgbouncer_exporter['log_directory'] = "/var/log/gitlab/pgbouncer-exporter" # pgbouncer_exporter['log_directory'] = "/var/log/gitlab/pgbouncer-exporter"
# pgbouncer_exporter['log_group'] = nil
# pgbouncer_exporter['listen_address'] = 'localhost:9188' # pgbouncer_exporter['listen_address'] = 'localhost:9188'
# pgbouncer_exporter['env_directory'] = '/opt/gitlab/etc/pgbouncer-exporter/env' # pgbouncer_exporter['env_directory'] = '/opt/gitlab/etc/pgbouncer-exporter/env'
# pgbouncer_exporter['env'] = { # pgbouncer_exporter['env'] = {
@ -2333,6 +2351,7 @@ nginx['listen_https'] = false
# gitlab_exporter['enable'] = true # gitlab_exporter['enable'] = true
# gitlab_exporter['log_directory'] = "/var/log/gitlab/gitlab-exporter" # gitlab_exporter['log_directory'] = "/var/log/gitlab/gitlab-exporter"
# gitlab_exporter['log_group'] = nil
# gitlab_exporter['home'] = "/var/opt/gitlab/gitlab-exporter" # gitlab_exporter['home'] = "/var/opt/gitlab/gitlab-exporter"
##! Advanced settings. Should be changed only if absolutely needed. ##! Advanced settings. Should be changed only if absolutely needed.
@ -2374,7 +2393,9 @@ nginx['listen_https'] = false
################################################################################ ################################################################################
# grafana['enable'] = false # grafana['enable'] = false
# grafana['enable_deprecated_service'] = false
# grafana['log_directory'] = '/var/log/gitlab/grafana' # grafana['log_directory'] = '/var/log/gitlab/grafana'
# grafana['log_group'] = nil
# grafana['home'] = '/var/opt/gitlab/grafana' # grafana['home'] = '/var/opt/gitlab/grafana'
# grafana['admin_password'] = 'admin' # grafana['admin_password'] = 'admin'
# grafana['allow_user_sign_up'] = false # grafana['allow_user_sign_up'] = false
@ -2463,6 +2484,7 @@ nginx['listen_https'] = false
# gitaly['enable'] = true # gitaly['enable'] = true
# gitaly['dir'] = "/var/opt/gitlab/gitaly" # gitaly['dir'] = "/var/opt/gitlab/gitaly"
# gitaly['log_directory'] = "/var/log/gitlab/gitaly" # gitaly['log_directory'] = "/var/log/gitlab/gitaly"
# gitaly['log_group'] = nil
# gitaly['bin_path'] = "/opt/gitlab/embedded/bin/gitaly" # gitaly['bin_path'] = "/opt/gitlab/embedded/bin/gitaly"
# gitaly['env_directory'] = "/opt/gitlab/etc/gitaly/env" # gitaly['env_directory'] = "/opt/gitlab/etc/gitaly/env"
# gitaly['env'] = { # gitaly['env'] = {
@ -2495,7 +2517,6 @@ nginx['listen_https'] = false
# level: 'warn', # level: 'warn',
# format: 'json', # format: 'json',
# sentry_dsn: 'https://<key>:<secret>@sentry.io/<project>', # sentry_dsn: 'https://<key>:<secret>@sentry.io/<project>',
# ruby_sentry_dsn: 'https://<key>:<secret>@sentry.io/<project>',
# sentry_environment: 'production', # sentry_environment: 'production',
# }, # },
# prometheus: { # prometheus: {
@ -2521,12 +2542,6 @@ nginx['listen_https'] = false
# { key: 'http.http://example.com.proxy', value: 'http://example.proxy.com' }, # { key: 'http.http://example.com.proxy', value: 'http://example.proxy.com' },
# ], # ],
# }, # },
# 'gitaly-ruby': {
# max_rss: 300000000, # RSS threshold in bytes for triggering a gitaly-ruby restart
# graceful_restart_timeout: '10m', # Grace time for a gitaly-ruby process to finish ongoing requests
# restart_delay: '5m', # Period of sustained high RSS that needs to be observed before restarting gitaly-ruby
# num_workers: 3, # Number of gitaly-ruby worker processes. Minimum 2, default 2.
# },
# hooks: { # hooks: {
# custom_hooks_dir: '/var/opt/gitlab/gitaly/custom_hooks', # custom_hooks_dir: '/var/opt/gitlab/gitaly/custom_hooks',
# }, # },
@ -2542,7 +2557,7 @@ nginx['listen_https'] = false
# hierarchy_root: 'gitaly', # hierarchy_root: 'gitaly',
# memory_bytes: 1048576, # memory_bytes: 1048576,
# cpu_shares: 512, # cpu_shares: 512,
# cpu_quota_us: 400000 # cpu_quota_us: 400000,
# repositories: { # repositories: {
# count: 1000, # count: 1000,
# memory_bytes: 12884901888, # memory_bytes: 12884901888,
@ -2587,6 +2602,7 @@ nginx['listen_https'] = false
# praefect['enable'] = false # praefect['enable'] = false
# praefect['dir'] = "/var/opt/gitlab/praefect" # praefect['dir'] = "/var/opt/gitlab/praefect"
# praefect['log_directory'] = "/var/log/gitlab/praefect" # praefect['log_directory'] = "/var/log/gitlab/praefect"
# praefect['log_group'] = nil
# praefect['env_directory'] = "/opt/gitlab/etc/praefect/env" # praefect['env_directory'] = "/opt/gitlab/etc/praefect/env"
# praefect['env'] = { # praefect['env'] = {
# 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/", # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/",
@ -2697,6 +2713,7 @@ nginx['listen_https'] = false
# storage_check['enable'] = false # storage_check['enable'] = false
# storage_check['target'] = 'unix:///var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' # storage_check['target'] = 'unix:///var/opt/gitlab/gitlab-rails/sockets/gitlab.socket'
# storage_check['log_directory'] = '/var/log/gitlab/storage-check' # storage_check['log_directory'] = '/var/log/gitlab/storage-check'
# storage_check['log_group'] = nil
################################################################################ ################################################################################
# Let's Encrypt integration # Let's Encrypt integration
@ -2908,6 +2925,9 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
###! * This is configured to `false` when an IP address is provided ###! * This is configured to `false` when an IP address is provided
# sentinel['use_hostnames'] = <calculated> # sentinel['use_hostnames'] = <calculated>
### Sentinel log settings
# sentinel['log_directory'] = '/var/log/gitlab/sentinel'
################################################################################ ################################################################################
## Additional Database Settings (EE only) ## Additional Database Settings (EE only)
##! Docs: https://docs.gitlab.com/ee/administration/database_load_balancing.html ##! Docs: https://docs.gitlab.com/ee/administration/database_load_balancing.html
@ -2973,6 +2993,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
################################################################################ ################################################################################
# geo_logcursor['log_directory'] = '/var/log/gitlab/geo-logcursor' # geo_logcursor['log_directory'] = '/var/log/gitlab/geo-logcursor'
# geo_logcursor['log_group'] = nil
################################################################################ ################################################################################
## Unleash ## Unleash
@ -2992,6 +3013,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
################################################################################ ################################################################################
# pgbouncer['enable'] = false # pgbouncer['enable'] = false
# pgbouncer['log_directory'] = '/var/log/gitlab/pgbouncer' # pgbouncer['log_directory'] = '/var/log/gitlab/pgbouncer'
# pgbouncer['log_group'] = nil
# pgbouncer['data_directory'] = '/var/opt/gitlab/pgbouncer' # pgbouncer['data_directory'] = '/var/opt/gitlab/pgbouncer'
# pgbouncer['env_directory'] = '/opt/gitlab/etc/pgbouncer/env' # pgbouncer['env_directory'] = '/opt/gitlab/etc/pgbouncer/env'
# pgbouncer['env'] = { # pgbouncer['env'] = {
@ -3128,6 +3150,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
## Log settings ## Log settings
# patroni['log_directory'] = '/var/log/gitlab/patroni' # patroni['log_directory'] = '/var/log/gitlab/patroni'
# patroni['log_group'] = nil
# patroni['log_level'] = 'INFO' # patroni['log_level'] = 'INFO'
## Consul specific settings ## Consul specific settings
@ -3207,6 +3230,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
# consul['config_dir'] = '/var/opt/gitlab/consul/config.d' # consul['config_dir'] = '/var/opt/gitlab/consul/config.d'
# consul['data_dir'] = '/var/opt/gitlab/consul/data' # consul['data_dir'] = '/var/opt/gitlab/consul/data'
# consul['log_directory'] = '/var/log/gitlab/consul' # consul['log_directory'] = '/var/log/gitlab/consul'
# consul['log_group'] = nil
# consul['env_directory'] = '/opt/gitlab/etc/consul/env' # consul['env_directory'] = '/opt/gitlab/etc/consul/env'
# consul['env'] = { # consul['env'] = {
# 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/" # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/"
@ -3329,6 +3353,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
# spamcheck['allowlist'] = {} # spamcheck['allowlist'] = {}
# spamcheck['denylist'] = {} # spamcheck['denylist'] = {}
# spamcheck['log_directory'] = "/var/log/gitlab/spamcheck" # spamcheck['log_directory'] = "/var/log/gitlab/spamcheck"
# spamcheck['log_group'] = nil
# spamcheck['env_directory'] = "/opt/gitlab/etc/spamcheck/env" # spamcheck['env_directory'] = "/opt/gitlab/etc/spamcheck/env"
# spamcheck['env'] = { # spamcheck['env'] = {
# 'SSL_CERT_DIR' => '/opt/gitlab/embedded/ssl/cers' # 'SSL_CERT_DIR' => '/opt/gitlab/embedded/ssl/cers'

2
manifest.toml
View file

@ -5,7 +5,7 @@ name = "GitLab"
description.en = "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features" description.en = "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features"
description.fr = "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD" description.fr = "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD"
version = "15.10.0~ynh1" version = "16.0.1~ynh1"
maintainers = ["kay0u"] maintainers = ["kay0u"]

2
scripts/change_url
View file

@ -58,7 +58,7 @@ ynh_add_config --template="$YNH_APP_BASEDIR/conf/gitlab.rb" --destination="$conf
# RECONFIGURE GITLAB # RECONFIGURE GITLAB
#================================================= #=================================================
gitlab-ctl reconfigure ynh_exec_warn_less gitlab-ctl reconfigure
#================================================= #=================================================
# WAITING GITLAB # WAITING GITLAB

2
scripts/install
View file

@ -170,7 +170,7 @@ ApplicationSetting.last.update(password_authentication_enabled_for_web: $use_web
#================================================= #=================================================
ynh_script_progression --message="Reconfigure GitLab..." --weight=13 ynh_script_progression --message="Reconfigure GitLab..." --weight=13
gitlab-ctl reconfigure ynh_exec_warn_less gitlab-ctl reconfigure
# Allow ssh for git # Allow ssh for git
usermod -a -G "ssh.app" "git" usermod -a -G "ssh.app" "git"

2
scripts/upgrade
View file

@ -277,7 +277,7 @@ touch "$config_path/gitlab-persistent.rb"
chown root:root "$config_path/gitlab-persistent.rb" chown root:root "$config_path/gitlab-persistent.rb"
chmod 640 "$config_path/gitlab-persistent.rb" chmod 640 "$config_path/gitlab-persistent.rb"
gitlab-ctl reconfigure ynh_exec_warn_less gitlab-ctl reconfigure
# Allow ssh for git # Allow ssh for git
usermod -a -G "ssh.app" "git" usermod -a -G "ssh.app" "git"

65
scripts/upgrade.d/upgrade.15.last.sh Normal file
View file

@ -0,0 +1,65 @@
#!/bin/bash
gitlab_version="15.11.5"
# sha256sum found here: https://packages.gitlab.com/gitlab
gitlab_debian_version="$(lsb_release -sc)"
gitlab_x86_64_bullseye_source_sha256="1cc7b52bf8380368321b6aed6eaea6aa08d6f1eca2f11317db0cc64a82c815de"
gitlab_x86_64_buster_source_sha256="49af6b95b9c9eec501e2d8d9d46b89d7958464d7a467892cdaf7e8e435f6b2ce"
gitlab_arm64_bullseye_source_sha256="7712859bc457b262cb33c0ca04c17f7f32013592bc1c96fa86a9621d538f68bc"
gitlab_arm64_buster_source_sha256="0b633b20f05794d703ebf21d641be2a00fdcb1b7ac4d3a9ff5326b66fae14f68"
gitlab_arm_buster_source_sha256="838c832db002b3db16d52f92f2d1390737e43ad81dff78b185829d01ce4e2096"
gitlab_arm_bullseye_source_sha256="fdbe645ef18cfeeef2fc15c9979c6ced35f6717873538b2ade934e3e24b1dd51"
architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
if [ "$architecture" = "x86-64" ]; then
if [ "$gitlab_debian_version" = "bullseye" ]
then
gitlab_source_sha256=$gitlab_x86_64_bullseye_source_sha256
elif [ "$gitlab_debian_version" = "buster" ]
then
gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256
fi
elif [ "$architecture" = "arm64" ]; then
if [ "$gitlab_debian_version" = "bullseye" ]
then
gitlab_source_sha256=$gitlab_arm64_bullseye_source_sha256
elif [ "$gitlab_debian_version" = "buster" ]
then
gitlab_source_sha256=$gitlab_arm64_buster_source_sha256
fi
elif [ "$architecture" = "arm" ]; then
if [ "$gitlab_debian_version" = "bullseye" ]
then
# If the version for arm doesn't exist, then use an older one
if [ -z "$gitlab_arm_buster_source_sha256" ]; then
gitlab_version="15.11.5"
gitlab_arm_buster_source_sha256="838c832db002b3db16d52f92f2d1390737e43ad81dff78b185829d01ce4e2096"
fi
gitlab_source_sha256=$gitlab_arm_buster_source_sha256
elif [ "$gitlab_debian_version" = "buster" ]
then
# If the version for arm doesn't exist, then use an older one
if [ -z "$gitlab_arm_bullseye_source_sha256" ]; then
gitlab_version="15.11.5"
gitlab_arm_bullseye_source_sha256="fdbe645ef18cfeeef2fc15c9979c6ced35f6717873538b2ade934e3e24b1dd51"
fi
gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256
fi
fi
gitlab_filename="gitlab-ce-${gitlab_version}.deb"
# Action to do in case of failure of the package_check
package_check_action() {
ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb"
cat <<EOF >> "$config_path/gitlab.rb"
# Last chance to fix Gitlab
package['modify_kernel_parameters'] = false
EOF
ynh_store_file_checksum --file="$config_path/gitlab.rb"
}

65
scripts/upgrade.d/upgrade.16.first.sh Normal file
View file

@ -0,0 +1,65 @@
#!/bin/bash
gitlab_version="16.0.0"
# sha256sum found here: https://packages.gitlab.com/gitlab
gitlab_debian_version="$(lsb_release -sc)"
gitlab_x86_64_bullseye_source_sha256="1c933d51068f67442de5b01d30869e0854c9199d24910cda43103d2fa49700b5"
gitlab_x86_64_buster_source_sha256="a91533c586e02441393fdb4560d5b7a9852beb339f683c26a9c85e098405e84c"
gitlab_arm64_bullseye_source_sha256="90425b49427b46d8c5dbb09187baf76dbdf372f177f27d6e31b9717cd60849cc"
gitlab_arm64_buster_source_sha256="1393b8fb9498f4ead75aad69d89f9ba6e9281f3619f071f3efeebf72d2d6829f"
gitlab_arm_buster_source_sha256="821bf4d6cf9f12373dc89d7ec757f3546a94a339ad5c1f044d102b9468e840b6"
gitlab_arm_bullseye_source_sha256="2bb0c4145d467c2d79a9067f090ace1b967318a49dc34e969d5abc06040d111e"
architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
if [ "$architecture" = "x86-64" ]; then
if [ "$gitlab_debian_version" = "bullseye" ]
then
gitlab_source_sha256=$gitlab_x86_64_bullseye_source_sha256
elif [ "$gitlab_debian_version" = "buster" ]
then
gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256
fi
elif [ "$architecture" = "arm64" ]; then
if [ "$gitlab_debian_version" = "bullseye" ]
then
gitlab_source_sha256=$gitlab_arm64_bullseye_source_sha256
elif [ "$gitlab_debian_version" = "buster" ]
then
gitlab_source_sha256=$gitlab_arm64_buster_source_sha256
fi
elif [ "$architecture" = "arm" ]; then
if [ "$gitlab_debian_version" = "bullseye" ]
then
# If the version for arm doesn't exist, then use an older one
if [ -z "$gitlab_arm_buster_source_sha256" ]; then
gitlab_version="16.0.0"
gitlab_arm_buster_source_sha256="821bf4d6cf9f12373dc89d7ec757f3546a94a339ad5c1f044d102b9468e840b6"
fi
gitlab_source_sha256=$gitlab_arm_buster_source_sha256
elif [ "$gitlab_debian_version" = "buster" ]
then
# If the version for arm doesn't exist, then use an older one
if [ -z "$gitlab_arm_bullseye_source_sha256" ]; then
gitlab_version="16.0.0"
gitlab_arm_bullseye_source_sha256="2bb0c4145d467c2d79a9067f090ace1b967318a49dc34e969d5abc06040d111e"
fi
gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256
fi
fi
gitlab_filename="gitlab-ce-${gitlab_version}.deb"
# Action to do in case of failure of the package_check
package_check_action() {
ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb"
cat <<EOF >> "$config_path/gitlab.rb"
# Last chance to fix Gitlab
package['modify_kernel_parameters'] = false
EOF
ynh_store_file_checksum --file="$config_path/gitlab.rb"
}

14
scripts/upgrade.d/upgrade.last.sh
View file

@ -1,18 +1,18 @@
#!/bin/bash #!/bin/bash
gitlab_version="15.10.0" gitlab_version="16.0.1"
# sha256sum found here: https://packages.gitlab.com/gitlab # sha256sum found here: https://packages.gitlab.com/gitlab
gitlab_debian_version="$(lsb_release -sc)" gitlab_debian_version="$(lsb_release -sc)"
gitlab_x86_64_bullseye_source_sha256="c8f5aca04549d3f9ba636ca67e76e9bf2b5a6a249a4a16d79365d17856a53d4d" gitlab_x86_64_bullseye_source_sha256="80c07ddf3d1df889a039b0aeb098bd34b836819016a0d33368e7838bb9d95070"
gitlab_x86_64_buster_source_sha256="223b4c3eafd3edf44d9b8153f834c24aface03ea7585db4ccb0292e582fd6345" gitlab_x86_64_buster_source_sha256="03d6417811d81fadda4526a7c8d82529c25c6cb60ee9d4e1e6e82fb2d447e1b0"
gitlab_arm64_bullseye_source_sha256="63d29c92eb956631a478735a6c692bbb315c898b2041b2f545c12302b230c97f" gitlab_arm64_bullseye_source_sha256="6649ef36a3d3e970ae2eb0b4c70ca8edb6c22c8daa9d955af2b9651a8634f06f"
gitlab_arm64_buster_source_sha256="8a29a50bab93d7bbd2bfcfbd968c051739a20d2750c3cee0da2d676738928a77" gitlab_arm64_buster_source_sha256="20524140314569f13a0ed1bbfb03e1338976762b20296848b63c7811e2f01e3c"
gitlab_arm_bullseye_source_sha256="a7a195bf8a74e6ca688de2debe23c0cd5482d989377dcaf7042df484731e10cc" gitlab_arm_buster_source_sha256="c5a5ffa84706e9cc136ff2daded867acf2308c06a4145ae4632a672b0187268b"
gitlab_arm_buster_source_sha256="60f4c441e8f6f25934d6be3bcb9a8fe058b05b7076e7087a18ff747f9afa4b3a" gitlab_arm_bullseye_source_sha256="5ae1219572c78778cc061ed5e13e03ecf3901c317bd218d4a454322bf886f45e"
architecture=$(ynh_app_setting_get --app="$app" --key=architecture) architecture=$(ynh_app_setting_get --app="$app" --key=architecture)

2
tests.toml
View file

@ -5,4 +5,4 @@ test_format = 1.0
# Commits to test upgrade from # Commits to test upgrade from
# ------------------------------- # -------------------------------
test_upgrade_from.7c352aff3fb13fc425d76716477c28db5d54ac99.name = "Upgrade from 12.9.2" test_upgrade_from.722fa8db9d8d840064ffc64338e1170da7cafc37.name = "Upgrade from 15.0.0"