Skip to content

Commit

Permalink
Fix the cfengine test
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindhagberg committed Oct 9, 2024
1 parent b7c7c07 commit c9e5b73
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion server/server.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LDAPprimaryAttr=
LDAPadminGroup=
AllAccessGroups=
HostOwnerPluginURL=
CFEngineKeyDir=
CFEngineKeyDir=/var/cfekeys
PGhost=
PGport=
PGdatabase=
Expand Down
8 changes: 4 additions & 4 deletions tests/test_cfengine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd `dirname $0`
PSQL=../ci/docker/psql.sh

# Configure where reqcert will look for CFEngine keys
docker exec docker-nivlheimweb-1 sh -c 'echo "CFEngineKeyDir=/var/cfekeys" >> /etc/nivlheim/server.conf'
docker exec docker-nivlheimapi-1 sh -c 'echo "CFEngineKeyDir=/var/cfekeys" >> /etc/nivlheim/server.conf'

# Try to run the client without CFEngine signature or any form of pre-approval.
# Should result in it being put on the waiting list.
Expand All @@ -31,10 +31,10 @@ trap finish EXIT
docker cp cfengine.priv banana:/var/cfengine/ppkeys/localhost.priv
docker cp cfengine.pub banana:/var/cfengine/ppkeys/localhost.pub
# and the public key will also be used by the server
docker exec docker-nivlheimweb-1 mkdir -p /var/cfekeys
docker cp cfengine.pub docker-nivlheimweb-1:/var/cfekeys/root-MD5=01234567890123456789012345678932.pub # default value for a machine without cf-key
docker exec docker-nivlheimapi-1 mkdir -p /var/cfekeys
docker cp cfengine.pub docker-nivlheimapi-1:/var/cfekeys/root-MD5=01234567890123456789012345678932.pub # default value for a machine without cf-key
# Ensure the httpd process will have read access
docker exec docker-nivlheimweb-1 chmod -R go+r /var/cfekeys
docker exec docker-nivlheimapi-1 chmod -R go+r /var/cfekeys

function printlogs() {
echo "------- access_log -------------------------------"
Expand Down

0 comments on commit c9e5b73

Please sign in to comment.