Fixed some hardcoded paths

New config option: git_hooks_path

Fixed some hardcoded paths
New config option: git_hooks_path
LeonB
1 parent 04b2864b
Showing 4 changed files with 7 additions and 2 deletions Show diff stats
config/initializers/1_settings.rb
lib/tasks/gitlab/backup.rake
lib/tasks/gitlab/status.rake
lib/tasks/gitlab/write_hook.rake
@@ -66,6 +66,10 @@ class Settings &lt; Settingslogic
       git_host['base_path'] || '/home/git/repositories/'
     end
  
+    def git_hooks_path
+      git_host['hooks_path'] || '/home/git/share/gitolite/hooks/'
+    end
+
     def git_upload_pack
       if git_host['upload_pack'] != false
         true
@@ -145,6 +145,7 @@ namespace :gitlab do
           permission_commands = [
             "sudo chmod -R g+rwX #{Gitlab.config.git_base_path}",
             "sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}",
+            "sudo chown gitlab:gitlab #{Gitlab.config.git_base_path}**/hooks/post-receive"
           ]
           permission_commands.each { |command| Kernel.system(command) }
           puts "[DONE]".green
@@ -56,7 +56,7 @@ namespace :gitlab do
         return
       end
  
-      gitolite_hooks_path = File.join("/home", Gitlab.config.ssh_user, "share", "gitolite", "hooks", "common")
+      gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
       gitlab_hook_files = ['post-receive']
       gitlab_hook_files.each do |file_name|
         dest = File.join(gitolite_hooks_path, file_name)
@@ -2,7 +2,7 @@ namespace :gitlab do
   namespace :gitolite do
     desc "GITLAB | Write GITLAB hook for gitolite"
     task :write_hooks => :environment  do
-      gitolite_hooks_path = File.join("/home", Gitlab.config.ssh_user, "share", "gitolite", "hooks", "common")
+      gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
       gitlab_hooks_path = Rails.root.join("lib", "hooks")
  
       gitlab_hook_files = ['post-receive']
...	...	@@ -66,6 +66,10 @@ class Settings < Settingslogic
66	66	git_host['base_path'] \|\| '/home/git/repositories/'
67	67	end
68	68
	69	+ def git_hooks_path
	70	+ git_host['hooks_path'] \|\| '/home/git/share/gitolite/hooks/'
	71	+ end
	72	+
69	73	def git_upload_pack
70	74	if git_host['upload_pack'] != false
71	75	true
...	...
...	...	@@ -145,6 +145,7 @@ namespace :gitlab do
145	145	permission_commands = [
146	146	"sudo chmod -R g+rwX #{Gitlab.config.git_base_path}",
147	147	"sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}",
	148	+ "sudo chown gitlab:gitlab #{Gitlab.config.git_base_path}**/hooks/post-receive"
148	149	]
149	150	permission_commands.each { \|command\| Kernel.system(command) }
150	151	puts "[DONE]".green
...	...
...	...	@@ -56,7 +56,7 @@ namespace :gitlab do
56	56	return
57	57	end
58	58
59		- gitolite_hooks_path = File.join("/home", Gitlab.config.ssh_user, "share", "gitolite", "hooks", "common")
	59	+ gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
60	60	gitlab_hook_files = ['post-receive']
61	61	gitlab_hook_files.each do \|file_name\|
62	62	dest = File.join(gitolite_hooks_path, file_name)
...	...
...	...	@@ -2,7 +2,7 @@ namespace :gitlab do
2	2	namespace :gitolite do
3	3	desc "GITLAB \| Write GITLAB hook for gitolite"
4	4	task :write_hooks => :environment do
5		- gitolite_hooks_path = File.join("/home", Gitlab.config.ssh_user, "share", "gitolite", "hooks", "common")
	5	+ gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
6	6	gitlab_hooks_path = Rails.root.join("lib", "hooks")
7	7
8	8	gitlab_hook_files = ['post-receive']
...	...