Changing default values

diff --git a/hooks.yaml b/hooks.yaml
index 34c4ed11bdae2e397deebda0a42e37fdc7262121..4ca24c019d56cbe7639523842563a8a005359f28 100644 (file)
--- a/hooks.yaml
+++ b/hooks.yaml
@@ -7,4 +7,4 @@ default_parent_dir: '/etc/puppetlabs/code'
 smtp_server: 'localhost'
 smtp_port: 25
 mail_cc_addresses: []
-sender_address: 'Puppetmaster <frank.brehm@pixelpark.com>'
+sender_address: 'Puppetmaster <puppetmaster@pixelpark.com>'

diff --git a/lib/webhooks/base_app.py b/lib/webhooks/base_app.py
index b796e271a41f6e0433c4a5353ca1d2b6d6980b21..29e8967ea919044ae9d96b54f48066ac2f73672a 100644 (file)
--- a/lib/webhooks/base_app.py
+++ b/lib/webhooks/base_app.py
@@ -31,8 +31,10 @@ from webhooks.common import pp, to_bytes, to_bool
 
 __version__ = webhooks.__version__
 LOG = logging.getLogger(__name__)
-DEFAULT_EMAIL = 'frank.brehm@pixelpark.com'
-DEFAULT_SENDER = 'Puppetmaster <{}>'.format(DEFAULT_EMAIL)
+DEFAULT_FROM_EMAIL = 'puppetmaster@pixelpark.com'
+DEFAULT_FROM_SENDER = 'Puppetmaster <{}>'.format(DEFAULT_FROM_EMAIL)
+DEFAULT_TO_EMAIL = 'puppet@pixelpark.com'
+DEFAULT_TO_SENDER = 'Puppet <{}>'.format(DEFAULT_TO_EMAIL)
 
 
 # =============================================================================
@@ -95,17 +97,16 @@ class BaseHookApp(object):
         self.curl_bin = None
 
         self.error_data = []
-        self.smtp_server = 'smtp.pixelpark.com'
+        self.smtp_server = 'localhost'
         self.smtp_port = 25
 
-        self.default_parent_dir = '/www/data'
-        self.default_email = DEFAULT_EMAIL
+        self.default_parent_dir = '/var/log/webhooks'
+        self.default_email = DEFAULT_TO_EMAIL
         self.mail_to_addresses = []
         self.mail_cc_addresses = [
-            'webmaster@pixelpark.com',
             self.default_email,
         ]
-        self.sender_address = DEFAULT_SENDER
+        self.sender_address = DEFAULT_FROM_SENDER
 
         self._log_directory = os.sep + os.path.join('var', 'log', 'webhooks')