diff --git a/bundles/postfixadmin/metadata.py b/bundles/postfixadmin/metadata.py index bed7ab6..b9d6379 100644 --- a/bundles/postfixadmin/metadata.py +++ b/bundles/postfixadmin/metadata.py @@ -60,3 +60,23 @@ def icinga_check_for_new_release(metadata): }, }, } + + +@metadata_reactor.provides( + 'nginx/vhosts/postfixadmin', +) +def nginx(metadata): + if not node.has_bundle('nginx'): + raise DoNotRunAgain + + return { + 'nginx': { + 'vhosts': { + 'postfixadmin': { + 'domain': metadata.get('postfixadmin/domain'), + 'webroot': '/opt/postfixadmin/public/', + 'php': True, + }, + }, + }, + } diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py index 67d7e12..aa51e2f 100644 --- a/nodes/htz-cloud/pirmasens.py +++ b/nodes/htz-cloud/pirmasens.py @@ -37,12 +37,6 @@ nodes['htz-cloud.pirmasens'] = { }, 'nginx': { 'vhosts': { - 'mail.kunsmann.info': { - 'webroot': '/opt/postfixadmin/public/', - 'php': True, - 'website_check_path': '/login.php', - 'website_check_string': 'login', - }, 'salonkatrin.de': { 'website_check_path': '/', 'website_check_string': 'Salon Katrin', @@ -82,6 +76,7 @@ nodes['htz-cloud.pirmasens'] = { 'message_size_limit_mb': 50, }, 'postfixadmin': { + 'domain': 'mail.kunsmann.info', 'version': '3.3.13', 'setup_password': vault.decrypt('encrypt$gAAAAABgnNGpAqUs--qBXII9ZPcHtxaELy9e2Dx9O44n4l0O4nMHPoIyaPW5HkvpQ2zWTlh5OfjjOgunRtE_voJuY0Kdtji37ixAnuL9ErOJ0LDY5QfMkNPUgPs5alwz1baqYq6rqJ7NDmB0gHraY46v5eG79R2EyQ=='), },