From af69ac887a1c413b7234cbf8c0a6a15e9dc3e1d5 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Apr 15 2020 18:52:03 +0000 Subject: move sudo rule to deploy latest salt git to saltmaster ... which is now the gitlab runner for deploy_job --- diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls index d21de4c..d7ca2e2 100644 --- a/pillar/role/saltmaster.sls +++ b/pillar/role/saltmaster.sls @@ -44,3 +44,10 @@ salt: reactor: - 'salt/fileserver/gitfs/update': - /srv/reactor/update_fileserver.sls + +sudoers: + included_files: + /etc/sudoers.d/gitlab-runner_nopasswd_salt_event: + users: + gitlab-runner: + - 'ALL=(root) NOPASSWD:SETENV: /usr/bin/salt-call event.*' diff --git a/pillar/role/worker_gitlab.sls b/pillar/role/worker_gitlab.sls index db44422..792d600 100644 --- a/pillar/role/worker_gitlab.sls +++ b/pillar/role/worker_gitlab.sls @@ -1,6 +1 @@ -sudoers: - included_files: - /etc/sudoers.d/gitlab-runner_nopasswd_salt_event: - users: - gitlab-runner: - - 'ALL=(root) NOPASSWD:SETENV: /usr/bin/salt-call event.*' +#