Commit d48de7c3 authored by Kirill Smelkov's avatar Kirill Smelkov

X proper place for notused-sshkeys + gitlab-shell setup on instance setup

parent 26431a11
...@@ -19,11 +19,18 @@ gitlab-rake <task> ...@@ -19,11 +19,18 @@ gitlab-rake <task>
(see doc/raketasks/*) (see doc/raketasks/*)
gitlab:check gitlab:check
gitlab:*:check -> promise gitlab:*:check -> promise
:check
:app:check + (init scripts)
:gitlab_shell:check repo-perm, ssh-keys
:incoming_email:chec +
:repo:check + (fsck repos)
:sidekiq:check +
gitlab:env:info gitlab:env:info
gitlab:import:repos gitlab:import:repos
gitlab:setup gitlab:setup
gitlab:shell:install
gitlab:shell:setup gitlab:shell:setup
gitlab:web_hook:{add,rm,list} gitlab:web_hook:{add,rm,list}
......
...@@ -625,7 +625,8 @@ command = ...@@ -625,7 +625,8 @@ command =
-d ${service-postgresql:dbname} \ -d ${service-postgresql:dbname} \
-c '\d' | grep -q '^No relations found' ; then -c '\d' | grep -q '^No relations found' ; then
${:rake} db:schema:load db:seed_fu ${:rake} db:schema:load db:seed_fu
fi fi &&
force=yes ${:rake} gitlab:shell:setup
......
...@@ -28,7 +28,7 @@ repos_path: "{{ gitlab.repositories }}" ...@@ -28,7 +28,7 @@ repos_path: "{{ gitlab.repositories }}"
# File used as authorized_keys for gitlab user # File used as authorized_keys for gitlab user
# NOTE not used in slapos version (all access via http only) # NOTE not used in slapos version (all access via http only)
auth_file: "TODO" auth_file: "{{ gitlab.var }}/sshkeys-notused"
# File that contains the secret key for verifying access to GitLab. # File that contains the secret key for verifying access to GitLab.
# Default is .gitlab_shell_secret in the root directory. # Default is .gitlab_shell_secret in the root directory.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment