Skip to content
Snippets Groups Projects
Commit 3102b8d1 authored by Lukas Werner's avatar Lukas Werner
Browse files

Fix namespaced auth

parent 3dcc821c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
runner_scripts/root/cleanup.sh
+ 1
− 1
View file @ 3102b8d1
...@@ -36,7 +36,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist" ...@@ -36,7 +36,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist"
## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable) ## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable)
AUTH_KEY=$CUSTOM_ENV_AUTH_KEY AUTH_KEY=$CUSTOM_ENV_AUTH_KEY
AUTH_PUB="/etc/gitlab-runner/auth/${CI_SERVER_HOST}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/authorized_keys" AUTH_PUB="/etc/gitlab-runner/auth/${CUSTOM_ENV_CI_SERVER_HOST}/${CUSTOM_ENV_CI_PROJECT_NAMESPACE}/${CUSTOM_ENV_CI_PROJECT_NAME}/authorized_keys"
if [[ ! -f "$AUTH_PUB" ]]; then if [[ ! -f "$AUTH_PUB" ]]; then
error "Authentication for user $AUTH_USER not configured for this project." error "Authentication for user $AUTH_USER not configured for this project."
......
runner_scripts/root/config.sh
+ 1
− 1
View file @ 3102b8d1
...@@ -17,7 +17,7 @@ function error { ...@@ -17,7 +17,7 @@ function error {
[ -z "${CUSTOM_ENV_AUTH_USER:+x}" ] && error "AUTH_USER CI/CD variable has not been set." [ -z "${CUSTOM_ENV_AUTH_USER:+x}" ] && error "AUTH_USER CI/CD variable has not been set."
[ -z "${CUSTOM_ENV_AUTH_KEY:+x}" ] && error "AUTH_KEY secret CI/CD variable has not been set." [ -z "${CUSTOM_ENV_AUTH_KEY:+x}" ] && error "AUTH_KEY secret CI/CD variable has not been set."
AUTH_PUB="/etc/gitlab-runner/auth/${CI_SERVER_HOST}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/authorized_keys" AUTH_PUB="/etc/gitlab-runner/auth/${CUSTOM_ENV_CI_SERVER_HOST}/${CUSTOM_ENV_CI_PROJECT_NAMESPACE}/${CUSTOM_ENV_CI_PROJECT_NAME}/authorized_keys"
if [[ ! -f "$AUTH_PUB" ]]; then if [[ ! -f "$AUTH_PUB" ]]; then
error "Authentication for user $AUTH_USER not configured for this project." error "Authentication for user $AUTH_USER not configured for this project."
fi fi
......
runner_scripts/root/run.sh
+ 1
− 1
View file @ 3102b8d1
...@@ -41,7 +41,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist" ...@@ -41,7 +41,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist"
## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable) ## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable)
AUTH_KEY=$CUSTOM_ENV_AUTH_KEY AUTH_KEY=$CUSTOM_ENV_AUTH_KEY
AUTH_PUB="/etc/gitlab-runner/auth/${CI_SERVER_HOST}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/authorized_keys" AUTH_PUB="/etc/gitlab-runner/auth/${CUSTOM_ENV_CI_SERVER_HOST}/${CUSTOM_ENV_CI_PROJECT_NAMESPACE}/${CUSTOM_ENV_CI_PROJECT_NAME}/authorized_keys"
if [[ ! -f "$AUTH_PUB" ]]; then if [[ ! -f "$AUTH_PUB" ]]; then
error "Authentication for user $AUTH_USER not configured for this project." error "Authentication for user $AUTH_USER not configured for this project."
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment