65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
|
diff --git a/config.yml.example b/config.yml.example
|
||
|
|
index 166e384..4a47b28 100644
|
||
|
|
--- a/config.yml.example
|
||
|
|
+++ b/config.yml.example
|
||
|
|
@@ -25,11 +25,11 @@ http_settings:
|
||
|
|
self_signed_cert: false
|
||
|
|
|
||
|
|
# File used as authorized_keys for gitlab user
|
||
|
|
-auth_file: "/home/git/.ssh/authorized_keys"
|
||
|
|
+auth_file: "/var/lib/git/.ssh/authorized_keys"
|
||
|
|
|
||
|
|
# File that contains the secret key for verifying access to GitLab.
|
||
|
|
-# Default is .gitlab_shell_secret in the root directory.
|
||
|
|
-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
|
||
|
|
+# Default is /opt/gitlab/.gitlab_shell_secret.
|
||
|
|
+# secret_file: "/opt/gitlab/.gitlab_shell_secret"
|
||
|
|
|
||
|
|
# Redis settings used for pushing commit notices to gitlab
|
||
|
|
redis:
|
||
|
|
@@ -43,7 +43,7 @@ redis:
|
||
|
|
|
||
|
|
# Log file.
|
||
|
|
# Default is gitlab-shell.log in the root directory.
|
||
|
|
-# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
|
||
|
|
+log_file: "/var/log/gitlab/gitlab-shell.log"
|
||
|
|
|
||
|
|
# Log level. INFO by default
|
||
|
|
log_level: INFO
|
||
|
|
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
|
||
|
|
index beaf173..6e1b799 100644
|
||
|
|
--- a/lib/gitlab_config.rb
|
||
|
|
+++ b/lib/gitlab_config.rb
|
||
|
|
@@ -4,11 +4,11 @@ class GitlabConfig
|
||
|
|
attr_reader :config
|
||
|
|
|
||
|
|
def initialize
|
||
|
|
- @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml'))
|
||
|
|
+ @config = YAML.load_file('/etc/gitlab-shell.yml')
|
||
|
|
end
|
||
|
|
|
||
|
|
def home
|
||
|
|
- ENV['HOME']
|
||
|
|
+ "/var/lib/git"
|
||
|
|
end
|
||
|
|
|
||
|
|
def auth_file
|
||
|
|
@@ -16,7 +16,7 @@ class GitlabConfig
|
||
|
|
end
|
||
|
|
|
||
|
|
def secret_file
|
||
|
|
- @config['secret_file'] ||= File.join(ROOT_PATH, '.gitlab_shell_secret')
|
||
|
|
+ @config['secret_file'] ||= "/opt/gitlab/.gitlab_shell_secret"
|
||
|
|
end
|
||
|
|
|
||
|
|
def gitlab_url
|
||
|
|
@@ -36,7 +36,7 @@ class GitlabConfig
|
||
|
|
end
|
||
|
|
|
||
|
|
def log_file
|
||
|
|
- @config['log_file'] ||= File.join(ROOT_PATH, 'gitlab-shell.log')
|
||
|
|
+ @config['log_file'] ||= "/var/log/gitlab/gitlab-shell.log"
|
||
|
|
end
|
||
|
|
|
||
|
|
def log_level
|