diff --git a/infrastructure-guide/puppet00.md b/infrastructure-guide/puppet00.md index 371eaafe..7b84b391 100644 --- a/infrastructure-guide/puppet00.md +++ b/infrastructure-guide/puppet00.md @@ -11,7 +11,7 @@ Other optional environments can be arbitrarily created and immediately used unde At https://puppet00.psi.ch/ , a small web app to delete server side certificates is made available. The authentication uses LDAP against the AD, but access rights are granted from the /etc/httpd/conf.d/ssl.conf -**Branches** +# Branches You can create a branch to develop new code from the master branch of the puppet repository. To test the code, a directory with the same name as the branch can be created at puppet00:/srv/puppet/code/dev/envs/ . Upon creating the directory, preprod gets rsynced in here. If the branch alrady exists and if it's to be pulled, that can be done via the command: @@ -25,11 +25,11 @@ This can then be tested on any controlled host by running: puppet agent -t --environment=xyz ``` -**Merge process** +# Merge Process Merge meetings are usually held weekly. To record the meeting a https://git.psi.ch/linux-infra/org/wikis/meeting_reports/YYYY-MM-DD page is to be created based on the https://git.psi.ch/linux-infra/org/wikis/merge-meeting-guidelines template. -**Modules** +# Modules The modules, which are not part of the base repo are to be pulled into /srv/puppet/code/dev/envs/(pre)prod/code/modules/ @@ -43,4 +43,10 @@ The solution is to always run librarian with the lock file removed: [root@puppet00 prod]# /opt/puppetlabs/puppet/bin/librarian-puppet install --path=code/modules ``` -This way the latest commit will be pulled for all incorrectly defined modules. \ No newline at end of file +This way the latest commit will be pulled for all incorrectly defined modules. + +# Hiera / data-xxx +The data-xxx repositories have a webhook configured that points to http://puppet00.psi.ch/events/dataupdate +The triggered webhook code can be found on puppet00 at /var/www/webhook/app/webhook.py + +This webhook checks out the data repositories in /srv/puppet/data