From: Sascha Strassheim Date: Fri, 10 Nov 2017 12:14:59 +0000 (+0100) Subject: excluded generic configs to common.yaml of test-webstats01.pixelpark.net X-Git-Tag: v0.1.0~2089^2~10 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=dea7f744a0bd1670826153eeda50bfcbc82635b0;p=pixelpark%2Fhiera.git excluded generic configs to common.yaml of test-webstats01.pixelpark.net --- diff --git a/customer/pixelpark-piwik/common.yaml b/customer/pixelpark-piwik/common.yaml index 3b0442d3..27703c2b 100644 --- a/customer/pixelpark-piwik/common.yaml +++ b/customer/pixelpark-piwik/common.yaml @@ -1,2 +1,5 @@ --- -infra::role: base +# php 7 +repo::remi_php71: true +# Postfix Config +postfix::myorigin: 'pixelpark.com' diff --git a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml index 0c8d6297..bd147545 100644 --- a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml +++ b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml @@ -14,23 +14,10 @@ accounts::users: jenkins: apply: true -# postfix mail config -postfix::alias_maps: "hash:/etc/aliases" -postfix::inet_interfaces: 'all' -postfix::manage_mailx: false -postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf' -postfix::myorigin: "pixelpark.net" - -# Default values for PP Postfix module -infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}" - # mysql credentials mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAln+KjMw58eMGkrIkEx9Srs2YAsRTbeppNXaEcALA/cz8UaalEDKyCygzVgFIQuDXM8Ga+FR/lLxQ7tNVJAJl9tvC5HAS9ND6sPMc5Z7T55X5SeKq5+DoXswRUjppouXaw5zMUiZ125aOMfaXz6nSOnn28k5JRl+nqjRrzs6WA1/nHUxetXKvNUaBQ68fMSNVDRYVHdMgOlMRDnD6I7LFtjP0nOWqoOp/gw8y/0M9+lW62DbXVnZk9gwPXXwKv5/QOhbRsJB5yI/gNf4FDSK4kNEkBkVB3Xe11MY97WGHhpsmo3imrk7FW2pZMg4zUazPRL+4n6qarHad2Smh2R56jDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBXZ0xuIRq2FXD9xgKBTaNQgCAa1flgxurPkk4tFo2rsHPv9xcb2b79gKBHQ+rPoFjfkg==] mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArSaR1AVNv4Jv4LdxYqOVy7QzUQHgjnHuCk6K1LSEESHoCk4p+HkQzKPblYryiSW4ElnQzcMuRmKRa0YYU7NW3nGshp8wkAkGb59tQZcZv0Jl67+arq5na9krTap6fKmaiKtCjI4cCJcSIJKXvmOPx/iGSe7aPutJvyWsE3rKMaEzgzxfddTZ9wyYqWN2Lwkdd6U0rbKl3yuPA2LsQnmP/3xboqpS/HLar27KPEVSvyMrpIirapQNtviGa2i2vi7gOV/3bO+O/9k86QlOpOjEZTo98SsBPUcSLZD0UCLS/FT2Hc3t/NCbW6r6wQvFhY3Pqh8JBA3s3Pw8lQwNSpmmsjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC8kAfi3EZ/jvR+xh+3F2j6gCB32kwVDJUaDsSfoPHgvsJibS1LSGkp0+L349kG04acxw==] -# get php7 -repo::remi_php70: true - # php-fpm config php::fpm::pools: www: