From: Frank Brehm Date: Fri, 20 Oct 2017 13:22:47 +0000 (+0200) Subject: Changing default values X-Git-Tag: 0.8.4~11 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5ac251edbb0da803889d5805b773196e36225b07;p=pixelpark%2Fpuppetmaster-webhooks.git Changing default values --- diff --git a/hooks.yaml b/hooks.yaml index 34c4ed1..4ca24c0 100644 --- 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 ' +sender_address: 'Puppetmaster ' diff --git a/lib/webhooks/base_app.py b/lib/webhooks/base_app.py index b796e27..29e8967 100644 --- 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')