From c8e5f0e105c4942b38ecd71a5b71484a41e2235f Mon Sep 17 00:00:00 2001 From: Sascha Date: Fri, 24 Aug 2018 14:40:57 +0200 Subject: [PATCH] deuwo cleanup - markus temp sudo --- customer/deuwo/production.yaml | 2 +- ...b01-deutsche-wohnen-com.pixelpark.net.yaml | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/customer/deuwo/production.yaml b/customer/deuwo/production.yaml index fbd8b595..68636b76 100644 --- a/customer/deuwo/production.yaml +++ b/customer/deuwo/production.yaml @@ -15,7 +15,7 @@ accounts::users: sudo: false markus.baumann: apply: false - sudo: false + sudo: true sudo::configs: jenkins_deploy: diff --git a/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml b/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml index 832eb841..e19623f5 100644 --- a/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml +++ b/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml @@ -7,26 +7,22 @@ infra::additional_classes: - infra::profile::cron - logstash +# cron to sync immo objects to test + infra::profile::cron::cronjobs: rsync_immobilien_live_to_test: - # cron kann mit ensure: 'present' wieder aktiviert werden ensure: 'present' user: rsyncer command: '/bin/rsync -a -e "ssh -i /home/rsyncer/.ssh/id_rsa" --exclude "/var/www/openimmo_import/immoImages" --exclude "/var/www/openimmo_import/temp" --exclude "/var/www/openimmo_import/backup" /var/www/openimmo_import/ rsyncer@test-web01-deutsche-wohnen-com:/home/rsyncer/openimmo_import --delete' minute: '*/3' description: rsync_imports_live_2_test +# postfix mailrelay mail01/02 + postfix::myorigin: 'deutsche-wohnen.com' -#infra::profile::postfix::relayhost: 213.61.61.162 -#infra::profile::postfix::smtp_fallback_relay: 194.113.254.20 -infra::profile::apache_php::fpm_pool: - symfony: - listen_owner: apache - listen_group: apache - pm_max_children: 20 +# mysql server -# mysql mysql::server::package_name: MariaDB-server mysql::client::package_name: MariaDB-client infra::additional_files: @@ -43,6 +39,8 @@ infra::additional_files: gpgcheck=1 gpgkey=http://repo.pixelpark.com/Linux/yum/mariadb/RPM-GPG-KEY-MariaDB +# mysql databases + mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkyYqvd78yxS0FNnXm/aEoI+ql+FjF4KZOKikBDIfMofGQpVEDlDqni7bqk2dEDmT3NEW0kfp7y+Y6XUmLlZjzzNLQlLOU/jkiIUQpbQo+kgLDFS5oYoITpR/xiwwllOuCtCr8MlN4w5InEqzcI/Isn9Sw55TXkpqQfUDVlFag5IrtUnDAkb+6JnWxaydC2cPyL8ZX58iF5ZB61F4r2s5O89QIgD/+eDMTDJeOcQ5t8LF5bpkbU+Yd7bOMSvSAX+rq9HjEMjVNHSEZP30zsMZCHCvh5WGhdaW5h8pqdnRK5rjWfmkXmxF6EnX+dobIFML1Zyxce543kspbVnSmO3RNzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6Jka9uWz/dBVXyxRY2lHhgCCgpASQWxM6wxjFu+TU2uYQO71RRiHEwxHxgp8A86BWSQ==] mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcPa6IuKBX6cVU1M8uzSgNmjdzDI6UJzgJu0PTIAYQ74ueBBsA8LVVJPkPRc2HG+LPQRgSeMdWM/JbcS3J7FQLJUXIF6I1Th6na36CLPpkMq7CPfMstlo8pakfHEFUHdqTIpFtEfCOUL33SovWvsQsJ3IU0mC/VNphrEkU1oP6Abt6BJfo7sliE2H+LtSS6l7tpGBiCo1sYKMETYhH9zqBtApWnYhyyNIaleTY5EoA4pqIG3ACb6dKY3PL2jayjqJPCNWrwzzr2TxglI/IREN7i0fxd29qj+UmpvsAMyCfZWZrS69AeuclvMApEe5SEDLtyx/4ruDk3gl7i5rCTDyLDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBSrmjzZHl7pMDJbDbPdb3SgCDLkycTuUMezFKyDOc8BtR1ok/2gIPgjen5i1+zURplqA==] @@ -51,21 +49,32 @@ infra::profile::mysql_server::databases: user: deuwo-immo password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAxEzbiKaIyOvhcYCuYVumqNn0GHq5VXbKjrq4p8yXXfaqZp2yGqcxrURR7tbR2YDq9mBFLzv4wnm9ksRbBhRFk9ZceBmcOzUV+syFyAhiZgTcDZStlcyxRUYnMxA2Mj2AmNTNwllCoJbqIMAL9+wp+0O5yUy2QZIy40pXjauPx+klA0rdEoxTtt5I1EMiXaxURvoxCjEADDb3J8mlWJv1xcm8DvggGqp3jmKau5JwN29Ni1CeaCL/D5aqCRCF+Dc5c8kz0EVnaT0LQKRSDCyNYtw6MIThe0GliU8N5NPiEFtP85MlugbG80nRsutg0XthhNrjHJRFweCmhWUe7Hv7GTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAabzmgJIREQjj0SurR2wlogCC+UNp0KpFLtIz7m5W5lrnOmdVmvTRNShDozHDlHroo5g==] +# htaccess for typo3 loginpage + infra::profile::apache::htdigest: server: www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAasW9y0F8HDaBiwALaXtBhZR9ZmMyEliSoiEVxu+MWBRubCmDdccHXHODEX2QBtjCF8jWs6MHL5E6sWY5Yos4R+ka6Y8mkyepZ5Ef7WtJXbetkIk8v3/giyxkrQ34wLcxFr/FC74nUEaTLuyl75hWPTajIBDm9/WXdv9RMwZhVh4JeTdLF9CMVd9OyEjl8AxHgjJ3hXzthdq9EBtZEEL6TNfNsjnplcg/by407w4n9oPWUEFbJciKLxzShYsjJTQH9uxErOM6ssBcit9xojsGmZ+B8z+pshpHHmjpYgCdyOYhm2wYedvqJYFT07+ysDC7UAPmIhY3uWqa3nND4VR7PDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBvEH7TyS7+etoEhChmHzFigCDlGKH9QDhrnU+6dsusq+LZTvJ+/7Bu6wB8+2UfvTt8xQ==] +# fpm pool + +infra::profile::apache_php::fpm_pool: + symfony: + listen_owner: apache + listen_group: apache + pm_max_children: 20 + # ssl ssl_cipher apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH' +# deuwo typo CMS vhost + infra::profile::typo3::projects_composer_monolith: deuwo: db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYzA1I2aYByST5c5kiWSV6gaGHh28ez7Mq/kGr/Hlxz5ynso3OoWW/Kk8wNvXKOPZmDf3LBV3WXSe+ckG3x1iXFpM9LSjila5zhsMlSfrAcTSuZb+TwFQbUyzB89s1Tpc4X0ocTqPn+FEvkqQnrMgxZV25hEFb1FSFiBMCjAiYW4xCNvz3hSkq2KOI1Jch7J6bJYhnJBWazaKjp4pQfqvA64OAI0Yh7DoYM5IEyjfmFLAVoZgI0ZCTzGKeX268Hh7JGVZBM7CqtEqub4/24iaNILooaDgdETDLCaenzVE0TnIOvYrlHh9cGb6KAfXOCB9YNRK/DJ4A9/2jLx5jPQTlTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBj/H3oAv1nfYpO4RzXExa5gCAS5o5F1YX4mRrvv0uUmO/A6wV6NSPHRRcToS24Lh6dWg==] db_user: deuwo db_name: deuwo servername: web01-deutsche-wohnen-com.pixelpark.net - # Change Cert cert_servername: 'wildcard.pixelpark.net' cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem @@ -117,15 +126,6 @@ infra::profile::apache::pp_vhosts: allow_override: - All directoryindex: index.php index.html - - location1: - provider: location - path: '/' - limit: - - { methods: 'OPTIONS', require: 'all granted' } - auth_type: Basic - auth_name: server - auth_user_file: '/etc/httpd/.htpasswd' - auth_require: 'valid-user' rewrites: - alias: comment: 'Alles auf https umleiten' @@ -298,7 +298,7 @@ logstash::generic_resource: order: 10 # Input parameters: path: '/var/log/deuwo/deuwo_import.log' - type: immobilien + type: deuwo_immobilien tags: - 'immosolve' - 'polyestate' @@ -309,7 +309,7 @@ logstash::generic_resource: order: 10 # Input parameters: path: '/var/log/deuwo/api.log' - type: api + type: deuwo_api tags: - 'deuwo_api' - "%{customer}" -- 2.39.5