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

fix ports

This commit is contained in:
Kay0u 2023-03-04 23:12:11 +01:00
parent 0406947a69
commit d1d354971c
No known key found for this signature in database
GPG key ID: AE1DCADB6415A156
7 changed files with 10 additions and 10 deletions

View file

@ -1010,7 +1010,7 @@ puma['max_threads'] = __PUMA_MAX_THREADS__
### Advanced settings ### Advanced settings
# puma['listen'] = '127.0.0.1' # puma['listen'] = '127.0.0.1'
puma['port'] = __PUMA_PORT__ puma['port'] = __PORT_PUMA__
# puma['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' # puma['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket'
# puma['somaxconn'] = 1024 # puma['somaxconn'] = 1024
@ -1066,7 +1066,7 @@ puma['port'] = __PUMA_PORT__
# sidekiq['metrics_enabled'] = true # sidekiq['metrics_enabled'] = true
# sidekiq['exporter_log_enabled'] = false # sidekiq['exporter_log_enabled'] = false
# sidekiq['listen_address'] = "localhost" # sidekiq['listen_address'] = "localhost"
sidekiq['listen_port'] = __SIDEKIQ_PORT__ sidekiq['listen_port'] = __PORT_SIDEKIQ__
################################################################################ ################################################################################
## gitlab-shell ## gitlab-shell

View file

@ -1058,7 +1058,7 @@ puma['max_threads'] = __PUMA_MAX_THREADS__
### Advanced settings ### Advanced settings
# puma['listen'] = '127.0.0.1' # puma['listen'] = '127.0.0.1'
puma['port'] = __PUMA_PORT__ puma['port'] = __PORT_PUMA__
# puma['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' # puma['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket'
# puma['somaxconn'] = 1024 # puma['somaxconn'] = 1024
@ -1132,7 +1132,7 @@ puma['port'] = __PUMA_PORT__
# sidekiq['exporter_tls_cert_path'] = "" # sidekiq['exporter_tls_cert_path'] = ""
# sidekiq['exporter_tls_key_path'] = "" # sidekiq['exporter_tls_key_path'] = ""
# sidekiq['listen_address'] = "localhost" # sidekiq['listen_address'] = "localhost"
sidekiq['listen_port'] = __SIDEKIQ_PORT__ sidekiq['listen_port'] = __PORT_SIDEKIQ__
##! Specifies where health-check endpoints should be made available for Sidekiq processes. ##! Specifies where health-check endpoints should be made available for Sidekiq processes.
##! Defaults to the same settings as for Prometheus metrics (see above). ##! Defaults to the same settings as for Prometheus metrics (see above).

View file

@ -64,7 +64,7 @@ gitlab-ctl reconfigure
#================================================= #=================================================
ynh_script_progression --message="Waiting for GitLab..." --weight=15 ynh_script_progression --message="Waiting for GitLab..." --weight=15
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$port_puma" --timeout=300
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

View file

@ -190,7 +190,7 @@ ynh_systemd_action --action=reload --service_name=nginx
#================================================= #=================================================
ynh_script_progression --message="Restarting GitLab..." --weight=15 ynh_script_progression --message="Restarting GitLab..." --weight=15
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$port_puma" --timeout=300
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

View file

@ -102,7 +102,7 @@ yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/applica
#================================================= #=================================================
ynh_script_progression --message="Waiting for GitLab..." --weight=14 ynh_script_progression --message="Waiting for GitLab..." --weight=14
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$port_puma" --timeout=300
#================================================= #=================================================
# CHECK THE RESTORED DATA # CHECK THE RESTORED DATA

View file

@ -309,7 +309,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Restarting GitLab..." --weight=15 ynh_script_progression --message="Restarting GitLab..." --weight=15
ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$puma_port" --timeout=300 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on http://127.0.0.1:$port_puma" --timeout=300
fi fi
#================================================= #=================================================

View file

@ -138,10 +138,10 @@ EOS"
sed -i "s/# puma\['worker_processes'\] = .*/puma['worker_processes'] = __PUMA_WORKER_PROCESSES__/" $conf_file sed -i "s/# puma\['worker_processes'\] = .*/puma['worker_processes'] = __PUMA_WORKER_PROCESSES__/" $conf_file
sed -i "s/# puma\['min_threads'\] = .*/puma['min_threads'] = __PUMA_MIN_THREADS__/" $conf_file sed -i "s/# puma\['min_threads'\] = .*/puma['min_threads'] = __PUMA_MIN_THREADS__/" $conf_file
sed -i "s/# puma\['max_threads'\] = .*/puma['max_threads'] = __PUMA_MAX_THREADS__/" $conf_file sed -i "s/# puma\['max_threads'\] = .*/puma['max_threads'] = __PUMA_MAX_THREADS__/" $conf_file
sed -i "s/# puma\['port'\] = .*/puma['port'] = __PUMA_PORT__/" $conf_file sed -i "s/# puma\['port'\] = .*/puma['port'] = __PORT_PUMA__/" $conf_file
# Change sidekiq settings # Change sidekiq settings
sed -i "s/# sidekiq\['listen_port'\] = .*/sidekiq['listen_port'] = __SIDEKIQ_PORT__/" $conf_file sed -i "s/# sidekiq\['listen_port'\] = .*/sidekiq['listen_port'] = __PORT_SIDEKIQ__/" $conf_file
# Change nginx settings # Change nginx settings
sed -i "s/# nginx\['client_max_body_size'\] = .*/nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__'/" $conf_file sed -i "s/# nginx\['client_max_body_size'\] = .*/nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__'/" $conf_file