at 18.09-beta 27 lines 925 B view raw
1diff --git a/go/internal/config/config.go b/go/internal/config/config.go 2index c57b4de..88cfc95 100644 3--- a/go/internal/config/config.go 4+++ b/go/internal/config/config.go 5@@ -27,7 +27,7 @@ func New() (*Config, error) { 6 } 7 cfg.RootDir = dir 8 9- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile)) 10+ configBytes, err := ioutil.ReadFile("/run/gitlab/shell-config.yml") 11 if err != nil { 12 return nil, err 13 } 14diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb 15index 1452f95..2b40327 100644 16--- a/lib/gitlab_shell.rb 17+++ b/lib/gitlab_shell.rb 18@@ -180,7 +180,8 @@ class GitlabShell 19 end 20 21 # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. 22- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) 23+ # Except we don't, because we're already in the right directory on nixos! 24+ Kernel.exec(env, *args, unsetenv_others: true) 25 end 26 27 def api