Merge pull request #5471 from dex4er/feature_etc_default_gitlab

Read configuration variable file (/etc/default/gitlab) if it is present

Merge pull request #5471 from dex4er/feature_etc_default_gitlab
Read configuration variable file (/etc/default/gitlab) if it is present
Jacob Vosmaer
2 parents abf11135 5c98cae9
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
lib/support/init.d/gitlab
@@ -31,6 +31,8 @@ sidekiq_pid_path=&quot;$pid_path/sidekiq.pid&quot;
  
 ### Here ends user configuration ###
  
+# Read configuration variable file if it is present
+test -f /etc/default/gitlab && . /etc/default/gitlab
  
 # Switch to the app_user if it is not he/she who is running the script.
 if [ "$USER" != "$app_user" ]; then
...	...	@@ -31,6 +31,8 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
31	31
32	32	### Here ends user configuration ###
33	33
	34	+# Read configuration variable file if it is present
	35	+test -f /etc/default/gitlab && . /etc/default/gitlab
34	36
35	37	# Switch to the app_user if it is not he/she who is running the script.
36	38	if [ "$USER" != "$app_user" ]; then
...	...