Update the init.d file to the correct locationof the example defaults file

Update the example defaults, include the rest of he variables

Update the init.d file to the correct locationof the example defaults file
Update the example defaults, include the rest of he variables
Arif Ali
1 parent 18fac587
Showing 2 changed files with 18 additions and 1 deletions Show diff stats
lib/support/init.d/gitlab
lib/support/init.d/gitlab.default.example
@@ -20,7 +20,7 @@
 # DO NOT EDIT THIS FILE!
 # This file will be overwritten on update.
 # Instead add/change your variables in /etc/default/gitlab
-# An example defaults file can be found in lib/support/default/gitlab
+# An example defaults file can be found in lib/support/init.d/gitlab.default.example
 ###
@@ -12,3 +12,20 @@ app_user=&quot;git&quot;
 # app_root defines the folder in which gitlab and it's components are installed.
 # The default is "/home/$app_user/gitlab"
 app_root="/home/$app_user/gitlab"
+
+# pid_path defines a folder in which the gitlab and it's components place their pids.
+# This variable is also used below to define the relevant pids for the gitlab components.
+# The default is "$app_root/tmp/pids"
+pid_path="$app_root/tmp/pids"
+
+# socket_path defines the folder in which gitlab places the sockets
+#The default is "$app_root/tmp/sockets"
+socket_path="$app_root/tmp/sockets"
+
+# web_server_pid_path defines the path in which to create the pid file fo the web_server
+# The default is "$pid_path/unicorn.pid"
+web_server_pid_path="$pid_path/unicorn.pid"
+
+# sidekiq_pid_path defines the path in which to create the pid file for sidekiq
+# The default is "$pid_path/sidekiq.pid"
+sidekiq_pid_path="$pid_path/sidekiq.pid"
	@@ -20,7 +20,7 @@		@@ -20,7 +20,7 @@
20	# DO NOT EDIT THIS FILE!	20	# DO NOT EDIT THIS FILE!
21	# This file will be overwritten on update.	21	# This file will be overwritten on update.
22	# Instead add/change your variables in /etc/default/gitlab	22	# Instead add/change your variables in /etc/default/gitlab
23	-# An example defaults file can be found in lib/support/default/gitlab	23	+# An example defaults file can be found in lib/support/init.d/gitlab.default.example
24	###	24	###
25		25
26		26
	@@ -12,3 +12,20 @@ app_user="git"		@@ -12,3 +12,20 @@ app_user="git"
12	# app_root defines the folder in which gitlab and it's components are installed.	12	# app_root defines the folder in which gitlab and it's components are installed.
13	# The default is "/home/$app_user/gitlab"	13	# The default is "/home/$app_user/gitlab"
14	app_root="/home/$app_user/gitlab"	14	app_root="/home/$app_user/gitlab"
		15	+
		16	+# pid_path defines a folder in which the gitlab and it's components place their pids.
		17	+# This variable is also used below to define the relevant pids for the gitlab components.
		18	+# The default is "$app_root/tmp/pids"
		19	+pid_path="$app_root/tmp/pids"
		20	+
		21	+# socket_path defines the folder in which gitlab places the sockets
		22	+#The default is "$app_root/tmp/sockets"
		23	+socket_path="$app_root/tmp/sockets"
		24	+
		25	+# web_server_pid_path defines the path in which to create the pid file fo the web_server
		26	+# The default is "$pid_path/unicorn.pid"
		27	+web_server_pid_path="$pid_path/unicorn.pid"
		28	+
		29	+# sidekiq_pid_path defines the path in which to create the pid file for sidekiq
		30	+# The default is "$pid_path/sidekiq.pid"
		31	+sidekiq_pid_path="$pid_path/sidekiq.pid"