Updating YAML files

diff --git a/deploy.yaml b/deploy.yaml
index fff3009831be1141246809659c81db75ba6f5e22..c0d57969e1ebae4d72a3cddec624642345cc341d 100644 (file)
--- a/deploy.yaml
+++ b/deploy.yaml
@@ -3,24 +3,22 @@
 verbose: 0
 do_sudo: true
 log_dir: '/var/log/webhooks'
-default_email: 'frank@brehm-online.com'
-default_parent_dir: '/www/data'
-smtp_server: 'smtp.pixelpark.com'
+default_email: 'puppet@pixelpark.com'
+default_parent_dir: '/etc/puppetlabs/code/fileserver'
+smtp_server: 'localhost'
 smtp_port: 25
-ignore_projects:
-mail_cc_addresses:
-  - 'webmaster@pixelpark.com'
-  - 'frank.brehm@pixelpark.com'
-sender_address: 'Puppetmaster <frank.brehm@pixelpark.com>'
+ignore_projects: []
+mail_cc_addresses: []
+sender_address: 'Puppetmaster <puppetmaster@pixelpark.com>'
 projects:
   hiera:
     namespace: 'puppet'
     name: 'hiera'
-    parent_dir: '/www/data/puppet-hiera'
+    parent_dir: '/etc/puppetlabs/code'
+    branch: 'master'
   postfix_config:
     namespace: 'ppadmin'
     name: 'postfix_config'
-    parent_dir: '/www/data'
     workdir: 'postfix_config'
     branch: 'master'
 

diff --git a/hooks.yaml b/hooks.yaml
index 00fccb9b5951c530570867606f38d8a11eace733..34c4ed11bdae2e397deebda0a42e37fdc7262121 100644 (file)
--- a/hooks.yaml
+++ b/hooks.yaml
@@ -2,11 +2,9 @@
 verbose: 0
 do_sudo: true
 log_dir: '/var/log/webhooks'
-default_email: 'frank@brehm-online.com'
-default_parent_dir: '/www/data'
-smtp_server: 'smtp.pixelpark.com'
+default_email: 'puppet@pixelpark.com'
+default_parent_dir: '/etc/puppetlabs/code'
+smtp_server: 'localhost'
 smtp_port: 25
-mail_cc_addresses:
-  - 'webmaster@pixelpark.com'
-  - 'frank.brehm@pixelpark.com'
+mail_cc_addresses: []
 sender_address: 'Puppetmaster <frank.brehm@pixelpark.com>'