]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
rename site to infra
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Wed, 5 Apr 2017 14:07:37 +0000 (16:07 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Wed, 5 Apr 2017 14:07:37 +0000 (16:07 +0200)
589 files changed:
classes/infra::profile::drupal.yaml [new file with mode: 0644]
classes/infra::profile::flow.yaml [new file with mode: 0644]
classes/infra::profile::logstash::apache.yaml [new file with mode: 0644]
classes/infra::profile::logstash::php_fpm.yaml [new file with mode: 0644]
classes/infra::profile::mcollective::common.yaml [new file with mode: 0644]
classes/infra::profile::monitoring::mysql.yaml [new file with mode: 0644]
classes/infra::profile::symfony.yaml [new file with mode: 0644]
classes/infra::profile::typo3.yaml [new file with mode: 0644]
classes/infra::profile::wordpress.yaml [new file with mode: 0644]
classes/site::profile::drupal.yaml [deleted file]
classes/site::profile::flow.yaml [deleted file]
classes/site::profile::logstash::apache.yaml [deleted file]
classes/site::profile::logstash::php_fpm.yaml [deleted file]
classes/site::profile::mcollective::common.yaml [deleted file]
classes/site::profile::monitoring::mysql.yaml [deleted file]
classes/site::profile::symfony.yaml [deleted file]
classes/site::profile::typo3.yaml [deleted file]
classes/site::profile::wordpress.yaml [deleted file]
common.yaml
customer/aamt/web-aamt-facebook.pixelpark.net.yaml
customer/basf/development.yaml
customer/basf/test-dev-basftoday-de.pixelpark.net.yaml
customer/bbm_aem/dev-author01-bbm.pixelpark.net.yaml
customer/bbm_aem/dev-dispatcher01-bbm.pixelpark.net.yaml
customer/bbm_aem/dev-publish01-bbm.pixelpark.net.yaml
customer/bibliomed/dev-bibliomed-de.pixelpark.com.yaml
customer/bibliomed/test-www01-bibliomed-de.pixelpark.net.yaml
customer/bibliomed/test-www02-bibliomed-de.pixelpark.net.yaml
customer/bibliomed/www01-bibliomed-de.pixelpark.net.yaml
customer/bibliomed/www02-bibliomed-de.pixelpark.net.yaml
customer/bkk-vbu/common.yaml
customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml
customer/bmas-anmeldung/common.yaml
customer/bmas-anmeldung/test-www-anmeldung02-bmas-de.pixelpark.net.yaml
customer/bmas-anmeldung/www-anmeldung02-bmas-de.pixelpark.net.yaml
customer/bmas-g20/common.yaml
customer/bmas-g20/dev-www-g20-bmas.pixelpark.net.yaml
customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml
customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml
customer/bmas-sgb2/production.yaml
customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml
customer/bmas-sgb2/test.yaml
customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml
customer/bmas-typo3/development.yaml
customer/bmas-typo3/production.yaml
customer/bmas-typo3/test.yaml
customer/bmas/db01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/db02-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/lb-bmas-de.pixelpark.net.yaml
customer/bmas/master01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/red-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/slave01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-db01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-db02-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-lb-bmas-de.pixelpark.net.yaml
customer/bmas/test-master01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-red-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-slave01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-www-anmeldung-bmas-de.pixelpark.net.yaml
customer/bmas/test-www01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-www02-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/www-anmeldung-bmas-de.pixelpark.net.yaml
customer/bmas/www01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmbf/test-web01-bmbf.pixelpark.net.yaml
customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
customer/bmbf/web01-bmbf.pixelpark.net.yaml
customer/bmbf/web02-bmbf.pixelpark.net.yaml
customer/bmf-datacenter/common.yaml
customer/bmf-datacenter/production.yaml
customer/bmf-datacenter/test.yaml
customer/bmf-europa/common.yaml
customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml
customer/bmf/blog-bmf-de.pixelpark.net.yaml
customer/bmf/db01-bmf-de.pixelpark.net.yaml
customer/bmf/db02-bmf-de.pixelpark.net.yaml
customer/bmf/db02-red-bmf-de.pixelpark.net.yaml
customer/bmf/db03-bmf-de.pixelpark.net.yaml
customer/bmf/dev-blog-bmf-de.pixelpark.net.yaml
customer/bmf/dev-bmf-de.pixelpark.net.yaml
customer/bmf/dev-db-bmf-de.pixelpark.net.yaml
customer/bmf/development.yaml
customer/bmf/master01-bmf-de.pixelpark.net.yaml
customer/bmf/news01-bmf-de.pixelpark.net.yaml
customer/bmf/red-bmf-de.pixelpark.net.yaml
customer/bmf/slave01-bmf-de.pixelpark.net.yaml
customer/bmf/test-blog-bmf-de.pixelpark.net.yaml
customer/bmf/test-db01-bmf-de.pixelpark.net.yaml
customer/bmf/test-db02-bmf-de.pixelpark.net.yaml
customer/bmf/test-db03-bmf-de.pixelpark.net.yaml
customer/bmf/test-master01-bmf-de.pixelpark.net.yaml
customer/bmf/test-news01-bmf-de.pixelpark.net.yaml
customer/bmf/test-red-bmf-de.pixelpark.net.yaml
customer/bmf/test-slave01-bmf-de.pixelpark.net.yaml
customer/bmf/test-www01-bmf-de.pixelpark.net.yaml
customer/bmf/test-www02-bmf-de.pixelpark.net.yaml
customer/bmf/www01-bmf-de.pixelpark.net.yaml
customer/bmf/www02-bmf-de.pixelpark.net.yaml
customer/bmf/www03-bmf-de.pixelpark.net.yaml
customer/bmf/www04-bmf-de.pixelpark.net.yaml
customer/bmw/common.yaml
customer/bmw/production.yaml
customer/bmw/red-bmw-de.pixelpark.net.yaml
customer/bmw/www-bmw-de.pixelpark.net.yaml
customer/bmwi-gruenderwoche/common.yaml
customer/bmwi-gruenderwoche/development.yaml
customer/bmwi-gruenderwoche/production.yaml
customer/bmwi-gruenderwoche/test.yaml
customer/bmwi/bmwi-outbound-proxy.pixelpark.net.yaml
customer/bmwi/db01-bmwi-de.pixelpark.net.yaml
customer/bmwi/db02-bmwi-de.pixelpark.net.yaml
customer/bmwi/dev-bmwi.pixelpark.net.yaml
customer/bmwi/dev-db-bmwi-de.pixelpark.net.yaml
customer/bmwi/listserv-bmwi-de.pixelpark.net.yaml
customer/bmwi/master01-bmwi-de.pixelpark.net.yaml
customer/bmwi/red-bmwi-de.pixelpark.net.yaml
customer/bmwi/slave01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-db01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-db02-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-listserv-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-master01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-red-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-slave01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-www01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-www02-bmwi-de.pixelpark.net.yaml
customer/bmwi/www01-bmwi-de.pixelpark.net.yaml
customer/bmwi/www02-bmwi-de.pixelpark.net.yaml
customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/production.yaml
customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml
customer/cosar-test-customer/common.yaml
customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml
customer/cosar-test-customer/development.yaml
customer/dba/nerio.pixelpark.net.yaml
customer/dba/nimue.pixelpark.net.yaml
customer/dba/orarepo.pixelpark.net.yaml
customer/dbad/common.yaml
customer/dbad/dbad-web25.pixelpark.net.yaml
customer/dbad/dbad-web26.pixelpark.net.yaml
customer/dbad/dbad-web27.pixelpark.net.yaml
customer/dbad/dbad-web28.pixelpark.net.yaml
customer/dbad/dbad-web29.pixelpark.net.yaml
customer/dbad/dbad-web30.pixelpark.net.yaml
customer/dbad/dbad-web36.pixelpark.net.yaml
customer/dbad/dbad-web37.pixelpark.net.yaml
customer/dbad/dbad-web38.pixelpark.net.yaml
customer/dbad/dbad-web39.pixelpark.net.yaml
customer/dbad/dbad-web40.pixelpark.net.yaml
customer/dbad/dbad-web41.pixelpark.net.yaml
customer/dbad/dbad-web42.pixelpark.net.yaml
customer/dbad/dbad-web43.pixelpark.net.yaml
customer/dbad/nemesis.pixelpark.net.yaml
customer/docmorris/common.yaml
customer/docmorris/dev-app01-fact-01-dm.pixelpark.net.yaml
customer/docmorris/dev-app02-fact-01-dm.pixelpark.net.yaml
customer/docmorris/dev-dm-zhost.pixelpark.net.yaml
customer/docmorris/fotoficient-dm03-de.pixelpark.net.yaml
customer/docmorris/prd-app01-fact.pixelpark.net.yaml
customer/docmorris/prd-app02-fact.pixelpark.net.yaml
customer/docmorris/prd-app03-fact.pixelpark.net.yaml
customer/docmorris/prd-dyna-dm-01.pixelpark.net.yaml
customer/docmorris/prd-qas-web01-dm-kampagne.pixelpark.net.yaml
customer/docmorris/prd-share-fact-oel-01.pixelpark.net.yaml
customer/docmorris/prd-share-fact-sol-01.pixelpark.net.yaml
customer/docmorris/qas-app01-fact.pixelpark.net.yaml
customer/docmorris/qas-app02-fact.pixelpark.net.yaml
customer/docmorris/qas-app03-fact.pixelpark.net.yaml
customer/docmorris/qas-dm-zhost.pixelpark.net.yaml
customer/docmorris/uat-app01-fact-01-dm.pixelpark.net.yaml
customer/docmorris/uat-app02-fact-01-dm.pixelpark.net.yaml
customer/docmorris/uat-dm-zhost.pixelpark.net.yaml
customer/dpag/standorte-zonehost01.pixelpark.net.yaml
customer/dpag/standorte-zonehost02.pixelpark.net.yaml
customer/dpdhl/dev-delivering-tomorrow-com.pixelpark.net.yaml
customer/dpdhl/development.yaml
customer/drk/mania.pixelpark.net.yaml
customer/elk/common.yaml
customer/emperra/db2-portal-esysta-com.pixelpark.net.yaml
customer/emperra/portal-esysta-com.pixelpark.net.yaml
customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml
customer/fbb-captive/test-web-captive-berlin-airport-de.pixelpark.net.yaml
customer/fbb-captive/web01-captive-berlin-airport-de.pixelpark.net.yaml
customer/fbb-captive/web02-captive-berlin-airport-de.pixelpark.net.yaml
customer/fbb-orat/dev01-orat-berlin-airport-de.pixelpark.net.yaml
customer/fbb-orat/production.yaml
customer/fbb-orat/test.yaml
customer/fbb-web/dev-web01-berlin-airport-de.pixelpark.net.yaml
customer/fbb-web/development.yaml
customer/fbb-web/production.yaml
customer/fbb-web/test-web01-berlin-airport-de.pixelpark.net.yaml
customer/fbb-web/test-web02-berlin-airport-de.pixelpark.net.yaml
customer/fbb-web/test.yaml
customer/fbb-web/web01-berlin-airport-de.pixelpark.net.yaml
customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml
customer/fbb-webservice/test-webservice-berlin-airport-de.pixelpark.net.yaml
customer/fbb-webservice/webservice-berlin-airport-de.pixelpark.net.yaml
customer/fbb-werbung/common.yaml
customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
customer/fbb-werbung/dev-werbung-berlin-airport-de.pixelpark.net.yaml
customer/fbb-werbung/development.yaml
customer/fbb-werbung/production.yaml
customer/fbb-werbung/red-werbung-berlin-airport-de.pixelpark.net.yaml
customer/fbb-werbung/test-red-werbung-berlin-airport-de.pixelpark.net.yaml
customer/fbb-werbung/test-werbung-berlin-airport-de.pixelpark.net.yaml
customer/fbb-werbung/test.yaml
customer/fbb-werbung/werbung-berlin-airport-de.pixelpark.net.yaml
customer/fbb/dev-www-berlin-airport-de.pixelpark.net.yaml
customer/fbb/dev-www-berlin-airport-de.yaml
customer/fbb/fish.pixelpark.net.yaml
customer/fbb/gaia.pixelpark.net.yaml
customer/fbb/moneta.pixelpark.net.yaml
customer/fbb/test-www01-berlin-airport-de.pixelpark.net.yaml
customer/fbb/test-www02-berlin-airport-de.pixelpark.net.yaml
customer/georgfischer/common.yaml
customer/gf/gf-zonehost01.pixelpark.net.yaml
customer/gf/gf-zonehost02.pixelpark.net.yaml
customer/joml/production.yaml
customer/joml/test.yaml
customer/kaufland/stundenplan-kaufland-de.pixelpark.net.yaml
customer/kendrion/zonehost-kendrion.pixelpark.net.yaml
customer/koerber/benchmark-koerber.pixelpark.net.yaml
customer/kutchenhaus/common.yaml
customer/kutchenhaus/www-kutchenhaus-co-uk.pixelpark.net.yaml
customer/lbs/dev-red02-lbs-de.pixelpark.net.yaml
customer/lbs/dev-www02-lbs-de.pixelpark.net.yaml
customer/linde/author01-linde-com.pixelpark.net.yaml
customer/linde/production.yaml
customer/linde/test-author01-linde-com.pixelpark.net.yaml
customer/linde/test.yaml
customer/live-cloud/alekto.cloud.pixelpark.internal.yaml
customer/live-cloud/atropos.cloud.pixelpark.internal.yaml
customer/live-cloud/badb.cloud.pixelpark.internal.yaml
customer/live-cloud/beowulf.cloud.pixelpark.internal.yaml
customer/live-cloud/epana.cloud.pixelpark.internal.yaml
customer/live-cloud/frigg.cloud.pixelpark.internal.yaml
customer/live-cloud/furrina.cloud.pixelpark.internal.yaml
customer/live-cloud/grazien.cloud.pixelpark.internal.yaml
customer/live-cloud/heracles.cloud.pixelpark.internal.yaml
customer/live-cloud/konsos.cloud.pixelpark.internal.yaml
customer/live-cloud/midir.cloud.pixelpark.internal.yaml
customer/live-cloud/moros.cloud.pixelpark.internal.yaml
customer/live-cloud/mullo.cloud.pixelpark.internal.yaml
customer/live-cloud/necat.cloud.pixelpark.internal.yaml
customer/live-cloud/not.cloud.pixelpark.internal.yaml
customer/live-cloud/oger.cloud.pixelpark.internal.yaml
customer/live-cloud/pothos.cloud.pixelpark.internal.yaml
customer/mbch-specials/common.yaml
customer/mbch-specials/specials-mercedes-benz-ch.pixelpark.net.yaml
customer/mbch-specials/test-specials-mercedes-benz-ch.pixelpark.net.yaml
customer/mbch-tmodell/common.yaml
customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
customer/mbch/common.yaml
customer/mbch/test-web-mb-mystar-ch.pixelpark.net.yaml
customer/mbch/web-mb-mystar-ch.pixelpark.net.yaml
customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-amg-gt-roadster/common.yaml
customer/mbvd-amg-gt-roadster/stage-web-amg-gt-roadster-de.pixelpark.net.yaml
customer/mbvd-amg-gt-roadster/web-amg-gt-roadster-de.pixelpark.net.yaml
customer/mbvd-amg-gt/common.yaml
customer/mbvd-amg-gt/stage-web-amg-gt-de.pixelpark.net.yaml
customer/mbvd-amg-gt/web-amg-gt-de.pixelpark.net.yaml
customer/mbvd-amg-pt/common.yaml
customer/mbvd-amg-pt/stage-web-amg-pt-de.pixelpark.net.yaml
customer/mbvd-amg-pt/web-amg-pt-de.pixelpark.net.yaml
customer/mbvd-bannershop/common.yaml
customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-bannershop/web-bannershop-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-cdb/common.yaml
customer/mbvd-cdb/stage-web-club-der-besten2-com.pixelpark.net.yaml
customer/mbvd-cdb/web-club-der-besten2-com.pixelpark.net.yaml
customer/mbvd-christmas-greetings-vans/www-christmas-greetings-vans-mercedes-benz-com.pixelpark.net.yaml
customer/mbvd-classicpartner-messe/common.yaml
customer/mbvd-classicpartner-messe/stage-web-classicpartner-messe-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-classicpartner-messe/web-classicpartner-messe-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-eklasse/common.yaml
customer/mbvd-eklasse/stage-web-e-klasse-amazon-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-eklasse/web-e-klasse-amazon-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-europadialog/dialog-mercedes-benz-com-pickup.pixelpark.net.yaml
customer/mbvd-europadialog/test-dialog-mercedes-benz-com-pickup.pixelpark.net.yaml
customer/mbvd-fashionweek/common.yaml
customer/mbvd-fashionweek/stage-web-fashionweek-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-fashionweek/web-fashionweek-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-faststart/common.yaml
customer/mbvd-faststart/faststart-mercedes-benz-com.pixelpark.net.yaml
customer/mbvd-faststart/stage-faststart-mercedes-benz-com.pixelpark.net.yaml
customer/mbvd-growup/common.yaml
customer/mbvd-growup/stage-web-cc-growup-dialog.pixelpark.net.yaml
customer/mbvd-growup/web-cc-growup-dialog.pixelpark.net.yaml
customer/mbvd-ngcc/common.yaml
customer/mbvd-ngcc/dev-web-ngcc-daimler.pixelpark.net.yaml
customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/dev-cms-emmt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/dev-odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/int-db-odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml
customer/mbvd-odt/relay-odt-daimler-com-temp.pixelpark.net.yaml
customer/mbvd-proxy/stage-web-specials-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-quiz/common.yaml
customer/mbvd-quiz/stage-www-mbvd-quiz-onlinestore.pixelpark.net.yaml
customer/mbvd-quiz/www-mbvd-quiz-onlinestore.pixelpark.net.yaml
customer/mbvd-rallye/common.yaml
customer/mbvd-rallye/stage-www-v-klasse-rallye-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-rallye/www-v-klasse-rallye-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-service-and-smile/common.yaml
customer/mbvd-service-and-smile/dev-www-service-and-smile-de-mbvd.pixelpark.net.yaml
customer/mbvd-service-and-smile/test-www-service-and-smile-de-mbvd.pixelpark.net.yaml
customer/mbvd-service-and-smile/www-service-and-smile-de-mbvd.pixelpark.net.yaml
customer/mbvd-service/common.yaml
customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml
customer/mbvd-service/web-mbvd-service-de.pixelpark.net.yaml
customer/mbvd-shes/common.yaml
customer/mbvd-shes/stage-web-shes-mercedes-event-de.pixelpark.net.yaml
customer/mbvd-shes/web-shes-mercedes-event-de.pixelpark.net.yaml
customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-static/www-mbvd-static.pixelpark.net.yaml
customer/mbvd-sternenlicht/common.yaml
customer/mbvd-sternenlicht/test-web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-sternenlicht/web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-transporter-topdeal/common.yaml
customer/mbvd-transporter-topdeal/test-www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
customer/mbvd-transporter-topleasing/common.yaml
customer/mbvd-transporter-topleasing/stage-web-transporter-topleasing-de.pixelpark.net.yaml
customer/mbvd-transporter-topleasing/web-transporter-topleasing-de.pixelpark.net.yaml
customer/mbvd-transporter-training/common.yaml
customer/mbvd-transporter-training/test-www-transporter-training-on-tour-de.pixelpark.net.yaml
customer/mbvd-transporter-training/www-transporter-training-on-tour-de.pixelpark.net.yaml
customer/mbvd-trapo/common.yaml
customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-trapo/int-www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-trapo/int-www02-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd-trapo/www02-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd/aktion-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd/db-mb.pixelpark.net.yaml
customer/mbvd/int-db-mb.pixelpark.net.yaml
customer/mbvd/odt02-daimler-com.pixelpark.net.yaml
customer/mbvd/relay-odt-daimler-com.pixelpark.net.yaml
customer/mbvd/servicevorteilskarte02-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd/stage-classicpartner-suche-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd/stage-servicevorteilskarte02-mercedes-benz-de.pixelpark.net.yaml
customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml
customer/mbvd/www-mb-kampagnen-de.pixelpark.net.yaml
customer/mcdonalds/common.yaml
customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
customer/medperts-com/db01-medperts-com.pixelpark.net.yaml
customer/medperts-com/db02-medperts-com.pixelpark.net.yaml
customer/medperts-com/dev-medperts-com.pixelpark.com.yaml
customer/medperts-com/search03-medperts-com.pixelpark.net.yaml
customer/medperts-com/test-db01-medperts-com.pixelpark.net.yaml
customer/medperts-com/test-db02-medperts-com.pixelpark.net.yaml
customer/medperts-com/test-www01-medperts-com.pixelpark.net.yaml
customer/medperts-com/test-www02-medperts-com.pixelpark.net.yaml
customer/medperts-com/www01-medperts-com.pixelpark.net.yaml
customer/medperts-com/www02-medperts-com.pixelpark.net.yaml
customer/mhk/mdb01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/mdb02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/mdb03-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/mls-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/rls01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/rls02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-mdb01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-mdb02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-mdb03-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-mls-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-rls01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-rls02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
customer/mtb/author01-mtb.pixelpark.com.yaml
customer/mtb/author02-mtb.pixelpark.com.yaml
customer/mtb/dev-author01-mtb.pixelpark.com.yaml
customer/mtb/dev-author02-mtb.pixelpark.com.yaml
customer/mtb/int-author01-mtb.pixelpark.com.yaml
customer/mtb/int-author02-mtb.pixelpark.com.yaml
customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml
customer/pfizer-schlaganfall/www-schlaganfall-verhindern-de.pixelpark.net.yaml
customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
customer/pfizer/dev-web02-pfizer-de.pixelpark.net.yaml
customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
customer/pfizer/web02-pfizer-de.pixelpark.net.yaml
customer/pixelpark-mail/common.yaml
customer/pixelpark-mail/mail01.pixelpark.com.yaml
customer/pixelpark-mail/mail02.pixelpark.com.yaml
customer/pixelpark-pmp/jira02.pixelpark.com.yaml
customer/pixelpark/abnahme.pixelpark.com.yaml
customer/pixelpark/achilles.pixelpark.com.yaml
customer/pixelpark/amor.pixelpark.net.yaml
customer/pixelpark/amun.pixelpark.net.yaml
customer/pixelpark/app01.sparkasse.local.yaml
customer/pixelpark/app02.sparkasse.local.yaml
customer/pixelpark/aurora.pixelpark.net.yaml
customer/pixelpark/bat.pixelpark.net.yaml
customer/pixelpark/bauhaus.pixelpark.com.yaml
customer/pixelpark/bb-mercedes-benz-de.pixelpark.net.yaml
customer/pixelpark/bfs-gadget-mercedes-benz-de.pixelpark.net.yaml
customer/pixelpark/bilder-emmt-daimler-com.pixelpark.net.yaml
customer/pixelpark/chat-db01.pixelpark.com.yaml
customer/pixelpark/chat01.pixelpark.com.yaml
customer/pixelpark/classicpartner-suche-mercedes-benz-de.pixelpark.net.yaml
customer/pixelpark/confluence01.pixelpark.net.yaml
customer/pixelpark/cow.pixelpark.net.yaml
customer/pixelpark/deploy.pixelpark.com.yaml
customer/pixelpark/design-berlin.pixelpark.net.yaml
customer/pixelpark/dev-app01.sparkasse.local.yaml
customer/pixelpark/dev-app02.sparkasse.local.yaml
customer/pixelpark/dev-hy01-demo.pixelpark.net.yaml
customer/pixelpark/dev-monitoring-client.pixelpark.com.yaml
customer/pixelpark/dev-monitoring.pixelpark.com.yaml
customer/pixelpark/dev-web01-mbvd.pixelpark.net.yaml
customer/pixelpark/dev-web02.sparkasse.local.yaml
customer/pixelpark/dnsmaster01.pixelpark.com.yaml
customer/pixelpark/dnsmaster02.pixelpark.com.yaml
customer/pixelpark/dnsmaster03.pixelpark.com.yaml
customer/pixelpark/ekhi.pixelpark.net.yaml
customer/pixelpark/eriu.pixelpark.net.yaml
customer/pixelpark/extranet01.pixelpark.net.yaml
customer/pixelpark/foreman01.pixelpark.com.yaml
customer/pixelpark/foreman02.pixelpark.com.yaml
customer/pixelpark/fs-training.pixelpark.com.yaml
customer/pixelpark/git01.pixelpark.com.yaml
customer/pixelpark/host.pixelpark.com.yaml
customer/pixelpark/int-db-odt-daimler-com.pixelpark.internal.yaml
customer/pixelpark/intra-collective01.pixelpark.com.yaml
customer/pixelpark/isis.pixelpark.net.yaml
customer/pixelpark/ivan-wheezy64.pixelpark.com.yaml
customer/pixelpark/ivandeb.pixelpark.com.yaml
customer/pixelpark/jenkins-slave-virtualbox.pixelpark.net.yaml
customer/pixelpark/jira01.pixelpark.net.yaml
customer/pixelpark/koji.cloud.pixelpark.internal.yaml
customer/pixelpark/lug.pixelpark.com.yaml
customer/pixelpark/mail01.pixelpark.com.yaml
customer/pixelpark/mailex.pixelpark.com.yaml
customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
customer/pixelpark/messageq01.pixelpark.com.yaml
customer/pixelpark/minerva.pixelpark.com.yaml
customer/pixelpark/mockbuild.cloud.pixelpark.internal.yaml
customer/pixelpark/monitor-db01-publicispixelpark-de.pixelpark.net.yaml
customer/pixelpark/monkey.pixelpark.com.yaml
customer/pixelpark/mysql-pp07.pixelpark.com.yaml
customer/pixelpark/najaden.pixelpark.com.yaml
customer/pixelpark/nechtan.pixelpark.com.yaml
customer/pixelpark/nike.pixelpark.net.yaml
customer/pixelpark/nl-fischerwerke.pixelpark.net.yaml
customer/pixelpark/nl-medperts.pixelpark.net.yaml
customer/pixelpark/nuadu.pixelpark.com.yaml
customer/pixelpark/oneiros.pixelpark.net.yaml
customer/pixelpark/openvmware-tools-current.pixelpark.net.yaml
customer/pixelpark/openvmware-tools.pixelpark.net.yaml
customer/pixelpark/owasp-zap.pixelpark.com.yaml
customer/pixelpark/pass.pixelpark.com.yaml
customer/pixelpark/pp-unifi-mgmt.pixelpark.com.yaml
customer/pixelpark/ppnet.novalocal.yaml
customer/pixelpark/psql-pp01.pixelpark.net.yaml
customer/pixelpark/psql-pp02.pixelpark.net.yaml
customer/pixelpark/puppetmaster01.pixelpark.com.yaml
customer/pixelpark/repo-sol.pixelpark.com.yaml
customer/pixelpark/repo.pixelpark.com.yaml
customer/pixelpark/review.pixelpark.com.yaml
customer/pixelpark/rpm-repo.pixelpark.com.yaml
customer/pixelpark/sancus.pixelpark.com.yaml
customer/pixelpark/selenium.pixelpark.com.yaml
customer/pixelpark/sol11.pixelpark.com.yaml
customer/pixelpark/solaris10-afs.pixelpark.com.yaml
customer/pixelpark/solaris11-afs.pixelpark.com.yaml
customer/pixelpark/streaming01.pixelpark.net.yaml
customer/pixelpark/streaming02.pixelpark.net.yaml
customer/pixelpark/streamingmedia01.pixelpark.net.yaml
customer/pixelpark/streamingmedia02.pixelpark.net.yaml
customer/pixelpark/support01.pixelpark.com.yaml
customer/pixelpark/systemshare.pixelpark.com.yaml
customer/pixelpark/tellus.pixelpark.net.yaml
customer/pixelpark/test-akquise-aem.pixelpark.net.yaml
customer/pixelpark/test-confluence01.pixelpark.net.yaml
customer/pixelpark/test-extranet01.pixelpark.com.yaml
customer/pixelpark/test-fortinet.pixelpark.net.yaml
customer/pixelpark/test-jira01.pixelpark.net.yaml
customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml
customer/pixelpark/test-monitoring-db.pixelpark.net.yaml
customer/pixelpark/test-monitoring01.pixelpark.net.yaml
customer/pixelpark/test-psql-pp01.pixelpark.net.yaml
customer/pixelpark/vm-elk-01.pixelpark.net.yaml
customer/pixelpark/vm-elk-02.pixelpark.net.yaml
customer/pixelpark/vm04-olli.pixelpark.com.yaml
customer/pixelpark/vmware-tools.pixelpark.net.yaml
customer/pixelpark/web-client-survey.pixelpark.com.yaml
customer/pixelpark/web-inhalte.pixelpark.net.yaml
customer/pixelpark/web01-mbvd.pixelpark.net.yaml
customer/pixelpark/web01.sparkasse.de.yaml
customer/pixelpark/web02.sparkasse.local.yaml
customer/pixelpark/xymon.pixelpark.com.yaml
customer/pixelpark/zonehost-pp.pixelpark.net.yaml
customer/pixeltest/dev-apache-modules.pixelpark.net.yaml
customer/pixeltest/rapunzel.pixelpark.net.yaml
customer/pixeltest/sol4711.pixelpark.com.yaml
customer/pixeltest/test-puppet01.pixelpark.net.yaml
customer/prometheus/data.prometheus.pixelpark.net.yaml
customer/prometheus/master01.prometheus.pixelpark.net.yaml
customer/prometheus/slave001.prometheus.pixelpark.net.yaml
customer/prometheus/slave002.prometheus.pixelpark.net.yaml
customer/prometheus/slave003.prometheus.pixelpark.net.yaml
customer/prometheus/slave004.prometheus.pixelpark.net.yaml
customer/prometheus/slave005.prometheus.pixelpark.net.yaml
customer/prometheus/slave006.prometheus.pixelpark.net.yaml
customer/prometheus/slave007.prometheus.pixelpark.net.yaml
customer/prometheus/slave008.prometheus.pixelpark.net.yaml
customer/prometheus/slave009.prometheus.pixelpark.net.yaml
customer/prometheus/slave010.prometheus.pixelpark.net.yaml
customer/prometheus/slave011.prometheus.pixelpark.net.yaml
customer/prometheus/slave012.prometheus.pixelpark.net.yaml
customer/publicis/monitor01.publicispixelpark.de.yaml
customer/q_perior/test-www-q-perior.pixelpark.net.yaml
customer/sirona-aem-york/common.yaml
customer/sirona-aem-york/cqauthdev-pp.southcentralus.cloudapp.azure.com.yaml
customer/sirona-aem-york/cqauthqa-pp.southcentralus.cloudapp.azure.com.yaml
customer/sirona-aem-york/cqpubdev-pp.southcentralus.cloudapp.azure.com.yaml
customer/sirona-aem-york/cqpubqa-pp-port23.southcentralus.cloudapp.azure.com.yaml
customer/sirona-aem-york/cqpubqa-pp.southcentralus.cloudapp.azure.com.yaml
customer/sirona-aem-york/development.yaml
customer/sirona-aem-york/test.yaml
customer/sirona-aem/common.yaml
customer/sirona-aem/dev01-author-sirona.pixelpark.net.yaml
customer/sirona-aem/dev01-publish-sirona.pixelpark.net.yaml
customer/sirona-aem/development.yaml
customer/sirona-aem/int01-author-sirona.pixelpark.net.yaml
customer/sirona-aem/int01-publish-sirona.pixelpark.net.yaml
customer/sirona-aem/int02-publish-sirona.pixelpark.net.yaml
customer/sirona-aem/prod-author01-sirona.pixelpark.net.yaml
customer/sirona-aem/prod-publish01-sirona.pixelpark.net.yaml
customer/sirona-aem/prod-publish02-sirona.pixelpark.net.yaml
customer/sirona-aem/prod01-author-sirona.pixelpark.net.yaml
customer/sirona-aem/prod01-publish-sirona.pixelpark.net.yaml
customer/sirona-aem/prod02-publish-sirona.pixelpark.net.yaml
customer/sirona-aem/production.yaml
customer/sirona-aem/test.yaml
customer/sirona-neo4j/dev01-neo4j-sirona.pixelpark.net.yaml
customer/sirona-neo4j/int01-neo4j-sirona.pixelpark.net.yaml
customer/sirona-neo4j/prod01-neo4j-sirona.pixelpark.net.yaml
customer/sirona-url-shorter/production.yaml
customer/spk-agmv/agmv-sparkasse-de.pixelpark.net.yaml
customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml
customer/spk-blog/sparkasseblog01.sparkasse.local.yaml
customer/spk-fits/dev-web01.sparkasse.local.yaml
customer/spk-gsh/proxy-giro-sucht-hero-temp.pixelpark.net.yaml
customer/spk-innovationen/dev-innovationen-sparkasse-de.pixelpark.net.yaml
customer/spk-innovationen/innovationen-sparkasse-de.pixelpark.net.yaml
customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml
customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml
customer/spk-paydirekt/common.yaml
customer/spk-paydirekt/dev-paydirekt01-sparkasse-de.pixelpark.net.yaml
customer/spk-paydirekt/dev-paydirekt02-sparkasse-de.pixelpark.net.yaml
customer/spk-paydirekt/development.yaml
customer/spk-paydirekt/paydirekt01-sparkasse-de.pixelpark.net.yaml
customer/spk-paydirekt/paydirekt02-sparkasse-de.pixelpark.net.yaml
customer/spk-spenden/dev-einfach-gut-machen-de-spk.pixelpark.net.yaml
customer/spk-spenden/einfach-gut-machen-de-spk.pixelpark.net.yaml
customer/spk-taiga/taiga-sparkasse-de.pixelpark.net.yaml
customer/stadt-koeln/web01-haushaltsplan-koeln.pixelpark.net.yaml
customer/swd/red-swd.pixelpark.net.yaml
customer/swd/www-swd.pixelpark.net.yaml
customer/test-cloud/barri.test-cloud.pixelpark.internal.yaml
customer/test-cloud/beli.test-cloud.pixelpark.internal.yaml
customer/test-cloud/bor.test-cloud.pixelpark.internal.yaml
customer/test-cloud/ceph-test.test-cloud.pixelpark.internal.yaml
customer/test-cloud/control03.test-cloud.pixelpark.internal.yaml
customer/test-cloud/klio.test-cloud.pixelpark.internal.yaml
customer/test-cloud/nestor.test-cloud.pixelpark.internal.yaml
customer/vrr/common.yaml
customer/vrr/dev-web01-vrr-de.pixelpark.net.yaml
customer/webstats/test-webstats.pixelpark.net.yaml
customer/webstats/webstats01.pixelpark.net.yaml
customer/webstats/webstats02.pixelpark.net.yaml

diff --git a/classes/infra::profile::drupal.yaml b/classes/infra::profile::drupal.yaml
new file mode 100644 (file)
index 0000000..eff6500
--- /dev/null
@@ -0,0 +1,41 @@
+---
+php::extensions:
+  gd: {}
+  mysqlnd: {}
+  mbstring: {}
+  pecl-uploadprogress: {}
+
+php::settings:
+  Date/date.timezone: Europe/Berlin
+  PHP/memory_limit: 128M
+  PHP/upload_max_filesize: 10M
+  PHP/post_max_size: 10M
+  PHP/max_execution_time: '240'
+  PHP/expose_php: 'Off'
+
+# Do not use this key in an other location (customer)
+php_admin_value:
+  memory_limit: 128M
+  upload_max_filesize: 10M
+  post_max_size: 10M
+  max_execution_time: '240'
+
+# Do not use this key in an other location (customer)
+directories:
+  - directory_docroot:
+    provider: 'directory'
+    path: "%{docroot}"
+    addhandlers:
+      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
+    options:
+      - FollowSymLinks
+      - MultiViews
+    allow_override:
+      - All
+    directoryindex: 'index.php'
+
+# Do not use this key in an other location (customer)
+headers:
+  - 'set X-Frame-Options: sameorigin'
+  - 'set X-XSS-Protection: "1; mode=block"'
+  - 'set X-Content-Type-Options: nosniff'
\ No newline at end of file
diff --git a/classes/infra::profile::flow.yaml b/classes/infra::profile::flow.yaml
new file mode 100644 (file)
index 0000000..b358823
--- /dev/null
@@ -0,0 +1,46 @@
+---
+php::extensions:
+  opcache: {}
+  mysqlnd: {}
+  mbstring: {}
+  tokenizer: {}
+
+# Do not use this key in an other location (customer)
+typo3_flow_project:
+  flow:
+    version: '3.2.2'
+    db_pass: qeSNVEu19PFxRu1g
+    db_user: flow
+    db_name: flow
+    servername: flow-dummy.de
+
+# Do not use this key in an other location (customer)
+php_admin_value:
+  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
+  memory_limit: 256M
+  max_execution_time: '240'
+
+# Do not use this key in an other location (customer)
+directories:
+  - directory_docroot:
+    provider: 'directory'
+    path: "%{docroot}"
+    addhandlers:
+      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
+    options:
+      - FollowSymLinks
+    allow_override:
+      - All
+    directoryindex: 'index.php'
+  - directory_resource:
+    provider: 'directory'
+    path: "%{docroot}/_Resources"
+    allow_override:
+      - None
+    sethandler: "default-handler"
+
+# Do not use this key in an other location (customer)
+headers:
+  - 'set X-Frame-Options: sameorigin'
+  - 'set X-XSS-Protection: "1; mode=block"'
+  - 'set X-Content-Type-Options: nosniff'
diff --git a/classes/infra::profile::logstash::apache.yaml b/classes/infra::profile::logstash::apache.yaml
new file mode 100644 (file)
index 0000000..4dac379
--- /dev/null
@@ -0,0 +1,28 @@
+---
+infra::profile::logstash::apache::resources:
+  apache_access:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/httpd/*access*log'
+      type: apache-access
+      tags: 
+        - "%{customer}"
+        - "%{tier}"
+  apache_error:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/httpd/*error*log'
+      type: apache-error
+      tags: 
+        - "%{customer}"
+        - "%{tier}"
+  apache_access_filter:
+    condition: 'if [type] == "apache-access"'
+    resource: grok
+    order: 40 # Filter
+    parameters:
+      match: 
+        - message
+        - '%%{ich-trickse}{COMBINEDAPACHELOG}'
\ No newline at end of file
diff --git a/classes/infra::profile::logstash::php_fpm.yaml b/classes/infra::profile::logstash::php_fpm.yaml
new file mode 100644 (file)
index 0000000..5d8e4ea
--- /dev/null
@@ -0,0 +1,41 @@
+---
+infra::profile::logstash::php_fpm::resources:
+  php_fpm_error:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/php-fpm/*error*log'
+      type: php-fpm-error
+      tags: 
+        - "%{customer}"
+        - "%{tier}"
+  php_fpm_slow:
+    resource: file
+    order: 11 # Input
+    parameters:
+      path: '/var/log/php-fpm/*slow*log'
+      type: php-fpm-slow
+      tags: 
+        - "%{customer}"
+        - "%{tier}"
+      codec:
+        type: multiline
+        what: previous
+        negate: true
+        pattern: '\[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}\]%%{ich-trickse}{SPACE}\[pool %%{ich-trickse}{DATA:pool}] %%{ich-trickse}{GREEDYDATA:restmessage}'
+  php_fpm_error_filter:
+    condition: 'if [type] == "php-fpm-error"'
+    resource: grok
+    order: 40 # Filter
+    parameters:
+      match: 
+        - message
+        - '\[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}%%{ich-trickse}{SPACE}%%{ich-trickse}{GREEDYDATA:timezone}?\] %%{ich-trickse}{LOGLEVEL:loglevel}?[ :]*%%{ich-trickse}{GREEDYDATA:restmessage}'
+  php_fpm_slow_filter:
+    condition: 'if [type] == "php-fpm-slow"'
+    resource: grok
+    order: 41 # Filter
+    parameters:
+      match: 
+        - message
+        - \[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}\]%%{ich-trickse}{SPACE}\[pool %%{ich-trickse}{DATA:pool}] %%{ich-trickse}{GREEDYDATA:restmessage}
\ No newline at end of file
diff --git a/classes/infra::profile::mcollective::common.yaml b/classes/infra::profile::mcollective::common.yaml
new file mode 100644 (file)
index 0000000..2f71a1e
--- /dev/null
@@ -0,0 +1,25 @@
+---
+infra::profile::mcollective::common::server_settings:
+  identity:
+    value: "%{fqdn}"
+# extra config fro rabbitmq connector
+  plugin.rabbitmq.heartbeat_interval:
+    value: 30
+  plugin.rabbitmq.stomp_1_0_fallback:
+    value: 0
+  plugin.rabbitmq.max_hbread_fails:
+    value: 2
+  plugin.rabbitmq.max_hbrlck_fails:
+    value: 2
+# extra config for puppet plugin
+  plugin.puppet.signal_daemon:
+    value: false
+
+
+infra::profile::mcollective::common::plugins:
+  puppet:
+    package: true
+  service:
+    package: true
+  package:
+    package: true
\ No newline at end of file
diff --git a/classes/infra::profile::monitoring::mysql.yaml b/classes/infra::profile::monitoring::mysql.yaml
new file mode 100644 (file)
index 0000000..8ee14aa
--- /dev/null
@@ -0,0 +1,3 @@
+---
+# default monitoring Passwort
+infra::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIGr1ESvzfZx4F3HW99qZFf/MkLh1pywxTBCxk5PxFxPCbLY7OT8wNIcxvS6NOvMhr2qkAvmec0qB/1pJf1ZiM99VRoTSF8jByxMFeopYdFhyk3nHtGIyqgykm6xp4hg+hJH2tsg7SYhPN8cV3wDeZgAsvWUhp4TUid6Y/3w7jLzQF+odiUPFCyZ0IbSiQJOe4/E1N5ldx29pfOdjxxRv6Kkf7jNg9CChNYNpLkM8SI5JC41O5avNcrvfaiekiWEJV0mZ59dE1yPqzMF8TstEuq6BJd7KeNj0HN9yGc2cZxTqXhDr1o/HfUsH7Z+beZVHN/qBlqKBbx9fCUbGX8ekQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA5BffAEhe8IJ8QeKaed4zYgCCGKLxaE3iurFnp+6acicSVCgZMLNoRQqJDZ6CeSY8uGw==]
\ No newline at end of file
diff --git a/classes/infra::profile::symfony.yaml b/classes/infra::profile::symfony.yaml
new file mode 100644 (file)
index 0000000..fe0948f
--- /dev/null
@@ -0,0 +1,22 @@
+---
+# Do not use this key in an other location (customer)
+php_admin_value:
+  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
+  memory_limit: 32M
+  upload_max_filesize: 4M
+  post_max_size: 4M
+  max_execution_time: '60'
+
+# Do not use this key in an other location (customer)
+directories:
+  - directory_docroot:
+    provider: 'directory'
+    path: "%{docroot}"
+    addhandlers:
+      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
+    options:
+      - FollowSymLinks
+      - MultiViews
+    allow_override:
+      - All
+    directoryindex: 'index.php'
\ No newline at end of file
diff --git a/classes/infra::profile::typo3.yaml b/classes/infra::profile::typo3.yaml
new file mode 100644 (file)
index 0000000..190336a
--- /dev/null
@@ -0,0 +1,64 @@
+---
+php::extensions:
+  gd: {}
+  opcache: {}
+  mysqlnd: {}
+  soap: {}
+##### noch keine offizielle Lösung für suhosin/php7
+#  suhosin:
+#    settings:
+#      suhosin.request.max_varname_length: 200
+#      suhosin.post.max_name_length: 200
+#      suhosin.get.max_name_length: 200
+#      suhosin.get.max_value_length: 2000
+#      suhosin.executor.include.whitelist: 'phar,vfs'
+  mbstring: {}
+
+php::settings:
+  Date/date.timezone: Europe/Berlin
+  PHP/upload_max_filesize: 10M
+  PHP/post_max_size: 10M
+  PHP/max_execution_time: '240'
+  PHP/expose_php: 'Off'
+
+# Do not use this key in an other location (customer)
+typo3_project:
+  typo3:
+    version: '6.2.30'
+    typo3_src_path: '/opt'
+    site_path: '/var/www/typo3'
+    site_user: apache
+    site_group: apache
+    db_pass: qeSNVEu19PFxRu1g
+    db_user: typo3
+    db_host: localhost
+    db_name: typo3
+    enable_install_tool: true
+
+# Do not use this key in an other location (customer)
+php_admin_value:
+  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
+  memory_limit: 128M
+  upload_max_filesize: 20M
+  post_max_size: 20M
+  max_execution_time: '240'
+
+# Do not use this key in an other location (customer)
+directories:
+  - directory_docroot:
+    provider: 'directory'
+    path: "%{docroot}"
+    addhandlers:
+      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
+    options:
+      - FollowSymLinks
+      - MultiViews
+    allow_override:
+      - All
+    directoryindex: 'index.php'
+
+# Do not use this key in an other location (customer)
+headers:
+  - 'set X-Frame-Options: sameorigin'
+  - 'set X-XSS-Protection: "1; mode=block"'
+  - 'set X-Content-Type-Options: nosniff'
diff --git a/classes/infra::profile::wordpress.yaml b/classes/infra::profile::wordpress.yaml
new file mode 100644 (file)
index 0000000..4871bdf
--- /dev/null
@@ -0,0 +1,41 @@
+---
+php::extensions:
+  gd: {}
+#  xml: {}
+  opcache: {}
+  mysqlnd: {}
+# suhosin would be nice
+#  suhosin:
+#    settings:
+#      suhosin.request.max_varname_length: 200
+#      suhosin.post.max_name_length: 200
+#      suhosin.get.max_name_length: 200
+#      suhosin.get.max_value_length: 2000
+#      suhosin.executor.include.whitelist: 'phar,vfs'
+
+# Do not use this key in an other location (customer)
+wordpress_project:
+  wordpress:
+    servername: wordpress-dummy
+
+# Do not use this key in an other location (customer)
+php_admin_value:
+  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
+  memory_limit: 128M
+  upload_max_filesize: 20M
+  post_max_size: 20M
+  max_execution_time: '240'
+
+# Do not use this key in an other location (customer)
+directories:
+  - directory_docroot:
+    provider: 'directory'
+    path: "%{docroot}"
+    addhandlers:
+      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
+    options:
+      - FollowSymLinks
+      - MultiViews
+    allow_override:
+      - All
+    directoryindex: 'index.php'
diff --git a/classes/site::profile::drupal.yaml b/classes/site::profile::drupal.yaml
deleted file mode 100644 (file)
index eff6500..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  mbstring: {}
-  pecl-uploadprogress: {}
-
-php::settings:
-  Date/date.timezone: Europe/Berlin
-  PHP/memory_limit: 128M
-  PHP/upload_max_filesize: 10M
-  PHP/post_max_size: 10M
-  PHP/max_execution_time: '240'
-  PHP/expose_php: 'Off'
-
-# Do not use this key in an other location (customer)
-php_admin_value:
-  memory_limit: 128M
-  upload_max_filesize: 10M
-  post_max_size: 10M
-  max_execution_time: '240'
-
-# Do not use this key in an other location (customer)
-directories:
-  - directory_docroot:
-    provider: 'directory'
-    path: "%{docroot}"
-    addhandlers:
-      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
-    options:
-      - FollowSymLinks
-      - MultiViews
-    allow_override:
-      - All
-    directoryindex: 'index.php'
-
-# Do not use this key in an other location (customer)
-headers:
-  - 'set X-Frame-Options: sameorigin'
-  - 'set X-XSS-Protection: "1; mode=block"'
-  - 'set X-Content-Type-Options: nosniff'
\ No newline at end of file
diff --git a/classes/site::profile::flow.yaml b/classes/site::profile::flow.yaml
deleted file mode 100644 (file)
index b358823..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
----
-php::extensions:
-  opcache: {}
-  mysqlnd: {}
-  mbstring: {}
-  tokenizer: {}
-
-# Do not use this key in an other location (customer)
-typo3_flow_project:
-  flow:
-    version: '3.2.2'
-    db_pass: qeSNVEu19PFxRu1g
-    db_user: flow
-    db_name: flow
-    servername: flow-dummy.de
-
-# Do not use this key in an other location (customer)
-php_admin_value:
-  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
-  memory_limit: 256M
-  max_execution_time: '240'
-
-# Do not use this key in an other location (customer)
-directories:
-  - directory_docroot:
-    provider: 'directory'
-    path: "%{docroot}"
-    addhandlers:
-      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
-    options:
-      - FollowSymLinks
-    allow_override:
-      - All
-    directoryindex: 'index.php'
-  - directory_resource:
-    provider: 'directory'
-    path: "%{docroot}/_Resources"
-    allow_override:
-      - None
-    sethandler: "default-handler"
-
-# Do not use this key in an other location (customer)
-headers:
-  - 'set X-Frame-Options: sameorigin'
-  - 'set X-XSS-Protection: "1; mode=block"'
-  - 'set X-Content-Type-Options: nosniff'
diff --git a/classes/site::profile::logstash::apache.yaml b/classes/site::profile::logstash::apache.yaml
deleted file mode 100644 (file)
index acdc202..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-site::profile::logstash::apache::resources:
-  apache_access:
-    resource: file
-    order: 10 # Input
-    parameters:
-      path: '/var/log/httpd/*access*log'
-      type: apache-access
-      tags: 
-        - "%{customer}"
-        - "%{tier}"
-  apache_error:
-    resource: file
-    order: 10 # Input
-    parameters:
-      path: '/var/log/httpd/*error*log'
-      type: apache-error
-      tags: 
-        - "%{customer}"
-        - "%{tier}"
-  apache_access_filter:
-    condition: 'if [type] == "apache-access"'
-    resource: grok
-    order: 40 # Filter
-    parameters:
-      match: 
-        - message
-        - '%%{ich-trickse}{COMBINEDAPACHELOG}'
\ No newline at end of file
diff --git a/classes/site::profile::logstash::php_fpm.yaml b/classes/site::profile::logstash::php_fpm.yaml
deleted file mode 100644 (file)
index 1f1d11b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-site::profile::logstash::php_fpm::resources:
-  php_fpm_error:
-    resource: file
-    order: 10 # Input
-    parameters:
-      path: '/var/log/php-fpm/*error*log'
-      type: php-fpm-error
-      tags: 
-        - "%{customer}"
-        - "%{tier}"
-  php_fpm_slow:
-    resource: file
-    order: 11 # Input
-    parameters:
-      path: '/var/log/php-fpm/*slow*log'
-      type: php-fpm-slow
-      tags: 
-        - "%{customer}"
-        - "%{tier}"
-      codec:
-        type: multiline
-        what: previous
-        negate: true
-        pattern: '\[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}\]%%{ich-trickse}{SPACE}\[pool %%{ich-trickse}{DATA:pool}] %%{ich-trickse}{GREEDYDATA:restmessage}'
-  php_fpm_error_filter:
-    condition: 'if [type] == "php-fpm-error"'
-    resource: grok
-    order: 40 # Filter
-    parameters:
-      match: 
-        - message
-        - '\[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}%%{ich-trickse}{SPACE}%%{ich-trickse}{GREEDYDATA:timezone}?\] %%{ich-trickse}{LOGLEVEL:loglevel}?[ :]*%%{ich-trickse}{GREEDYDATA:restmessage}'
-  php_fpm_slow_filter:
-    condition: 'if [type] == "php-fpm-slow"'
-    resource: grok
-    order: 41 # Filter
-    parameters:
-      match: 
-        - message
-        - \[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}\]%%{ich-trickse}{SPACE}\[pool %%{ich-trickse}{DATA:pool}] %%{ich-trickse}{GREEDYDATA:restmessage}
\ No newline at end of file
diff --git a/classes/site::profile::mcollective::common.yaml b/classes/site::profile::mcollective::common.yaml
deleted file mode 100644 (file)
index 280d312..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
----
-site::profile::mcollective::common::server_settings:
-  identity:
-    value: "%{fqdn}"
-# extra config fro rabbitmq connector
-  plugin.rabbitmq.heartbeat_interval:
-    value: 30
-  plugin.rabbitmq.stomp_1_0_fallback:
-    value: 0
-  plugin.rabbitmq.max_hbread_fails:
-    value: 2
-  plugin.rabbitmq.max_hbrlck_fails:
-    value: 2
-# extra config for puppet plugin
-  plugin.puppet.signal_daemon:
-    value: false
-
-
-site::profile::mcollective::common::plugins:
-  puppet:
-    package: true
-  service:
-    package: true
-  package:
-    package: true
\ No newline at end of file
diff --git a/classes/site::profile::monitoring::mysql.yaml b/classes/site::profile::monitoring::mysql.yaml
deleted file mode 100644 (file)
index 68b3c06..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# default monitoring Passwort
-site::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIGr1ESvzfZx4F3HW99qZFf/MkLh1pywxTBCxk5PxFxPCbLY7OT8wNIcxvS6NOvMhr2qkAvmec0qB/1pJf1ZiM99VRoTSF8jByxMFeopYdFhyk3nHtGIyqgykm6xp4hg+hJH2tsg7SYhPN8cV3wDeZgAsvWUhp4TUid6Y/3w7jLzQF+odiUPFCyZ0IbSiQJOe4/E1N5ldx29pfOdjxxRv6Kkf7jNg9CChNYNpLkM8SI5JC41O5avNcrvfaiekiWEJV0mZ59dE1yPqzMF8TstEuq6BJd7KeNj0HN9yGc2cZxTqXhDr1o/HfUsH7Z+beZVHN/qBlqKBbx9fCUbGX8ekQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA5BffAEhe8IJ8QeKaed4zYgCCGKLxaE3iurFnp+6acicSVCgZMLNoRQqJDZ6CeSY8uGw==]
\ No newline at end of file
diff --git a/classes/site::profile::symfony.yaml b/classes/site::profile::symfony.yaml
deleted file mode 100644 (file)
index fe0948f..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# Do not use this key in an other location (customer)
-php_admin_value:
-  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
-  memory_limit: 32M
-  upload_max_filesize: 4M
-  post_max_size: 4M
-  max_execution_time: '60'
-
-# Do not use this key in an other location (customer)
-directories:
-  - directory_docroot:
-    provider: 'directory'
-    path: "%{docroot}"
-    addhandlers:
-      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
-    options:
-      - FollowSymLinks
-      - MultiViews
-    allow_override:
-      - All
-    directoryindex: 'index.php'
\ No newline at end of file
diff --git a/classes/site::profile::typo3.yaml b/classes/site::profile::typo3.yaml
deleted file mode 100644 (file)
index 190336a..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
----
-php::extensions:
-  gd: {}
-  opcache: {}
-  mysqlnd: {}
-  soap: {}
-##### noch keine offizielle Lösung für suhosin/php7
-#  suhosin:
-#    settings:
-#      suhosin.request.max_varname_length: 200
-#      suhosin.post.max_name_length: 200
-#      suhosin.get.max_name_length: 200
-#      suhosin.get.max_value_length: 2000
-#      suhosin.executor.include.whitelist: 'phar,vfs'
-  mbstring: {}
-
-php::settings:
-  Date/date.timezone: Europe/Berlin
-  PHP/upload_max_filesize: 10M
-  PHP/post_max_size: 10M
-  PHP/max_execution_time: '240'
-  PHP/expose_php: 'Off'
-
-# Do not use this key in an other location (customer)
-typo3_project:
-  typo3:
-    version: '6.2.30'
-    typo3_src_path: '/opt'
-    site_path: '/var/www/typo3'
-    site_user: apache
-    site_group: apache
-    db_pass: qeSNVEu19PFxRu1g
-    db_user: typo3
-    db_host: localhost
-    db_name: typo3
-    enable_install_tool: true
-
-# Do not use this key in an other location (customer)
-php_admin_value:
-  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
-  memory_limit: 128M
-  upload_max_filesize: 20M
-  post_max_size: 20M
-  max_execution_time: '240'
-
-# Do not use this key in an other location (customer)
-directories:
-  - directory_docroot:
-    provider: 'directory'
-    path: "%{docroot}"
-    addhandlers:
-      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
-    options:
-      - FollowSymLinks
-      - MultiViews
-    allow_override:
-      - All
-    directoryindex: 'index.php'
-
-# Do not use this key in an other location (customer)
-headers:
-  - 'set X-Frame-Options: sameorigin'
-  - 'set X-XSS-Protection: "1; mode=block"'
-  - 'set X-Content-Type-Options: nosniff'
diff --git a/classes/site::profile::wordpress.yaml b/classes/site::profile::wordpress.yaml
deleted file mode 100644 (file)
index 4871bdf..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-php::extensions:
-  gd: {}
-#  xml: {}
-  opcache: {}
-  mysqlnd: {}
-# suhosin would be nice
-#  suhosin:
-#    settings:
-#      suhosin.request.max_varname_length: 200
-#      suhosin.post.max_name_length: 200
-#      suhosin.get.max_name_length: 200
-#      suhosin.get.max_value_length: 2000
-#      suhosin.executor.include.whitelist: 'phar,vfs'
-
-# Do not use this key in an other location (customer)
-wordpress_project:
-  wordpress:
-    servername: wordpress-dummy
-
-# Do not use this key in an other location (customer)
-php_admin_value:
-  error_log: /var/log/php-fpm/%{php_fpm_pool_name}-error.log
-  memory_limit: 128M
-  upload_max_filesize: 20M
-  post_max_size: 20M
-  max_execution_time: '240'
-
-# Do not use this key in an other location (customer)
-directories:
-  - directory_docroot:
-    provider: 'directory'
-    path: "%{docroot}"
-    addhandlers:
-      - { handler: "proxy:%{unix_socket_path}|fcgi://./" , extensions: '.php' }
-    options:
-      - FollowSymLinks
-      - MultiViews
-    allow_override:
-      - All
-    directoryindex: 'index.php'
index e5cfee8e1019a6af98d78a9b952ae0e22fbd3cdb..4130889248b1e8f9f54e75225f3fcd4515025c0d 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base_for_old_systems
+infra::role: base_for_old_systems
 
 # workaround fuer https://tickets.puppetlabs.com/browse/PDB-170
-site::profile::icinga2::client::host_template:
+infra::profile::icinga2::client::host_template:
   - 'generic-host'
   - 'bogus-template'
 
index e808d829baff8790e6d2c2b961fc9ed9d90f7cc8..ea02f098346ea1d6870096086dc407b646fde122 100644 (file)
@@ -1,16 +1,16 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApDFjpiMzG9XjbSh0BG4Za4fOvVE+D76NOMfekQNSoL4DX+iN0zYoAEC2YYMcCDMw994OGudYr0fIU03gkNX1DoZQMST/YnAJyEjWUWtOmChgI5Kdxva9FyMIiZhTI4sf5dCC8AHfnbN7rJMJ9L7cfCwdbRfOfLf5jXyZkYRGSXultlxRpesimNlkO+D7FZ9FteKGGkWMHalowhXYiGHPXBnPE6NNEfMLknIMqapxNhQ3SNT9jXrJd0kJtUgAsISF5BtDRA3Sc5v4+Rqd6qLLIhkNPD+/AoHKLML+vwRqbRJmmGAypjpwGinX+YbAXA5nDEdjhLDAt8ZHuoMJGe2ycDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC9kZ4oz9jCMa1zSjOdPTOTgBCNRXFzhmgnogRKgFujucug]
   testserver:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAofP97Z6G+ImsYvMzCBbLZK3ep7/liQfxGdPqOl8LZILXWQFNn3aMSx3ytMCVRSYVKaiiV8s8ntrmzWKcThihP1u2YnzaLDsIYe1DJXatACVyRgKtszQzxz4DiBESM3pwtW6Fhsn16Y/hv256lELrgNSzJWwV/MAaEDIHcCozmWJo261gJdTgTCUe1/dx8aYjFA+oVy99PC3QmB4hCwUD5exZ+eG+XJZzGIDU/dodlAcUfhVv6uxOCuvG4bumFGe30RXIyTMMK8TLpxrE77O5/6kowV2ZTbsgkn9gY/tWHU3Zbl9aLhlQ0HUZgxpcnRHUDBClBaa3JRUhanc4DStQsDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDHYZW3VkMhRlfZYx1+O0bSgBBs4B2eIYrlDh4H21CIdg4y]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   aamt-facebook:
     servername: aamt-facebook.pixelpark.net
     serveraliases:
@@ -75,7 +75,7 @@ site::profile::apache::pp_vhosts:
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   aamt-facebook:
     listen_owner: apache
     listen_group: apache
index 90e93ae38608497ea426f18aba185baa77a9b848..3534ca5db17c6daf93510ad005170b9c73af5417 100644 (file)
@@ -7,13 +7,13 @@ accounts::users:
     apply: true
     sudo: true
 #
-#site::additional_classes:
+#infra::additional_classes:
 #  - apache::mod::headers
-#  - site::profile::apache
+#  - infra::profile::apache
 #  - apache::mod::proxy_ajp
-#  - site::profile::mysql_server
+#  - infra::profile::mysql_server
 #
-#site::profile::apache::pp_vhosts:
+#infra::profile::apache::pp_vhosts:
 ####test-dev-basftoday:
 #    servername: test-dev-basftoday-de.pixelpark.net
 #    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4a018693482900255c1bd75d4880afd9891a7048..1c593e7b7c3366ada721e97bea062744a58086d4 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - aem::author
   - aem
 
index 71783e499d6b17fcb5dce059af14ef12dad72c8f..4b9ae2ee247262e92c136133154881598c5afbed 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base
+infra::role: base
 aem::dispatcher::proxy_host: dev-publish01-bbm.pixelpark.net
 aem::dispatcher::proxy_port: 4503
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 624c06b4311c66a198cd92ca130746b1b59735d6..d9574d5d87063521927bd6a3623a8c36455a4584 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - bibliomed
   - pp_mcollective
 
index 66f461fb477aa6026de5e635c7491ca67148d2d7..630ac4d35a46ca422fa04568dd0026acf3e4a891 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - bibliomed
   - accounts
   - logstash
index c3abf748156b08c8beda4c52c591801c6fb3866d..0c80a30575b74205fa006d9a8985b82f6308aaba 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - bibliomed
   - accounts
   - logstash
index e41b0ad63b96459232639d9a7148addec156ffb0..0d6ae2d527933384594ebed024f4d0f99d3f59be 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - bibliomed
   - repo
   - accounts
index 8ad51fb73268785241e94e680eada97f8ab9cc31..fed20873bf6eba0c478166f52878d27d19c15e0d 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - bibliomed
   - repo
   - accounts
index 873bdc89e6f17c3a957c3f31414931283e28bf73..3abc54692ae6ec5e4a690bed0d983a25089068bd 100644 (file)
@@ -32,16 +32,16 @@ accounts::users:
     apply: true
     groups: apache
 
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
   - apache::mod::headers
   - nodejs
   - redis
   - repo::redhat::passenger
   - apache::mod::passenger
-  - site::profile::symfony
+  - infra::profile::symfony
 
 apache::default_vhost: false
 
@@ -79,7 +79,7 @@ php::extensions:
       xdebug.remote_enable: 1
     zend: true
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   cms01:
     php_admin_value:
       always_populate_raw_post_data: -1
index ac509f06522a6edc33ea67a6a21cb03d4c769164..00eb76c88889a855c73e3db2052d19c6fa0a450f 100644 (file)
@@ -7,7 +7,7 @@ sudo::configs:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASramM0uoP8frJv+Vyh8VqNIQkHIrrpvzAxtOsdgT0V0ZC8wrLYxMEZYeWxJkAX9fVGcCjcIWOZ8Yvz4H3aYydGNgYjiMEaJZKPg7YjKordF00Anqsrc7F/Oq197CtJtK92s0aT30VoNpyte6Hjw4hRCBGNidURlj8Di5Y5AsZTsO6IkqlPUJp06f8cGfGcO/CBiez6wgXUmocRsqKuPTI+u9KI1/eJlODJBc/hb5xh3bphwTzZH1p1rSuX7XXIRPHZngXxB+9x306RDGocdr3aCbYd4/pEfPSgMM3vdW9AqqqRHFY0kjKEJGMlIC8M2KRWzyKoIXcHNPJL5HUrQhDDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAmWRuhf3WflREkuHsw3VYugCDySUkZfkGgEBREqIUQyPW2wQYEmoLHozcf8ctOTjLj/A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhDgNp8x/sLvPbvxnhxidZJHx7JKhwxaSC8HDqZm0mZpQr9dOwETWo5bZWqc8Weoyucy4+zZb/eEJa2ooQkXfwGcTuOEztrERs+4TkWkS6ZAbuEXLmmfTEK8O+SRwW2xlTuyPFLSnR2pWNs0dVOca+LM1FSUYFL4cOmL2+qG11opm4vQoAHBHov/aWYalQnpyQnd7M5lqspUKAz4gXe5+z+iTyE6xxOQ5Xb5ZqNY0ZcVz884cUT8HU5bL7evQ/X/ZacjvErGNnKTN6T+kmKZKaau8OBtrDN5EoV+7ksGTNUOVUQOwn5hrXlreOOBJV1pzJW76pplG2LxyknREo8Sy7DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCa5wxZMsI7j7xBKNeAS4iqgCDS0G+nTteaAb2g/Zoij14zspTUz9IVBf97hn7gmS7O/A==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   bkk:
     user: bkk
     password: '5PQQ3NC55JFP'
@@ -18,13 +18,13 @@ site::profile::mysql_server::databases:
 php::dev: true
 php::pear: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: 'D8isyxDMU27X'
   image:
     imagetool: 'h6n6HNeQ'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   web01:
     docroot: '/var/www/bkk-express-proxy/frontend/dist/static'
     ip: 192.168.16.3
@@ -131,7 +131,7 @@ site::profile::apache::pp_vhosts:
         options:
         - None
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   cms01:
     version: '7.6.11'
     site_path: '/var/www/bkk-meine-krankenkasse'
@@ -147,8 +147,8 @@ site::profile::typo3::projects:
     user: deploy.vogel
     mode: '2775'
 
-site::profile::symfony::manage_php: false
-site::profile::symfony::projects:
+infra::profile::symfony::manage_php: false
+infra::profile::symfony::projects:
   member01:
     servername: dev-member01-meine-krankenkasse-de.pixelpark.net
     ip: 192.168.16.6
index c9fd99b281093900eb128f843d38bed557152a62..16a8e5c205cbf579f6fb4c41c51ace7987202a1b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::profile::logstash::apache::enable: false
+infra::role: base
+infra::profile::logstash::apache::enable: false
 accounts::users:
   zeitwerk:
     apply: true
index b3adb7ec8d66907077dc03f583bce8d9053c8663..e2ffaa7935d338ace46a030437a7775d3f25b16c 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::additional_classes:
-  - site::profile::apache
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
-  - site::profile::postgresql_server
+  - infra::profile::postgresql_server
   - java
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   vivenio:
     docroot: /var/www/vivenio
     servername: test-www-anmeldung-bmas-de.pixelpark.net
@@ -24,7 +24,7 @@ site::profile::apache::pp_vhosts:
       - /images
 
 postgresql::server::postgres_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQWynjxxumte6aFE2xtxlVkXTYLjHwcG4O36BbsmlP4nX5hW5JFe2mH/rGVyVjQwIadf8Y5URDKF7+keX0gF5fdJW9VxF/EVbGOe353c/nGhg84sJQtZHAvFuDMwCUXApXhhrFkVnf7y2ocwe2J6mueuM6P3SqbUzagavXG6dFDRKxqsedZKdAGIc7h8mvmEND5Y0rpEHWFVkLmS+4ey6v0Ygstb/A5W2bi8EqDzQYf0x/OW6pv/gRHKOqP8+5xA6L4uN6sUmrd1sYCJ6NHhjgu2g/YhHqx7shv1DnHxFbdR52caS/q2kJxtMjaHwm7rVGyiQrjYGU4Y0Z8Es9kZeszBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAwPLkHebUH91zjo819R70xgCBD8TEKl5iX9j87Up1juYNBV2ezSw3KsbPYBnaeA08t+g==]
-site::profile::postgresql_server::databases:
+infra::profile::postgresql_server::databases:
   vivenio:
     user: vivenio
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAo+Sgy9b6SpEQksDLZsqJJfgj7Cwx7WZ1g1Ymz5Z/00yrWGTT7A/ELwKTwWGqP8CN8prwH6G6sZUOE0XF4SaZOGwMFdbMszNfFzffl9hJ9OgpM3P+QM4MMyyzZOJIzdT+wBfdj1+B3PoTs0FDwMDtFNqwPlZvi33oT3m9eCtPMf5azVBvIxNZCFjwUVgBEM+ADlzaMEJ6H7+hhAZK6bGUDh7xlRg6IzfPA6UAzfNe8BrJv1CBwcat4mUZWwY9xaTehwmrQzHu2nGFsrSpFGC+BthvSee9WXYHxDHUOa2th3NUtmVIssEQ9t8ZJoK79KvHHeLulJqf21rwgwc5teTNUTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCOZwGINLV5z1a3sV+mK038gCDum08B0ZAtFHyOz19ksOmgCDG8keZ+IWQIbVvNwOiN/Q==]
index a64aaeb6217b8ba1d1957dde1ea9dbaee85fefa3..bd87b7506db58780c479c3d944e7b303e4eecf80 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::additional_classes:
-  - site::profile::apache
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
-  - site::profile::postgresql_server
+  - infra::profile::postgresql_server
   - java
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   vivenio:
     docroot: /var/www/vivenio
     servername: www.anmeldung.bmas.de
@@ -25,7 +25,7 @@ site::profile::apache::pp_vhosts:
       - /images
 
 postgresql::server::postgres_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAs3blo/Dx9ONQ5fdwXSnIiGo1lZUVKdMcCzcQNH2e6vl4mHccd+9lhXorcFcPNIUvPxyyuYu9OsQ5tAKn79avjTAdBeZ7k3WnVRdTAvBUZAlIN9UxzqhSnixQsMe/jIgYH91Gy0wmVmoB9r9pADaDamFbPoGAPwX0IXHpaG1JpMXQ/bdT+rbv+779Vg0bE90c+mV3T+y21nGoyBm6TdZmJZZ7RrDnl+i3784elqHXPXfr1MERrfdJLMqGDmxA51nUiPg3mmqbGYYkjc4sgROsxxQ8HU8Jn4NKw+xkReECvXB5JXhQvp94Vd0u1gDJxmFVltWkKP7vxEFQtzR/YLB8gDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC/sKapZHc8XM53SQaezFsHgCBhrV5yL2WbI9kwJf0J+GEVV/t/YlBhXdUGsAub3Sel5g==]
-site::profile::postgresql_server::databases:
+infra::profile::postgresql_server::databases:
   vivenio:
     user: vivenio
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvULeaIJV0XNaRnC05R1R/T/YKeDdVIPocUlYzImGlOiOl83AHX76gKIdaxH8kpAQuXoj6mU9qGYX1HTjpYzFVLWZxt01nf+7W+p2bCD6xm9NLqwrqqwy2yw6NA7QADNdUeWiwqmICiUX+6lnSgU+eca8X68wDgqX+Q95nMyltap1+JKQf9SbACXQD5L00jACTyFawzc58VhRRZuppc46q2P++uyP3WnEngwsdPfFM2IUwteiQh7rjkfz0yQ5abSYIWKXCAk4mfJEGl4rCUXhu9A8qtcGsGXSHqLnUP2JpeqLXTNOdeYhjRx+rQ1tNV0TlacNh4xmAVmatKEXzshxVzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBV1OYUkTgJ+nfgapNpWiUogCCDVFyS8htEpDVodB9OMjrAaATCW+SSIRsQFWKEt8gOug==]
index 25943578725f91de3f43d4a422bf3421b1e341e3..45dadf953ee292a2e41d38b577efcf5863ceed50 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
 accounts::users:
   lothar.schickhoff:
index 72286650e8b06a25f2a22a390299ed1c32f2f2cf..44f8c69122736c75b6bedaca9b37f82170335d08 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANzjFZW5Dq4YmsboJMvcQR/JB3orJ4T09BHHRuXRXiqe/UZmw4Curr8Uiqj92hFGGM//bgvjbIUFWbGal4Ij9q35+bAnYuCrlXxLxeJKNdlz50OH/epNmclJnSTld5HDyTkBfYtRvoagQBgPABh83xsEoMu+cFEpRPQo7iuEU/kDa/JOzLMh0PRtbvtkwWM84T9+HH9q2dBmriv1Y0UhCS25NA3+Ql/tbgeErNfm1O5gdvLJI2MgL+1MAKdSCmaK9oGZD9l/M5HoVCX7TP20TNM8RPrMIpw8mvWTNNNVtnE9Z0w33u0/uz1T4BVQd6C54+yR+ZEwf46nEJWXFhpqpNzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBABsdyJqSqDqDZg1KuOWMqXgCCwy0FvFxhDjctdW4TU4IKiaHs8QImTRaPwK21syZom9A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAq3ySF7P22I/JfnatpAFl1TZ0rllCqwTP3aBnfyAvfdAWjRgnSWq5EQtDqRiHX+mDq/BQ8kA8qHxrZDb0en7ABBne7DhNJV80yaFCyd4iGOpvE8WpS+HfSHuD7Cp8oMKEw4IMfevWaAotWCkennIhu3zpFPWGafxf/PgnHOZlYsppqyoLNiH6PVnfzlZ/Tig3pCJ02z690GUnFAKgfHbk+k/VbaWQMHme8ljWvyVxzeaN16UhDsMTXZbb/uZu9VMMpB52VnpJldvH/jjXW4PXlV96a+ZYQhcuX7f0fpJWiMjow2WyYecK/8lnpVulN6K09Rii9zx8g1wI46oafvJCxzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC4Sgecx0NU6TbN9jZFzvULgCApX4T2u8xF5v/k45+QjD4Als1t7OWsg3/sCZ9Oc1pTvw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   g20:
     user: g20
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUSANBzL07SBUpnrTB528mVIcx9sBuoNfp2WhhPRPFG2HIhOos1sGQEBvI8yCuVVzvg0SIgderoGMPLdFtKNEB7t0lTI0q5/YW5ahR4dpUT7UtMFS0R5O23UeEXqow1dE7T6OkXbQBWexi4hygR2gtnWx7FoMf2+vErEF2YMyP5SHzKTS4tWn85UDPATIlodTqAvHbSgvJ9AxPAsN0lmeytjhjmjq9dxUXRBncGdRH7JpuA2YIJFRUEXGuEEDgJA0tFVpmZMIw7aLbh/aIEv/vNgo+TWL2sjfQZpcYveGL6wY/suLLmR8aQDDltPqAlaffk4og83/rHoiHE7kDJvKsDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA3a3/VIFGT47PdSZwhdgYOgCDXmpyEw4PZO6uizGI60e9SApmA26mA4LPjepvrVm6Bxw==]
@@ -13,16 +13,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   g20:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAO2gsG/lq/BuNQpiz7LS1qnUmtDZys6PJ0MR3vcMnWjWg3EpchYxBhMgrhsMI2e0UJ51tCdHvIQEr59rAXamH5IouuF0N+nat6ZcT7nWHrQS2Uks8RMDH5HCON5X/WqOtUIFA1JUyya1LTE1c/PYTusnzFEJ2nSb4y9dEXaxcO/n6b0KGB/as5O4LEFDFp3b3OvHH4Ml81dLl9qPW2SuPQ6cDsJoRM6VDbejtYbjsmBKPXmtejb6T8kKK9UhWNo18TUc5yZiA8FvwKT1HQ12Deg/T/VdYuUInkrCTHl2JxWnzjRfRyR1choCErY9cAqq6gsAvJAyZ+jvrIQLRjey9jTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBK7+bkDKd5mfmeZuwN0IcHgBDcB3TtbuOkKVk2++FboeXf]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   g20:
     docroot: /var/www/g20
     servername: dev-www-g20-bmas.pixelpark.net
index 0708cfafe25c019605e6d43714df975b3a547c82..380b0cd18db48d693d43f4ec1b7c494d0243218d 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArtkaXJ6KPfk3Fq7DURIGuVXAoijATcqJ/HdXXEA4uNDBxEaMBPgILbiDNehIIqiIvz/a6/IjgK+3Ik723z7U50JGMSs80q0Zu08CtkGVXlHAjX2BR5uP4diwtHUJzRB06bpuWk9tWzV9VCJrGEzwnG57ZevvIlojAWZ3hzFcdK2YmLhITukh1ZE9Xwd+W5oriuBEiRSiv0P5aC3Eqn7d/1qAj7LpryIDfVt6stRgu3NwmFXOFruE3pxP+Y8eiuGhZZbtOcddP67ZwHlYJ0S6Z52gN3ccOh1tuD5kmhSXBmALBo1CjasTVf1P6nEsjhJ0AgJPo53BExnIdSitffb7CzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDFxml6n10vPM+Chw9IARNXgCA/5mln1C5F841sQuAR3Um+YM4JiFPRuttdu/3OujA96w==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALc4hdVSZj7U1pM1h76xj5dP8ZxQ/bctMMd/4emao1DtpaGoSGEi2hbwXZAOXXWQzdUUyX6jo1Mewjhnh/5SJa6B/srOlISKdgHDWUfvMVMvGayt9pyolWywaviKxpf/zs5N+xGV6oshL19MwukiboNv48q2nEAC3KYdGjIZp0MCAi8dK8xu5+1a3LF+EuxtjVftwcZwNdVZuswmb22cW8M7nGby3UA8yBNYWE3YQnwXuWVt0vRgkMQbjRnKntLbD24N1FqQmX2Z59Jum7ghINd3pnMCGmOZl4PQRRPANUTaqU7X0okxGQP3WV7JItCmhcxsE4V8ZxaLd6Z1BT2ITOzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYqVkutZ0uW8YFQlSXNt2VgCAi2WStthfJOAZ4C26I4KUUsz4k3C4aIThkQ7rxn1jlsA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   g20:
     user: g20
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAxF3gPw8f3Zc1PhgrhgZB/e5kj/dAQt3sZoW0tfGL6doIv9aTwcxIQ6F0hGHBDtxZs8mz/oV0ex0yzOjsvLc1F5VA+ZOZOHSOR8ZIyTYypQr/8ve5dYNpdzLJZAKYy/7nRO2MvUbx3YnUG4UO8XMcD0HxfTHiVH6zkkDFUaldLeVk4GRgygieVaOi+61KiXrioE38/VhFpzKD0LJsVVwRhE3kAV49+lpGX+M5/BteHpLYH3QVfuvGh1m9eARpdt6uJmYv8FkO4LyLNDdhJOF7k069pWVjbDm6RUUbdMpunEI9i3CwI+jmeFP/9Q6SSr6vEt8sqFzEUzazy+7kQG0DRzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAn+ksaKYKShXnRHa4ijoW4gCDgaEYxdQt7GHCIjQOZmi8sYcyXPMlahwinkqqY7WxWvg==]
@@ -10,16 +10,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   g20:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwtKqzRR1chSJwiTMczzMYem0gYsbdlS8IdQbXqOuNWR23kwLKVTWFuvOTIG1VW07NWfo6QFejDA3XavtOUOxULXmLfa50/TIdSMrts9oH629hS5rMP/jkgy4Togc5NhAYtmEYjIybm55G9kT6HKe+5WZFoJEeWuZfawsagt98raxuqkgIlp9kDINognPIjVAjaljGrJL+UQaBy81xrVSpSDEABkP1Sf9hRy9szihClJZ0zJuwZjjZ20mCoiIFXeahL4oGQDAjo9sC4V+Q5wQavQYqId2ZxNfXV34SuUa94Ae+AJNGLCBXMYouMc+fjoieIf0+UzNC1aJUpc+rx9VlzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAUJutRkMMEN+MlX/aACnzAgBBSC6x7g0ACXc4AIXtOGiHq]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   g20:
     docroot: /var/www/g20
     servername: www.g20ewg.org
index bb9a99a8a0e4bc014ccb66ee7810307feb6031ed..a8ae1328b5bea09ae18bc401070357d490744d84 100644 (file)
@@ -17,10 +17,10 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
   - solr
 
 solr::cores:
@@ -43,13 +43,13 @@ solr::opts:
 
 repo::remi_php56: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: kR8KryW4OnrSvirk
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAceOeCBfrICIyJGg6a0yrVMPFHZ2GQnAkydjSFohKwIu8tSPFyn/cQ9irmpmok6mcRPV//7NFe+pZS1bT2v+EW41z/XQoJp6b9x/yIsSPwvEpaC2kWyL9eSiAvWeH6lbaIkXrr/SpVzaxjqOMnRqyMyaMI7u1HOoa/JbrZEZWNQbH82oDZjgsddmuyXulb9Oi7NmwJbDtI75YHYHRlWsG9MK9Q29dbY/Uw+VxC+iHwPD6QQwKh+KlFr+XUo37pCtYm51KJ0pxNgrYf1UWP8IuOkTxadmljGFxJ2aglrPAuSsOp/mgBxhoVzENUXIrfQ5yak5e8eVRS7AT6wCw+pOqujBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC7GvtJmyHANNpqgE7XmF9ggCDaSakRz4p/xqWtkt/7AnUvr1jmFpIf2lCN/0B9qcUB7Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZ0Pj71yRqLhjGXWkFqZ1pfg2D34IFyS+rrf0uvQZVoQj31+gbQ2TcNN9ONvDKfnXi+wSFCRyFqkwY7ruevx1hWwIKPtEmUu890HnfICgC+fMVC5GQ/u/vMhfZcgsFuMtp3+bchWuaiGsGzCHCqJtToAi2eZGJnmWhe85SurFerWvtkPzYghF0JDHqv4HYPrc/lypIX2IH+bpOhx4iU1Vid8yFXuy/RAk9cMU7dn4EhYxPXBVgJXwcjZjQoG8phKT2z578FDDZI9UcR++DaAoJvd1j/d1EPEwUkFBdAoRZygSxWz6ucUgkxp9P9Z0t1qBIrMmNVnkJ0LaZhDvMlskRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCduY+IvAZt27+OhPtMcXFggCBVKC+pcB3ncmLzfDLCHM2wWF1+rm213P2EbFuq6XagEA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   sgb2_drupal7:
     user: sgb2_drupal7
     password: N5PHcLuOP3HRUudY
@@ -70,7 +70,7 @@ php::settings:
   PHP/upload_max_filesize: 2G
 
 # www.gf.sgb2.info
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   www.gf.sgb2.info:
     site_path: /srv/www/gf.sgb2.info
     servername: dev-www-gf-sgb2-info.pixelpark.net
index 962df7b9664b88dd6749e404fe75b19c05c25d68..7244f9ffe5f3abad64fd3d7e3ced34703858ea8f 100644 (file)
@@ -1,5 +1,5 @@
 ---
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYev9tYQG8tu4heqI8/rlMBnpik9HBnIgO1ZMPPUsBRMzuvvb3Qo5tbVvatrMoFmIMx1nQGD98HiBF7onC3AwCkm7zRUMxMDUIBNXYSDYwBBfb14cbydDYlp8Gz3Qxm6/Rrb3rycOOWyw+/xnR6Mrtrfv7dlmwLgWou3toQDoDu00I/nwqJ1qBOSO/38PtLSSZ85l6P0dnQbbdXI2IXQhwr7cqhpD13EvVQIRmoo7MCN6trAuSyxJ/9lid0Dy8TcTE3Yu6DUzHlTEr81QivhcSm9cPelL69FupU8nMfwxRoMtlCV4GpTVAY97sHHE0o4+EW6MBbEtpdriG3xmiXuq2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIWs9p47LWQCgE9huA5g0rgCDu//btUahADcKnwLWcDztViIt4cCoMnOi76XAzPB8+sQ==]
\ No newline at end of file
index 0f02d9903c78ffd6f5e73f16605e2f8725e436c3..5fce2388b9d384c1a7a64b5fc9889d89fbb66d4f 100644 (file)
@@ -1,9 +1,9 @@
 ---
 # Oracle Linux 7
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
   - solr
 
 solr::cores:
@@ -26,7 +26,7 @@ solr::opts:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOto44MjoWJmEj0Kp4+4I7ENX4kC5VZJhYt79m+2Q9JKQ4Ca9l7nyipLqBKQnV9fMftu0WFJha7h0uAIFkFzCSbSrHmMRjcC/aPpdLLCglwAJSDD71tTsbLMACcsEA4ygiAjQHlhIAW1kNO0zBx5c87+RvS911z7Iklsilrr9lJsL58HD4KmU8Wnt/U6m1LU/hV9yr/KEvaVZ6lPkDkX3zmx8vWFohJiFwK3TxJrRrAoY1v/Z9fShwy/F/Te+T2pTQjXDYLBOgv01URnR6vmpyBMLHP/AIZqdJERn+m89uIXXu5o6nQaWMq86Buwocz14kuHcv6EJw5OHapLr/vtHDjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBLXxBvFdFdyXebdTfim7tEgCA0xepMbCwqZazqS1ATaZoGeSgHUT5IZ5WVuKxGoduH0w==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABjYqgd5Tlxs3bgOApfMlehFEAM4i/i6MXo6sQgejMt8yYkutoM2yC++GZhDvR2/V5hXgUiQlHdKc3hRlmbw6mVMg9ZS0l7U13nowKHINFsKg74YRQCVLs7FWO0EaG+dMX7PRPMCaYiCFg6StXRqIInSfSx71XxPy1XDnFluEG4hqCQh0ebSGwoOy02RGzWChOjoe2TLKKWCnPt7KBa8r1TqMKWgivsB3eCo6IsiLA8KNw3GkXM0EIo3s2F2yI2qAeH4kq5VMcFiIOFUjhFhlGIL1Xx7FfdLlVeUE7kUwUHFWrCbgybXTVduXhOWTREIl6MJHzDAkmkAzYrp+MSGIoTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDHOw86W03d7Z12ru3LNqDBgCC24WCCXh4/O3WaLnQgIuQu0DRd8gFDsqPfUu4JIjiLtw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   sgb2_drupal6:
     user: sgb2_drupal6
     host: '77.74.237.9'
@@ -67,7 +67,7 @@ php::extensions:
   opcache: {}
 
 # www.gf.sgb2.info
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   www.gf.sgb2.info:
     site_path: /srv/www/gf.sgb2.info
     servername: test-www-gf-sgb2-info.pixelpark.net
index 6bdf8f39309b5362f0e3246cee6ff557f1b86f5c..bd5b8feec5e8b2dccc61915cd31ca0841dd48d4e 100644 (file)
@@ -8,7 +8,7 @@ accounts::users:
   jenkins:
     apply: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeMOZXt0fuxoU7podsQCMv94kCcg3DuDzEWjIJVj9/LHYOrSMLhlBJplMJzlQ3tQuHmyZY1LeGQCfbsElywOWs9SWTSi/ipjSZXm7SgPEMSEsbeDC7FBI+Bgx+k8RfwnTnpvS4qMXtnjqX4dwCw5sKD+v3lrta1Wh8j3/hcgj4TJMpZyjv1uhejeZwL2YDdJ/oQCT1Lchs6/Ui22zN0SXhqcjXv5Ada2c0M2bAZv8n5TZl+27nmB1qQPOWsUUTz4mfY0DhspgZczEsw/XrdpoKoN96OYrE/nAsaBIlu7k/BA+1uShe6vQSZtzfJile6wIwteWvrY7jvkCSA/LUDuoczBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAf5Lp25Vpq+z2RUU+EmXlkgCDCUBDMkQtBqAJl4X5c0Ll9zsU6nhSm1qSboGynHW7fvw==]
 
index f7b868dc3919a0898dbb844666668d2f0af1f0f5..bebdac5e30476cb3bf5f5b99c53a873ad278ceb0 100644 (file)
@@ -1,9 +1,9 @@
 ---
 # Oracle Linux 7
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
 #  - solr
 
 solr::cores:
@@ -26,7 +26,7 @@ solr::opts:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGJ3/2jsms3pHVIY+IzVEIgZoP9IDsaesIbZiBEI1rHjTeDuHsghoSHhmUE/FtTI90l6r76uiZFA8CRMnDb9ojqcPnEJRM4RHAeNiOJIapDGP7WfoIM3sk5JJXJV7S5y/1xJjq+6bN01vVOSV/TtVv9ZMA89t6v+ltq/eHe+lw/UXAsj84GWjnS+Cwa47MQCGnK0X8mbiDvs++OO9hZpKdYSl2xBx/cKeumY2Z8CP2QSznbTXPSJGIcm/JjxzdZGcdA2DRsBC4aFQ/CJyetJqrCqM+CVo8vckz8rh/O5ePAeiMmiA6y3IHtCmjZY7LWS2r27EWlMsB/QaRR5QT4jzizBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDAvqwdMfDbAtDXnlCMSgDXgCC8aWaCvPyKsrsmeZGVG8F4uKlPM7HPA1ZoRdwdfqJnow==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOFPdpMLV7aUp0bknXGdPqi1FRjXrrigSejVq8xmUYbvYGSbXoSVvEWr1DqmOqzbaPvVeQnaQTPyvtZZzOweCIUqz5BYJFBOs7NroiFDxnCPsUh5Vxx5QbazTFNowssqRpfY8Qlr0N+J18gdejio3dQ8aXLshHaXK5weq1qRpLUej6AtpSYnyB6pIqATO6lmrIKa3n8YDMZvQ8ZrA7ot0cMH+yEmlqhEPrvGMq1QgmD3mrHNkC7R5t5lvuavtHoaEo5/436aQuBkJPL+ML4RdCa9EbajFqHegLd4ySwHG86Ca8JDnDW1wPFPOkAqSLPrZdVW9igFRN1PLmzOmbDoDgzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBik7Z0hTbW9pKdNzM4LEshgCA5l5mWBvtIvwqg3vFp5Wcq7yxuULDaqc/gJUR8cf8fLQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   sgb2_drupal6:
     user: sgb2_drupal6
     host: '77.74.236.164'
@@ -60,7 +60,7 @@ php::extensions:
   opcache: {}
 
 # www.gf.sgb2.info
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   www.gf.sgb2.info:
     site_path: /srv/www/gf.sgb2.info
     servername: www.gf.sgb2.info
index 3cf912e98636622241ecdd082be89f6364310cc3..0de86766b17cc0c6479ee747c17aaac0c5c92f4f 100644 (file)
@@ -1,16 +1,16 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::monitoring::mysql
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::monitoring::mysql
+  - infra::profile::mysql_server
   - memcached
   - zabbix::agent
 
 # Wert nur temporaer
 zabbix::agent::include_dir_purge: false
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mensch:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANTguOQSNC0so1eroU9CknzB6L1Tgjc/W79vM79mvf564KMhaBv4UB9bhvBLsjjTgyUuQyj9nbGI6LLHq3pU7XLNP4pSYaRZ9fB8F4VQvwPCgQDHVF9LErDjOtnEkQ1nzaPkf5UwERRkQNepdPY+43zqY7Mf4vK4ASXScYfkkYUWWJxqk7XBmaFTAe8yN/WOyM5OuaHyS6QHAvGo/U7CtisFoezs8KF8tKdyRFnY8OZS0KzuOEAumaF/DUtCu1JP9BxMlCBMS9LzodfkCO2VBTvwq1vgO/FUs96AcMzs6jlDLzOtIB6F8pRZMC2+VHmHgCR/tMn5oph25nDRhueeOLjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCzZOxEC9kazloLuGrR7uYugCApSpLJoexjPKU1scpk4dexKQ0z4pSYVJ/DSo7EUwm6Kg==]
   arbeit:
@@ -23,8 +23,8 @@ site::profile::apache::htdigest:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACf3w//mCFU1OeXQP6PpS9+iUnZIZf56tkgTIjYv8M1lPMUmsmdJPXQUxP+Gg7zK/ph6M0GXPrbnM09hniYt9Qj3qxwz4DGAXpX86Ef70zXuONw/NEVSWyRYgplfeSWwxA9DVJcGa76h5aw0T/6XrBzCp5vqpSLiR2zenL02HV/ut4ozLhcMP0JYZoZWIViI/r2I2lOEzwSmkRTNAWro1KEs4RjzrqKnEXV5NGEgN4cfdiBP9YlGgOzjdM82533KOi3Wg7YxEgKEjzOUon0MXzs12IoTtJfb9oaeiPpkRunjHZiiH8N/VspISMAfjYM6/ndNDRQtajcn6lry1FlJ1rjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDUBhOHnxWeyFt4/Btnq8crgCCeMlcG6vaVYUxt1ZdASC76jhwup0lCXA3ifLynpsk4fQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtHqFKk8KROxA1MObdzfrRFo4Oqgfj71sKi+pEjD0EG48L7QBv+TsS3Nnf1VKVijSYVXP1vPQf8MlIRopGsa7dBoYHIy3alu6JuQUsTkjrcO/poQ4hUTmokBLsv/k8IP5n08HXYSG7W5PYWESAYW1lci9jbxo+BwSJwvcVTHK5w4cf/5frtdsmKaKnBkSq/dfJSH8uAurJABDPTsCy/f5rp38YhIFnlCZgvCFCld331MdBvGRCyRei4VVz1oucthdTygVc11J+HrOR+jXCBCszb0xind2PfdgLPC2NUOQttPe8E09y0TCiCZgQkuBTI16CvrDsUJRPsyFgpIo/YJ7xDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA0wTovegr/P6hFuhZSs1q5gCA6EW12qrq6y2vbLpcRNuiFlJ4VzXU3SaZibk7UAxyTnA==]
-site::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbuWYdTTzoHOKqbOXLpUlpuvx+Akt0DDWnt/L0mCDwj2Twj1fYFlRcWLO+7KZ9osV0FMQvOBqHQfAllJU2jpUTKR0uvIPIGrib3C4Etzl0eY/x4oBKzZ86zcYm3mNC/Y3c/sBet+q3+F+0NpW9Q/gPrFoxecJIsfRXouzGbRwrOzgXIlfbmB6dgbgAgfZp3qoPPrgekDS/jmmV8cvzuYw4a4/y0RwCE6jZo7yVVny9nDGfZHfAVHdBbRhs1lqe4vmh6hZyikgmKh+l07AqbKaZjTtUjYYjbbXRdm+oBli9QLv4LVZSsGOcmDIb7VnuHJ6eYsXNLQqxHQnurzsMhx25TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDuht1eEevhz3TLbAo0EC6XgCAuQSJd08ILceScSHckcznuJYsJ4UAcdgLVBGXa/oixcQ==]
-site::profile::mysql_server::databases:
+infra::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbuWYdTTzoHOKqbOXLpUlpuvx+Akt0DDWnt/L0mCDwj2Twj1fYFlRcWLO+7KZ9osV0FMQvOBqHQfAllJU2jpUTKR0uvIPIGrib3C4Etzl0eY/x4oBKzZ86zcYm3mNC/Y3c/sBet+q3+F+0NpW9Q/gPrFoxecJIsfRXouzGbRwrOzgXIlfbmB6dgbgAgfZp3qoPPrgekDS/jmmV8cvzuYw4a4/y0RwCE6jZo7yVVny9nDGfZHfAVHdBbRhs1lqe4vmh6hZyikgmKh+l07AqbKaZjTtUjYYjbbXRdm+oBli9QLv4LVZSsGOcmDIb7VnuHJ6eYsXNLQqxHQnurzsMhx25TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDuht1eEevhz3TLbAo0EC6XgCAuQSJd08ILceScSHckcznuJYsJ4UAcdgLVBGXa/oixcQ==]
+infra::profile::mysql_server::databases:
   arbeiten:
     user: bmas-arbeiten
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXFYrhAuiSMRqQTVA+ftpA5N2QuYZ9fh2bPuxlm15aUnxQ8kUpLgZEzV78ul6tfQeTGLj9cg9+ZcUHoJdDmmvjP5g2iEkINMhNxNifZa/UCmfwmCWaRCVjSajiFgIuCSl961WcAjq7sGgCJ3d8OgSV0wZ2qgElS0dY5rrn0VJWouUEnwyr2hmsezohvsdQOMIo7yP3Oxjx+EZ7Rj2STJhGgsDFc5//qrQ9WfXyoeIgZFGV0Zm/CmkzIG0wg9j5ewnM6IS0PGiGMo05NxS93gFHt5kRHR2jWV7KkSEuYdtvioDs3f4rLn6JiEOsJ6eE3jH69rorY602Pi3dG51hO1bgjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCF07KGfrxZLvAa7LgsrK9gCCEipwLQm/NfoTKfJKourvz2w2Ld3Cae1Vf0jZ2wwiuHw==]
@@ -67,7 +67,7 @@ php::settings:
   Date/date.timezone: Europe/Berlin
   PHP/expose_php: 'Off'
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   arbeitenviernull:
     version: '7.6.16'
     site_path: '/srv/www/arbeitenviernull'
index 6ce06122b4e0f018ded9ec9ef16d7d62f86d0410..be531961988fd8111a88e2679f0fbe48684d9299 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::apache_php
-  - site::profile::typo3
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::apache_php
+  - infra::profile::typo3
   - mysql::server::backup
-  - site::profile::mysql_server
+  - infra::profile::mysql_server
   - memcached
   - logstash
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mensch:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoA53qgDXHzh0+ha/L/ZuoXEGUUo4ytsJcYj7/YX4TecLCnnKuOAQsQ76sswk20osQPAsvGsjYmifPCxjK7wK/moFqnCvwieppmQVk1s28WDKt9Mk+v1mHlX1OL8H351QoSgQ5Bb/9IcgOR08MicsOhvixCtJeMHWcTQXf4SS3Jx98x9rYts3mO5nmgJ9ntiw8jUhq1BMXxtGcLcpuL4628gVOr0YKr03BoZzUnXnSzudMJuu3yNyrAwwjQidzzJgdXHjV4hxtINNm4PgdpDXYC9gb0iRhEcVbhIrpHnJnDJQL0d/7Nr5DrKs4monawoS1IrmABQhJGVSHmE/o+LtZjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGp2va8/uf9Lix8PuCbbBygCDVboa6Xhkk50wLdgn5mEKEny+qXv/FJZYVoa8KD0S5Ww==]
   arbeit:
@@ -22,7 +22,7 @@ site::profile::apache::htdigest:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcgJXK3gijilLMgYKBC4eUMh755qf5KmqQRqaeOnx2xIF76zf9VqeiblkahavSteHbvOPv6cDiC00hmSesDK57HUnnUCEsLdheOwJlf/8bzHHPCiwnOJps/RpLO++D8uasYxdGQ1d+DGXGRD6OFAl8DsyOQmIBKPVVoHgFAxptKdzjdqTzQWTIRiUsEVzahmvDD9e+wSn2BeSbjUAB1ZeGe+UyPkLJ4/OKIjASa9mUIzqx2+I/1LOkC/so0oCFs9F65QlyIEA2cHTNJWkCSvIQP5EjW5h15TaZdt/FO2fkgHo6OvXUg4Lj4Qm8xgtAOzkU0Z5tpLN1WHyE+TxYdFL0TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8jyuuhJ3MkxKJxweAKi95gCBIH9JFrbHO4+VZnvPZDRxb9Y+lRX0c9MZYDh/0DGftoQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeMtp2QDvxtg9WwqNbWHhFecjZEaOVmcdTQnJnhpO2Ytpt9GVFQ5VNap3/+t/7MPnvAOM7IWDifH7hSICSxWns9sUkJEWPP+eEQ/hXwku/GomwCf+iTWfkPzDrBwSsKkRHXC7jGDDgltjEKp8H2fJzp+h6mhYxo8ZLrLj87MJ+KDIf6os9yhd/nnn37PJHUCQdICwAcBlHGwxvhHk6lx3WtLdCdmZ3wxh1Qv9PlaTzTH1q8uoV18qcWx7X7GaVlqzmtMv95uzOkIswf30fVbZeM8XVDbFGio51VCFWH0wSJJHGCKH76HpoOiWOFVn7O0x1lnE3BiMkZ4v6XvXzf+lITBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDdgqOsmcJjSwfhR07d+yXfgCC3dKZ9I9PeZvbaNOMKB5W2S86j8dqDbGZu7Qy1YrpMCw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   arbeiten:
     user: bmas-arbeiten
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdwF+rew961ztYnHiBSQgq4detiJAX9wmBkmVRhIg4XyU0VoowZW24kqIcGNd3DQOnBV6yPGVF2K0ih3vYvVtE+f8YYNK0t2Vf/Z0ItczVos0Lp18AS0uljopV+5TIhynlTxKMcgKPw+VvHvZhNym3xnkUvYUdlVKJDsZ8i7jew2WsaW0KZJuTUrnVIDAVKh0dK3WP6JGbgaNcihQuS78A4IRi8DsOhyvUskmiy65LpQrwDnIJVM8QL5HiWdj6ejk6TaXn1la22QemnlkjTaQZdFVVxneSCKZgJr2Ty70cj1g6OuqL071A1NyhKUHi+5NAnvKR9ezeUoTQ1qGcKdPYzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBRFsJ3881EciBFiNrgg0g+gCBy05N1Wcwlt1fsAPUJEX3LUSyewzfapTwElC3FA8kjEg==]
@@ -94,7 +94,7 @@ php::settings:
   PHP/max_execution_time: '240'
   PHP/expose_php: 'Off'
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   pdfgenerator:
     docroot: /srv/www/pdf.fachkraefte-offensive.de
     port: 80
@@ -122,7 +122,7 @@ site::profile::apache::vhosts:
           - None
         directoryindex: 'index.php'
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   arbeitenviernull:
     version: '6.2.30'
     site_path: '/srv/www/arbeitenviernull'
index bf65c8c1f6ac419c429bfe307eef9458c745523e..ab2f7101f2f7e7c4926160b1532ec3c57f5d3ef9 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
   - memcached
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mensch:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAFEMi1n5T/hQvMoWnLvWdyu5LBdp9irYFsvHPOYb52YnGSFPReaPnL3o8p9IFupUYTPg+eM9JyzAaCOhYUJ2VDZP1/Ailqvqc8YL4QoScwN6PHhGkJZVVnxJaKTBEDdDCikptCs5SBU6Kdx9TE997mwUDx5KQuOtCm/byExXeF5ojbvKyLWI6OknacwoD2SLZnkBqvGpnCcjJuAbeR8xhuWBwPN/pLeIGC9koIAh1FmfPlrZK9kFvrVC4Ya+m2x3iZFGTnx7ia7MvUA/q0khdAsKErri7EopOEVhuwHtWxgEXY783soJUAkNlHX3pxkB10B/+bxghmiLtZ/XEP8D/QTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBVXh1Y1DLveAZcGFwK1qqZgCArda9bVWj2x4qqROVENSF0aHhGCvC0HgPTBEo/dnqhVA==]
   arbeit:
@@ -20,7 +20,7 @@ site::profile::apache::htdigest:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGWdyukG0mmYP234uDJZBaiTdSdJcqnhIxgAVA10b9AcyBZecycCnZeGX+1kQW3Hyc+Gg1W01/oRYfXE4iDz77R7fJ4A7yzWS3cVIS+Zm8g9dnEtXe/+EPk70vbiCB4iSR1z6aY/SSpnUyqdjG2k5Yj3oqcfmpoNMBd7+J+048wgU2eEX3zXmOTnWwlFBh3iYZvtMjZBSY8zc5kVKuGSiCXyv9Cj2aQWux84Vm6hyIkh9uSUnU+cKpdS6gQRpNNu1W1GXRJ7bSjaqh1MiOB3wHMHrucVYVYI6mJyHSqsk9Olk3Xp2y/0K4N8781VymFYyaTmpTIJp9tCf5Sd4AkOVHjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB7mqLpJvcSDEJPYt35AsuxgCAQ+fPJQzCaH37KDICI6BTROsRqi9V76kMAcl4Khm6lnw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdk2v694VKey5ieOiN9WCzIWmGXkIXmzpzpD6uul64mtPezXW/yQY3fGD8rqphIlhfCXiad90C7BisrM/Bt++ljlt7CMxnEapDJw4ZuAoqxU7MULqFUPFd+9z75A6OKqd0T3/6W5jOJgUA8P2y+54HEOWGFjmqeXlgo54s+tiHG+l7A9/ngyu0NvIyB5yVgCNt789noEnCVwnE5p6qOiI24FNVs1lqmlSPVuCP9ErJqDNcSVwVV3BnHdbuuuPShD9VE0/ZMfuGdhOQnUyQ7fNJUxtxJVnB3oyp+9Q5EwWg9WJqHQbL5AgJ/TjMMCnh2tbYmug204RUYXBcxxpqxfoizBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBSCCtcA8Bfk9Pg17ho2YPwgCD+cGC/fzUGp1ECFW7KuLPKP7yyEKvk1IFJ6eN71SR2/Q==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   arbeiten:
     user: bmas-arbeiten
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACV4wK/A3nTpq+ke5ahJpo5P5C+0u/Vc6Nle5lR4uUxtZqKsY58G8rBVJVXoNmFi+czHR8YIg2J9W+J57kGVY9rMIMjh14kc8iUhJAA45EISIceglHNz65D418YdwBQdhuulNlwtnK2M3ULL1DfLu+ynMwDSWxnBwqv/k6gbnLpXxS/1Ext/m3jBtZ5JKaFwuPEoulHoUxqVT/r7fiJpeSa0hSsWHsHav+2UBz+LKXfsPdkZ+W91Ci58vQbHYsXplbTpsQfITvpovBmoxwmXl8LaPI0NddypZ2kmSbz7U5+wiOpfra8rNgs0t6JW/BG6AMnPo8e9unzNkaLFlCV52FTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCTwbiMyittEAViT7YHtysogCAm2qtcA6oWmpAJTTFKndBuQt8A2XkwHwOiUV+LWvc4aw==]
@@ -62,7 +62,7 @@ php::settings:
   PHP/max_execution_time: '240'
   PHP/expose_php: 'Off'
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   arbeitenviernull:
     version: '7.6.16'
     site_path: '/srv/www/arbeitenviernull'
@@ -171,7 +171,7 @@ site::profile::typo3::projects:
       always_populate_raw_post_data: '-1'
       max_input_vars: 1500
 
-site::profile::apache_php::vhosts:
+infra::profile::apache_php::vhosts:
   mikrokredit:
     docroot: /srv/www/mikrokredit
     port: 80
@@ -201,7 +201,7 @@ site::profile::apache_php::vhosts:
         require:
           - local
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mikrokredit:
     listen: "/var/run/php5-fpm-mikrokredit.sock"
     listen_owner: apache
index eabe824d0d99f8b7340a2134da6ef5e13fe70aca..45b4bd1378564a070c82371b8a86e504b6e51e28 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
\ No newline at end of file
index eabe824d0d99f8b7340a2134da6ef5e13fe70aca..45b4bd1378564a070c82371b8a86e504b6e51e28 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 197004ac37f31f6ec4b8b9fe42769727d4c13565..e38c15e7a7fa1ecf7f64a16cd24df6fa7cef6e3e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - pp_mcollective
 
index 6134fc3f87f52965a1d239089aaea760472f7bd8..789185324029f162fb9adcdc94ffe508a5e3b8cb 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - pp_mcollective
 
index af95ee4511ff7236e9ec4bcf1a38e47faaccd686..03c1b0f2af7be56b73ea9b59005a570a2399dcf6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
index eabe824d0d99f8b7340a2134da6ef5e13fe70aca..45b4bd1378564a070c82371b8a86e504b6e51e28 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
\ No newline at end of file
index eabe824d0d99f8b7340a2134da6ef5e13fe70aca..45b4bd1378564a070c82371b8a86e504b6e51e28 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
\ No newline at end of file
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index e80331e13f7d44752b3d6a6f0846255480a5012d..c577a269e2c9168d3153254e1bc5708775636c4b 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - pp_mcollective
 
index e80331e13f7d44752b3d6a6f0846255480a5012d..c577a269e2c9168d3153254e1bc5708775636c4b 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - pp_mcollective
 
index af95ee4511ff7236e9ec4bcf1a38e47faaccd686..03c1b0f2af7be56b73ea9b59005a570a2399dcf6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
index e07891e6618fb188ba649b87eeaf96323acae2e5..12ba27e95842da42c57403e5df4edd3c1ef8d63f 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-#site::additional_classes:
+infra::role: base
+#infra::additional_classes:
 #  - httpd
 #  - vivenio::app_server::tomcat
 #  - vivenio::webserver::apache
index b4ad7bdf71353de0c5a83df64e0ff7d0eb0a9a92..eaba450b736dd955659dfbafd6229cc69bcbbd95 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 #  - pp_mcollective
 
index b4ad7bdf71353de0c5a83df64e0ff7d0eb0a9a92..eaba450b736dd955659dfbafd6229cc69bcbbd95 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 #  - pp_mcollective
 
index 2375c0186fd6e3149039cb75ccb6ca945047e258..211fe3448f415a5d137d71812cd8d1fcb141da5e 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-#site::additional_classes:
+infra::role: base
+#infra::additional_classes:
 #  - httpd
 #  - vivenio
 #  - vivenio::app_server::tomcat
index 197004ac37f31f6ec4b8b9fe42769727d4c13565..e38c15e7a7fa1ecf7f64a16cd24df6fa7cef6e3e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - pp_mcollective
 
index 9045cf6c6f5dfc5472b5a6223bb7c4f01e8ccb58..e50fe9f41b4a2cca77b8bc187a45e7e8a7ed85aa 100644 (file)
@@ -1,19 +1,19 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
   - nodejs
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAi/n6jqwtoFShLiotF/W0A3OV+npkvMwlzLUGrscbWpoDWwKRFjU3SMN/rjcX587GlTfmp0aBskJSX2pFi0Ak7/xyq/RM9aYLZCn7D3cLaRWlC+iUrjCzmJDXRxMkKyOTugg1C5JpxaKa1gE5jOjTr8FTmrke2zOV5kLkPq5kb4R4Y/l0ZrJiHwM5RmcseijbGOz0/MBcI4vBLcwLqnaI+NUKeG4AXCxmEUqRSiSsRetmQRukhdPMZQx7oGDqt/pxbQcJnhmUttUf4Jy4NGAKzLG1Aaw4WadejIZ53Poz127t99PQ3ut5bWvYcrPLEjXIS2IWpTskbjGQprxMlpiABDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA/TakGzZSSJDfc4JNhlOIsgCBVo26fqtT1m7POtBvt/cHFSd+uL74BdEc9lSFhLIbTqA==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnDvHRL/W8nT5Cu1buBPNhDQVPx8ScmO+pjhQgRfJUTElGSZxBhZZ3vKnw24p4748bxlKuM3h263X+jBKOPwcWZgQY2dDPNjOVtNmVIYBAFI/2Ek/BKaWM5xEfqG6fUCSaatY1ZG+yNRoQ1w09wz30+Bn9asFnK9eVi9CXLnI290HJ8V4j0znRaE9ccV+5cg3/Y7tB6ko4/kwhFeyz/jGlg7OHq4BJ5cjeiX4jq2ayHvJQFlAbuhU+WUn2KEvmCv5vjlP9T7YLbq8cnSLzQBdKLXnHHJ4S/QO5XI+lQSqsg58d1ysxCFbEn2xHdVpjd9WmCR6VxyCQ1O1BLYJbv+iKzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDnPIbowd/0fnx2sfi9RHY8gCBb3dnLPcmWSE5Qgf9kAD0+XtKvxaY47gbqigr9j7vp/Q==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   stadtklang:
     user: stadtklang
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqfy60Nj08RsPr7XbjrM/VBC/fdh8OngFVz3ZCwH5cw3oqpQhD/Q1BTjcFgLNZ079ZaYXIBMO+AbEpou7BeCJPc46AGrIKPkHTqtwDE7padMVRK4c34J5V4QvpoBBVkZMjbFKn6tSKwuSjzVDeeBFNPz1WkgnUAjKCQjBkRdyX7Xtk9nLjsSDcOewR2IdFB11XmPYLO32ylpLin9enUyZrJgBTfY7zLyfbXDXPK3+cLYxkZH7XxfIfdn5j0zc03KalZvrfJB/FtDh5Q2OgQ9O5mkBjO0cjPYt8pw8RAxuOOhOIprYOZy66AoPIk0RcS+tlhm8XWDK9jw2lMbDS5ashzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjRSUn4iASCr0ALsOS58e5gCC2pRu6VniaUV30WlSHYxaF0PMdXSSp+00eZOrnQEun+w==]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   stadtklang:
     servername: test-web01-bmbf.pixelpark.net
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqfy60Nj08RsPr7XbjrM/VBC/fdh8OngFVz3ZCwH5cw3oqpQhD/Q1BTjcFgLNZ079ZaYXIBMO+AbEpou7BeCJPc46AGrIKPkHTqtwDE7padMVRK4c34J5V4QvpoBBVkZMjbFKn6tSKwuSjzVDeeBFNPz1WkgnUAjKCQjBkRdyX7Xtk9nLjsSDcOewR2IdFB11XmPYLO32ylpLin9enUyZrJgBTfY7zLyfbXDXPK3+cLYxkZH7XxfIfdn5j0zc03KalZvrfJB/FtDh5Q2OgQ9O5mkBjO0cjPYt8pw8RAxuOOhOIprYOZy66AoPIk0RcS+tlhm8XWDK9jw2lMbDS5ashzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjRSUn4iASCr0ALsOS58e5gCC2pRu6VniaUV30WlSHYxaF0PMdXSSp+00eZOrnQEun+w==]
index ac28aaa2e4575beca873d010ecf190c14d31f02c..5f474584db2ff12e5f25239e5d398919b3e387c1 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
-  - site::profile::flow
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
+  - infra::profile::flow
   - repo::redhat::passenger
 #  - nodejs # Disabled because nodejs6 needs puppet 4
 
@@ -21,13 +21,13 @@ php::extensions:
   xml: {}
   pecl-zip: {}
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZOXf57t1rM+Wqi0zA6II8AjDIxjraQBf0fASY0boe5BVHLaj6BdW5zopRBvzv4UNCVi9I6jh+aK7cUFvD8rCIHe7uRw0kMGQW+wXk0X5aIXNnoIRWOuz505jpbPf+DCn4mbGnQ5aL6W7GUO/z5sXWxFgNH2O+9QL8LxTzoIt48dwhzL0jAflEYGqGyJXGW9EVqI6Mz4bTzVQ7h7UuwncFNBb6jsjNKjBJyzxJuvz16HcMR8XGdeifEALxP1MSu59nty/QokOLbx4IRJadVVYmYkzbgdaoqFPgnBPRy2O1M+CWheOrtnvzCZdtwVYCrnf9FbWx/Sr9N2VfBwy9ekU9jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAdt7LzMd/BQ1g6dnhfFOchgCC+D8JvSoi4j+2TadNliUumBSFQd1tUs0QE3K2IDkA2bQ==]
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKWPsy58a/3s9I2/783TU8E/uKwWLFKLkmH/OJYygqNxoJ+VeLGuwIGskSSKtUSihYAmwaxpITezGAgQMrPuE9pZprFn/VJVBFBV2phrzw8IP7zqwE0gnjmqrbTI89VLIElyELhapwzwXK4ZMBQCtC8G98AASwQLjkxtj2qFE26le7YzhmVOmicPRYY2R6qz2FB8z/376DZE//YmiTUsVPD9GXU6xudEs8KyBc6a+zvVVAb+NsdRVp26FqfcwSJmZMpWiND4b2J1DbN5qJ2PGfGKNZCMgKqUFi4Qdmgof/v9est53ipIdu69Jh7FhIAl+lKj7NQXA7Fw9I9ZBooKMmTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCDBT6KAesdq5HvFvc8say4gCDn4nrfnJv4/ntRHrXfVeGMMnnyth2tk4Vv6LExGeTCmQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAaZ/mgl0oqURi/rWOk9xAqdesKhymHCeReO9TdLjTD+SgHCEkpImQrJ4Fr+Zfenxn5uQM2zQUNp2ewTuH08FYnPqWKRHbDef2Xpw027GWA+3YlVT6mwJPUrhQ2PNKiyNFngKdc+IWLWQNAqhD92kChUecvqQ3UVz1G07ovE3sYkYEuQ7xUQDwjPc5/7CW6QmCdckScoPHPaNUZbLRAx0FgNUwR3nxdCaCX91BmN3iH/I9v5HKreriaK5kNhwSf98DaAKYi79RnP0bXLll29HY1lvK0DZ0o4jZWFobh7clOnU1Z+u7NkhXMeT6bJLFjIwxklD6BqSS650zkIO+sMik6zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBADydVhvabPNZkCviU6RlYBgCB2hnlki/etL+atC81PQQmCLOBMXV+4ytH6oAuSi3FOpw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   wissenschaft:
     user: wissenschaft
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==]
@@ -38,7 +38,7 @@ site::profile::mysql_server::databases:
     user: wissen-flow
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAv/YgY52U5Hg4CqempEu4H7komdKrzdEaTZnaftR0f3gwxi58x9pBnGTS+uBN4gcqJl5Ia9qkOzaM9V3z4ieEgjaMJB9mHzKCQAw/YUgIGESxOI2Qq97LQldIHsD5AKC8pOOX+9VnnPKgvB96y0bOzf4RZ6ww2rkyK7bC6RP0dqTmzJxulzxTs1GJmL7wyTjHtwqrl+lP4yY3A5aGCLjX33jgfiubWLzDmSwFYM9gCGm3NTfM4nAa3rdgmErlplOw3ocAhkA+9NeuJF2BX+u5xqutemL8j7NoArA2fWEhQI0lMeYUMcKxnX12nItOjBxcSeU39cxAhdppdbO9HLwZzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6koFHOnjGrXThgRL+WFLYgCDiagiv5K+JmVR0y71uDxEABDZJoF4PDdMJtU5bSaJ9Mg==]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   wissenschaftsjahr:
     version: '7.6.15' # dummy value
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==]
@@ -100,8 +100,8 @@ site::profile::typo3::projects:
       post_max_size: '50M'
       upload_max_filesize: '50M'
 
-site::profile::flow::manage_php: false # managed by typo3
-site::profile::flow::projects:
+infra::profile::flow::manage_php: false # managed by typo3
+infra::profile::flow::projects:
   wissen-flow:
     version: '3.2.2'
     servername: test-web02-bmbf-flow.pixelpark.net
@@ -114,7 +114,7 @@ site::profile::flow::projects:
     setenv:
       - 'FLOW_CONTEXT Development'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   wall:
     docroot: /var/www/wall/public
     servername: test-web02-bmbf-wall.pixelpark.net
index e2ec0a1bdd754a1c46cc41e9c5efda1805c04e5e..7f7d61b7171eec91a59d6cf8bcca655946db2039 100644 (file)
@@ -1,34 +1,34 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
   - nodejs
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 217.66.55.5
   - 217.66.55.6
   - 217.66.55.7
-site::profile::galera_cluster::galera_master: web01-bmbf.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdBajbgbVRJSdszSDSxrbkO6Rogz/PNC/W75lEEHUlw94SOidFUN86wKqSJB9gytIoM2K4ukGTXJDwQRYhJednWwWBNHqtWk3ClMOTDQw0o3/KdJ7HoyyLEWsCnfUy/Hq2KIwC3t8AiiSfXmOJ8H6DnLiIT6pLUZbfgDoaUYJOMQTeoEmxhhUHREpjweNCu/8WG8R6xgKrt0W7ILVKD0e5+Kg80mVYcvDPoxTchG4PzM3KNUeD3SyfqMmaTkOD1woMCnUaq3sskWOl/G6ZaQHBTLW9beo9u6Gs0oQQ+rzSY7UWZotLLPlF/2yHxFDBEtOkhxIZhIyVukCHGD/V9kWvDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBSc6nwN2fshF+xNb+waMNvgCAaluCBBJrCp1yDz5CzERik0IDw0zUl+KMwBpdJns7Uxg==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoJFFGYM7mQEcrk3VHbmOtSiVBnDHhrHjGCdYvz6w7Bc7Lif00tfinkYY08egzXSc2Q7Efx4QTzdKAHmvtZVJpfq6HmCL2F3SeiY09oVLkYUdTSkS2AL5JIBv6uYXSFI893rBFf5bQBe98D0bk6x2rbOrxvQzFYVcmu5eRSRO074Sppf16rJ8mngLVE4PxK/o/LjieG5uHaMHzQWzj2y/h71G7tYcaffc21ktWSaqNdY/ey3uoBIBJmuy5SmdH50AK7rNfhOBlt8xQ2iW/VW7Ii4i1wTpWHROhNJM3k/il1u910FmJFU8mtuh2JIhzV2flVcZXqJjaNXukFaGmIYxRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB2ko+qz6DVAeYFWV1WqeM9gCDButFuiWZ7UFuRG8ZyaWWV6JuNORktCLbCvaecxyK5Xg==]
+infra::profile::galera_cluster::galera_master: web01-bmbf.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdBajbgbVRJSdszSDSxrbkO6Rogz/PNC/W75lEEHUlw94SOidFUN86wKqSJB9gytIoM2K4ukGTXJDwQRYhJednWwWBNHqtWk3ClMOTDQw0o3/KdJ7HoyyLEWsCnfUy/Hq2KIwC3t8AiiSfXmOJ8H6DnLiIT6pLUZbfgDoaUYJOMQTeoEmxhhUHREpjweNCu/8WG8R6xgKrt0W7ILVKD0e5+Kg80mVYcvDPoxTchG4PzM3KNUeD3SyfqMmaTkOD1woMCnUaq3sskWOl/G6ZaQHBTLW9beo9u6Gs0oQQ+rzSY7UWZotLLPlF/2yHxFDBEtOkhxIZhIyVukCHGD/V9kWvDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBSc6nwN2fshF+xNb+waMNvgCAaluCBBJrCp1yDz5CzERik0IDw0zUl+KMwBpdJns7Uxg==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoJFFGYM7mQEcrk3VHbmOtSiVBnDHhrHjGCdYvz6w7Bc7Lif00tfinkYY08egzXSc2Q7Efx4QTzdKAHmvtZVJpfq6HmCL2F3SeiY09oVLkYUdTSkS2AL5JIBv6uYXSFI893rBFf5bQBe98D0bk6x2rbOrxvQzFYVcmu5eRSRO074Sppf16rJ8mngLVE4PxK/o/LjieG5uHaMHzQWzj2y/h71G7tYcaffc21ktWSaqNdY/ey3uoBIBJmuy5SmdH50AK7rNfhOBlt8xQ2iW/VW7Ii4i1wTpWHROhNJM3k/il1u910FmJFU8mtuh2JIhzV2flVcZXqJjaNXukFaGmIYxRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB2ko+qz6DVAeYFWV1WqeM9gCDButFuiWZ7UFuRG8ZyaWWV6JuNORktCLbCvaecxyK5Xg==]
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdBajbgbVRJSdszSDSxrbkO6Rogz/PNC/W75lEEHUlw94SOidFUN86wKqSJB9gytIoM2K4ukGTXJDwQRYhJednWwWBNHqtWk3ClMOTDQw0o3/KdJ7HoyyLEWsCnfUy/Hq2KIwC3t8AiiSfXmOJ8H6DnLiIT6pLUZbfgDoaUYJOMQTeoEmxhhUHREpjweNCu/8WG8R6xgKrt0W7ILVKD0e5+Kg80mVYcvDPoxTchG4PzM3KNUeD3SyfqMmaTkOD1woMCnUaq3sskWOl/G6ZaQHBTLW9beo9u6Gs0oQQ+rzSY7UWZotLLPlF/2yHxFDBEtOkhxIZhIyVukCHGD/V9kWvDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBSc6nwN2fshF+xNb+waMNvgCAaluCBBJrCp1yDz5CzERik0IDw0zUl+KMwBpdJns7Uxg==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAb4xZgM3yz7lQbZX3L9QYKsq+gM5Mbqr5weK0Qy2wG4Z75+1SRxF5W0Z0i3zmt0+nh4Pk96LwO+g8odiShoRKVrx+EpuUv5RWPn6oelAong0NwpQq4mcX/bFqASNTV7GW3KLlubgFeJh7ZqJdoIbnxxNiXoOO+on6ukrfPIrlzVsRcWYki02hqHg9/FCfTLP/mfgwM+uoy5EO8UNMT0q1bigt4Q0NJjsQw0V6btOGfjnGlcAs+xfZ2NFxYY1HPZs8o3G3yuCnxW1S1umWCvZdzQ3EJ7YRNM0yB5I0CRKfDGVPyzc3YzaR7DR+43jouVRMUQ5MRJsdpMh/vWhBD1n1lTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCnb94oLBAYqD2VkMxK1rolgCCJpyYd/rpU49bib4AzEBSsIQRqhSkp7y/gVVql0msjiQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   stadtklang:
     user: stadtklang
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASKiPD6fAj/kftFPD5z/yg2NH+j0yq/dPx5JZ3ZP0XLU81RMCfh3wzk38Tnor3FLyYV9O8FeRsHBq8Z7tBazpncfPAZc2uM9e7w2I5TF4RbjmTrpCBx8MVT+FV/rHZeNiLDVxm7RwO6yAgta68XxKFsRnugCNcWzcMWEszPvwSGHois8EqfOKrCDr90RUJCsOcZ4jIceiGWOaCqx9Y8HpD0pnaQFDpjbtMEUzoqeAwNinlWoiTZnOTQMgksaEqR4wwBZFlrvf7IGzfXWVma0s+WWCrFN7hQ+gTPJ+oQ9o2jdpI+f3c+hfINvOUxbJ7E8lkjFmlJQ8yxKbxxT6TIu7XjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDqARGIww8lS1LTIN5OeJCRgCAQqHaLF5wHCYJEDq4CbLbxsStMo14+S9LSEAq2ikEV5A==]
 
 apache::default_vhost: false
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlueJBABHUQ1vFyTLoXRXMDQGtkR34+hMZVR+rct9gTye+20o7tKRI8b2c11FYRf6Zk5VHmfJUMgUKja9CnItVa9SzDhmMwCHw+Z7c3jVfWdR1sHl3MJ7yP+1FwKztMOCJzLBZ8nxp/YJgmtgHNnbGxG3Eu/lyxreiCDB96V0IQuqQuHutBcX/r8AFapZQb2MoJWqOPe2h4kfnxJGLdDaLF/E7uAV3K2y3wrj4+RczDKnGIwbjCi0DrdJx11NdkJEK526bQIMFHZbKj4QlAJn4/zx8qMgdkJvx2VHLJMe8gXyJzP3/tQtF143RvxHgxYScBz5mfPtsjFn3q8wQXjSxDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCGKZkyaN5l3UuTLHKJv3IgCB6twTZNGBijlT/8dHjfRHFH0CgaWiY5C4P2Q1MF8TZxw==]
   server-wissen:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhcP3CILm0OOP3nvQVmus59zwM6ITHaV0ySg2RYqlyiC2GAbpfBEBuXvt3B5YXfCyF1Zjr1pWmduBgD/OqE9izgC63dOmcHnAvEr//6TPwKw8hKdfzaPwMplC5Dcs7Soe3oQ7BRst3b5eiXvDjHU+9MtfMZm9vdxJUSUzFJKFlRo9Mq36AXAWLI2g2oDXt+jCqnApP1tBPlGjzAXuNYdmRSUm6/4oIWeguciPbkcIBWQV0jE69oKn7ivGddPWLcop9PtKrlUGbg0I1tLwzNXjKxYmlPOaqPrp+BDfqWrOEGBq/u/vfvWPnJlJMUgBpznRJvL1ZB5hguDs0oaW1HBTBjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6KO06K0h54rEYQlDtCDANgCDEZXb1Xel7tRSUuBeCifHq70HGDJL4xImUHWQ2TLgggw==]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   #wissenschaftsjahr:
   #  version: '6.2.25'
   #  site_path: '/srv/www/stadtklang'
index 1bd59487e905f1ae56d2067269fc9714027d091b..fa10f972abd6cbab4f017b5cd7683c156f126622 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
-  - site::profile::flow
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
+  - infra::profile::flow
 
 repo::remi_php70: true
 
@@ -27,7 +27,7 @@ mysql::server::override_options:
     default-storage-engine: INNODB
     innodb_file_per_table: ON
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlueJBABHUQ1vFyTLoXRXMDQGtkR34+hMZVR+rct9gTye+20o7tKRI8b2c11FYRf6Zk5VHmfJUMgUKja9CnItVa9SzDhmMwCHw+Z7c3jVfWdR1sHl3MJ7yP+1FwKztMOCJzLBZ8nxp/YJgmtgHNnbGxG3Eu/lyxreiCDB96V0IQuqQuHutBcX/r8AFapZQb2MoJWqOPe2h4kfnxJGLdDaLF/E7uAV3K2y3wrj4+RczDKnGIwbjCi0DrdJx11NdkJEK526bQIMFHZbKj4QlAJn4/zx8qMgdkJvx2VHLJMe8gXyJzP3/tQtF143RvxHgxYScBz5mfPtsjFn3q8wQXjSxDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCGKZkyaN5l3UuTLHKJv3IgCB6twTZNGBijlT/8dHjfRHFH0CgaWiY5C4P2Q1MF8TZxw==]
   server-wissen:
@@ -35,7 +35,7 @@ site::profile::apache::htdigest:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM0y7CwnPczyZri4QpOmjpucVAf5KWspX732ecLh2j4kt3EV4rXaYaJ6k9i8OdM0J3NohaSEdBISWesgflfQXyRCLL5nJI1I4qmYjNesSZmmr9IO9tI4VkQacNEBszjXdeVZOjOyusDD1HBkHVkDykm3ceEJuyaoKNxttI9j58jM/b2FZLppX68PUxzAmzGbaIPTwT0cuz0J0hGnSj/a0UwpYRbH3nO7k6kmqMSkkMb8mCrP1CZZ7StLlY6qEx6GJhaO9Bp0/WcuAtpj6Vn8Lv09wCnJeYZ00tLcxtb/ck8TzXmBT8jTkxLxfBLPv1grY82DYgbSJZHJbTongW9/98jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDeW5xHY0ps6UwnEcnYfIB+gCD82JcH/HAmy+hgK+LBr67M+h0F8CdLPTtB0co8rtbj7Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqGMksf1qKjAqvls/N62iVZN949VAsb9hjtcY75kC+i5Mi1pyOp7oWZ3SlYbgfY5CO1SGkSzjKlslCps+UtlDM50KMz5x6+5hi5fw7CBuSvwR0Mh6MDbhIsx7yOhYs40zwyBByeyCPtk+owCP1BkI78thmDyjdG+qyZlttt+odXIMJEZ2o6xWq09qFH3/uvLoVjgjjH1L+6kHBNTXUZnT0MR6PZBcihwJdrVmMjLygaQda30V7NVkunqoVT5UBXPgdcO3LW8lxTt2fM2jub9UDleHScu8/HBzYiSIKp+cpw64TlqCFMmFkcukmkaMEkiKbAlWG3Hl3Z4esu1aXU1d4TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAUUB9yS/FqR7lz+h85itpCgCDijHBVKKT9SgP0r+GS22AgROEM2nrdv4QWUfbiKLcSRw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   wissenschaft:
     user: wissenschaft
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmL6L4Gjwh2CJn7VR3nggYsGrUWGfCc5wyqDENDoN0hpZY3/Z5KYXwqxmgYzYrJQDcz4y7MtqsVaJa43RQNxFvMHm/u0MBq5Lj3gFXiCwERl4iGS2cjC9p64kCB9DygN4SshQb1LssGO08vKi9o3PLPIbu3x2L/f3ntBlh3C7Z1sGnXJTRt1vDPmnennadDpPXPBr1YXO+PjDHPM2aYmK1ObNUSJuj+aSVoO+39/MbKItu1PWGxun8t4LYOJeVX9UO0dRaKe+Jb5Y2n1Pi9ehM4CFh2GGntRhpxKLzSRpVB+7pbw0t4+L9opWlYWYuGegEV30QXgHIjwqGjL4LPL/kjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGcbqulPE0TFeB6SkB8sOegCCz5uvjwlpS1tq7H1lDffHfCR2OAw8M0xmWWHwJQpSJ6w==]
@@ -46,7 +46,7 @@ site::profile::mysql_server::databases:
     user: wissen-flow
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAYnPivC9JfsjPIgkHRj83GrMU3qfcvlYti6XSyR8GeMRBn1I6OTeJ4SkE5PptgjYJLgo3D1iThf5nDyn9QMR0nDiJhHQR+lL1nk4+5zoH4FcE9fFWFxf6ehyAANJ1N/Fc13VujJh5juHWdvVvMpXGT3y7neU8gulURQA21jcFSP56CwHWuqdViTC/lcvATLKJHUftUtj44C00tn1C+HhMYxB1caduGPyq/qN8pd26mks0pfuGIutcJbn3+KK+Pfs7xtl2V+ueA+VWCvUJUO59IDYvFCNQV3Z9uWwXV0tDk6pm5uC6RKIR0L42/Ir8bmoSsV6SquwmYbJrUbR23DMXDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAdmauxdiiH7MFB84aoLVYwgCAPQpOO5UEMbCT5KSGFAeIIeYwZ9S8bMszMKV0EqN/XOg==]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   wissenschaftsjahr:
     version: '7.6.15' # dummy value
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmL6L4Gjwh2CJn7VR3nggYsGrUWGfCc5wyqDENDoN0hpZY3/Z5KYXwqxmgYzYrJQDcz4y7MtqsVaJa43RQNxFvMHm/u0MBq5Lj3gFXiCwERl4iGS2cjC9p64kCB9DygN4SshQb1LssGO08vKi9o3PLPIbu3x2L/f3ntBlh3C7Z1sGnXJTRt1vDPmnennadDpPXPBr1YXO+PjDHPM2aYmK1ObNUSJuj+aSVoO+39/MbKItu1PWGxun8t4LYOJeVX9UO0dRaKe+Jb5Y2n1Pi9ehM4CFh2GGntRhpxKLzSRpVB+7pbw0t4+L9opWlYWYuGegEV30QXgHIjwqGjL4LPL/kjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGcbqulPE0TFeB6SkB8sOegCCz5uvjwlpS1tq7H1lDffHfCR2OAw8M0xmWWHwJQpSJ6w==]  # dummy value
@@ -159,8 +159,8 @@ site::profile::typo3::projects:
       post_max_size: '50M'
       upload_max_filesize: '50M'
 
-site::profile::flow::manage_php: false # managed by typo3
-site::profile::flow::projects:
+infra::profile::flow::manage_php: false # managed by typo3
+infra::profile::flow::projects:
   wissen-flow:
     version: '3.2.2'
     servername: www-wissenschaftsjahr-flow.pixelpark.net
@@ -173,7 +173,7 @@ site::profile::flow::projects:
     setenv:
       - 'FLOW_CONTEXT Development'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   abc-der-menschheit:
     docroot: /var/www/wissenschaftsjahr/2007
     servername: abc-der-menschheit-de.pixelpark.net
index da710120b9723823f60c73761fd3414d1ba84d54..7f5d74eb4d4d21b7016d8ad82212af7c1a63b079 100644 (file)
@@ -30,11 +30,11 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
     
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
-# - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
+# - infra::profile::wordpress
   - apache::mod::headers
   - logstash
 
index a2c858b172a546591749e31579388de9ddec68ab..57f09f593757e6e3908b55ac6d9b49d5e44fc3b8 100644 (file)
@@ -2,7 +2,7 @@
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlqDjWFeAE2fK20zFd4HSrodrA+qdhy65aijBSyvBYeFNLAjXlH+1X/WaZN93Dj/oMtyE8lre7Oh/LAuCrkMFcfPyWq5LrehSkdTbTEKnyHcqR8iGa1Z0oIzqqLqjfdLrgr4lauoFPWlX2eJCskBhUORREH9uKHsjRRFC44V40s7D2c/+H8aJ956NZpQbDL9qyVfMyI7Xx7kP7MPVqlHAzF8l2FYePEOKBWyLDas56OSsxJsFgUnwR3tHFwBqwj0RXAGPWmPtjdf9YWnHAE2nTdt9yjtBjF3E6GUvaXt0lwryt71reZpsMkRVnrnOtRKzqCyY6XWRMIUZztL16wmlhjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBeu41/cnhuXv30JTEjB27xgCDxBJ+C3Gnne7LrEysWxg6ZrEROcni9PYZrnR/9p8ALCQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASQmvSrhtOF0VCMiPEhzL+ohB0FalIuN1DrxFu6cpYbxf/MFK7ayf2tumFWs7lX87vROKPGhH5dbmCTq+3nqzCCpRjaa4fomZ9ukDd7omtjp47FUoWcsDfUyx4LVpEJXEz2/MCG6NiiqCTlk1JGwIlXbWIJRriIrpmAgGnX6Ogbf0pYixVTdlNBCpyR3Em2W5gjb0u9D1kOq0oHc0MydpKHv1kPv3lz6PL5QjkfgChRqvP5bNO+Cbv4dwD2xm7pWnKovTFwtUD5mEzIXuYxpGTN1/O7KqCnUsdBMq1GEvNfgrKq5+of2MUlBOmcagUKF8bOms+x6cfjSQZJ9i3tj5kTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCbkLAZAGum47dL99ZgqPlYgCC9tm8zgvC3pB/sqLWz5+sCS9YdKXDmzmyOjQiqF6ZRfQ==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   bundeshaushalt:
     user: datacenter
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcyGFoflbp3zWOAWF2aVR6cD4YDHI01HPZW1HslWzr9ZLN6bPqVG/AYCyBtSjAtMvrWijU+x9xVpgK8cBuFbVl3PrtmVx9/Xv8VsvZ1nJNJVWpoJi9ZdyxenAg3QALfpcLACz3tplX5XX5IvUU+MtSXp4hlGNWchUHSVE/Bc2Q5tQPEgIevdjQY4XhORmB7WtW9E1qPRhlWeLnvgQjn9NFksuUchoMzA9BOi+KwV+DEzw89H+Y3OTt7/WSiPRKRspWUe/Bl6NDE8TM+1aE0Thrum5SUQC5ixAXoNvOnbZ8r+IzmkFpNNAKG03UcqOJeI+ML8DNZpLF87Fz3tAV9BfoDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6F+43rLzWLDUhmOjZr2pBgCBW6pNoTKbjmMa3ILcrD7VmGyYd/x11F2gsfC+5h3urFA==]
@@ -40,7 +40,7 @@ php::cli::settings:
   PHP/memory_limit: 512M
   PHP/max_execution_time: '0'
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   bundeshaushalt:
     version: '7.6.15'
     site_path: '/var/www/html/web.bundeshaushalt-info.de'
@@ -115,8 +115,8 @@ site::profile::typo3::projects:
       memory_limit: 256M
       always_populate_raw_post_data: -1
 
-#site::profile::wordpress::manage_php: false
-#site::profile::wordpress::projects:
+#infra::profile::wordpress::manage_php: false
+#infra::profile::wordpress::projects:
 #  so-klingt-europa-de:
 #    docroot: '/var/www/so-klingt-europa-de'
 #    servername: www-so-klingt-europa-de.pixelpark.net
index 555fc2667bd62e43056842d833fd727fc7f427e0..061748e72c624aa9e62528cbdeb2e4d1f012cea0 100644 (file)
@@ -13,15 +13,15 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::wordpress
   - solr
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhANiKciHcmZldGrwiQg9WZthD0SbElB4IFXB4c97hPV2pQCYi6AyuI5Y/FqEuc9IbO0q7ULbSaebxV1wi+fuhEivpa76yEXeWb6FsM3oArNGQ0wfK4B9Nb1RInpY3NGU2Xe2Qj9ge725kmaB0lqK6QPKD7FJFmn7QkhH7Y2AAEN+G677fuu6MpD0PizdfC7BftmbJT/XWs6rbh6tvYHaZiIuuJJPRsms8nBxUVm0J2XxT7K5o3mXyqA+TNNOqoljLTXRmqFup4/gdkJBFepmtEDFcfh+Y6K7YpoVBxBVyw+Fvgm27PoQEmeYWIe4OX6rGr6Ex/jNFcFgQ/Z+hB+svzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB+sQ1miUyAv6JfaUhMU78ugCCqjlkfy5JP66NJXlIV6OIA3oydvUY1FCtHBlKesFJ2FA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJ66BCicoWj4g+rcZnaC8G0hb3gMxkZdDHTP5K9gB7AZSOl5ftgRsgJilmNKXnHy5YfJvODZsF3e0bDBgPi3qVPSOP4eYB9nLrJJHb33NE3aawU61Tx4C3kMt93wi/QdMKgiHSAXKRWIfOffw1n9we1MfCLJIHxvw0g7zDyPxiBYMcMJ5TCmz1rYXIncY4fKkCs0vx92H1lNe9RtVGF9k39UvRV4wMCT21pfub4sLTjdv8m7U3avRu91xAYejh8QeW7PLWf9MI4R/a8PM67etBnikcVOdB0vl20BFHn+9J4NK1vQRHko1AQM5ujl9id60uCUBtCGb1M1bYK6dT+GKnjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDIVi0P6/QCn6ME7OneXlwRgCCAvraBQ+vOAgwCFizNxtYwVgYuh2o5RFx94nsMgOAsnA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   bundeshaushalt:
     user: datacenter
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAb4FplfMWjRnL0/Y1K/XX+J+4zDf1d7gRI5oIWtKvBTInxoIHkUTWwyfCsxHWifzboIOUKcp6Th7kf3jl3PAJf5vmE17t9AK+7G3emWTa4RrGy0BpSoIxZ2FYiJ6I28ynfkZSOOicmm4LYpXTukERQJw7rXVbGc/+DjFCdK+XW1vQd8K2kt2bOs8TywkWHtHO6C6M1N/bNMh25CnngCY4chfVPS5jTc4yLB5LqTmJSlMHBchdKYP7yoqcD2g4xVmsLfQ6Gx4QEM5FfJeqMKBz96nG+YCYE2Oas6pH7PtpXb1+6Kb+JUtq41Z9dMFajwsFJzf0Zb33K9FUaCB4N7/Y/jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDefIzeBFLOk8kv5t15XhpXgCCNVOxAqU1MdXh8oz0PS/UtETDLN5xr4AcT22OoOUWRsw==]
@@ -51,7 +51,7 @@ php::cli::settings:
   PHP/memory_limit: 512M
   PHP/max_execution_time: '0'
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlOfIb3+MxTE6wSPhm2f0ERGS8kJGj1g1ZcKqWLyve8sbkCAN4qWi/0o775KMOPH34cyNy3Xyjn0gvymYTnGNqlQYxAL3GAUHSVW0C1cXZP1Qjnm2HmEs/rGJHzPSEZx09YJ/X17psSoV7ERPXCQ9MnylqPpqpyFXwFjsoBxQ5fxwOeKWZLEJ2HKyEAVRf50ZBH5zbNgbgytxchmHrKxlEeJBLXNqhCAqUE0/LDjaNtIWD5AC6LIvFvgaOJMUI8MupTxRfX15v5wlc9JNSohR3HGjlnZmjzksHpQjChzYk7wH5FpXCgYwtBa/fm5m4U9I1QHq93Vcv2uPNxru0us06DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD9Un8248N3IyXJ7n79UzG4gCBJchR0LZJx2TMSq7xHdAH2rsOB/zXDWfNXFtTrOm/2WA==]
   server2:
@@ -75,7 +75,7 @@ solr::cores:
       - /var/solr-typo3/typo3cores/german/conf/german-common-nouns.txt
       - /var/solr-typo3/typo3cores/german/conf/_schema_analysis_stopwords_german.json
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   bundeshaushalt:
     version: '7.6.15'
     site_path: '/var/www/html/web.bundeshaushalt-info.de'
@@ -123,8 +123,8 @@ site::profile::typo3::projects:
       memory_limit: 256M
       always_populate_raw_post_data: -1
 
-site::profile::wordpress::manage_php: false
-site::profile::wordpress::projects:
+infra::profile::wordpress::manage_php: false
+infra::profile::wordpress::projects:
   so-klingt-europa-de:
     docroot: '/var/www/so-klingt-europa-de'
     servername: test-www-so-klingt-europa-de.pixelpark.net
@@ -144,8 +144,8 @@ site::profile::wordpress::projects:
         require:
           - local
 
-site::profile::drupal::manage_php: false
-site::profile::drupal::projects:
+infra::profile::drupal::manage_php: false
+infra::profile::drupal::projects:
   rfm-geschichte:
     site_path: '/var/www/rfm-geschichte/web'
     servername: test-www-reichsfinanzministerium-geschichte-de.pixelpark.net
index cb140ed72df04d66d9c2b9ee20c5e2649624c456..4efe5431ae43043616706dae987ebc0ff9e9c916 100644 (file)
@@ -10,11 +10,11 @@ accounts::users:
     apply: true
     group: apache
 
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
-  - site::profile::drupal
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
+  - infra::profile::drupal
 
 repo::remi_php70: true
 apache::default_vhost: false
index 147cded4994069648cbbe6ce84beba1f002ce064..14c07f62362423b5df7085487b896989f72a3f15 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGzTtJCQPMvAa/6V8tRvmJj+YGrFpRQ+2y+hglY5YH5cV6F7sYMvuXk3rKmxWzqPSIxZi9HK7GsbtRuR0VdlMeHXBhu91jWvZA7dL0q8hstt2p6WRIQsEjUi+ZCQAvR/J5WtZ2iLNey9z0iW4uD0l7pjLuK2p7656PJMC+bBwhTZzX80j8Syg+9YWMKoVL3iqv7PiQks+TTsWUX/y5LUzB/yzFHf8jXHGPj+Gwo6FqX1qGaxol9dyoMs76pjp1Kl1sUBvop0N9dgMgxCZSxmUFLd7sHDdy9KUeaat2D3ZarwrPGx0CG+g8mD0XAqIIQp5MLqZw3BIBISpBnPyBmVjhTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC18mDNZAMLv78JfrfGt+wzgCAbVsXsjxEu8hsRmHhCPR7Vwcu1rOXEUzsIpv4YDUH1eA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjTv+kUA+mwC7/87qNECSXGRUqOnH5DdQAbNscnENkZo5gZ+zzlQ6gTkJSBPIWAfrUwdOvjs4n7fBpbZEjkPs5ah8sUNj8e5Gty+OL0wd9Cl4CXkOCyxPGbtbcm92W++rPm8Hbh4px1h1dqfTeeGjkUnyslW48HqFNMWtCSy3j3o3dFMiGVt7RCarpflzCgJUpVjuDesbW3YPRTZ2IED1ySGMxk3fjUPdngJSxIxCcknmRFJB6ehEgq9o8wSXkNTxRAb5QkJXT0wiasykNm3y6WGK0sLSO1inbcyLFWU1adXSQoLoA0DZlXLVjZiNiM8teuDJ61cRzjgxDHFktfP04TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCXf7oO22l5O/mszX1qpXumgCDPBiuX/TiNH8o9dEze0v+ijoL2Ab0mzas8cLpkEW2TEg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   europa:
     user: europa
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVfQ2IcmdEFuZYwogIJ6uQCdPTQ2oUF891kAVgtVVcuZbVQmZzwmJNv5e6xGjdc7NobnnAdFK4S3YL3QL6bb6dg94daxT3Hx0fNdMxIPGpeWze9oZMhbPq3DJltGwPfJqcYpndyvwkv5VUEzdg/xEMYwIF8iUUiavkkuxoV1CntZQ8TMzMfamXo96knbKSp1cwqcRcDnbDMnaDm0pifnG+37P2kvIw2RfaeqJcVAVheCMyWpW72T+SsmffNGrcaUEyTqob44g/8nJK72qSg4xg6Zvhi/Jty9dzQtWDlyQ66iA681nowycwm8W/NzsrT4vAfu58VTspc6l27PejgC1ATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBy7qS9WM9MfcuuQuGwLkyZgCC6qqFYEOk/qjWzAXIow2ngHsdbMHJMfmxULdKsk0Ehcw==]
@@ -15,7 +15,7 @@ php::fpm::pools:
   bundeshaushalt:
     ensure: absent
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   so-klingt-europa-de:
     docroot: '/var/www/so-klingt-europa-de'
     servername: web-so-klingt-europa-de.pixelpark.net
@@ -55,12 +55,12 @@ site::profile::wordpress::projects:
     php_admin_value:
       memory_limit: 256M
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkV4eECCMiI2gs8NAoJQva2LmZR6Iqd7++Krp/XQXuNkJwkWlkejsD3vDb3K8euF2AxxLke8VkM+U6jxGi6apOm+5b/YFbnfBd2ALqrAyh1cYSjsdRMHN9fMomuYCcdnbQtRqfC5LVAC2Xv3Glc0QP5Bz6Usoj/idCS9pEeJpNGFwUV/MPODWNEWHua3SQCiNj1IDxZO5zD8th107XTf3By6SG3fdehRN4kNEbwDoVWNx7ZnqU+NMdfIGv762PhP5ZWGoi0erAumZpxwMRyqKXrxNh6+bHppuTHFTHG4BcatMVa0dKLI/xhsKS+wsFIMkswWbS/1wTEI6RJFfOPm0jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqCz5bmEpQOqjV0gHKNI+xgBBD7VuAtblUE68Bv2iod3oq]
 
-site::profile::drupal::manage_php: false
-site::profile::drupal::projects:
+infra::profile::drupal::manage_php: false
+infra::profile::drupal::projects:
   rfm-geschichte:
     site_path: '/var/www/rfm-geschichte/web'
     servername: www-reichsfinanzministerium-geschichte-de.pixelpark.net
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index ca882cd3655a77a0bb6114c1e3a9fd71cfd7f22e..30907db9910869ef8cdd0882745c8368438bdb19 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::galera_cluster
-#  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::galera_cluster
+#  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
@@ -11,17 +11,17 @@ mysql::server::override_options:
 
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 192.168.64.3
   - 192.168.64.4
   - 192.168.64.5
 
-site::profile::galera_cluster::galera_master: db01-bmf-de.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKrv9Zm8W5YNTPdHWfu+z3bX+tpiKogLzMaGn7P0BoIf973KhgyUhdTh9N8IWJoyn2eJ0Pnh/7uGItiIIvPDr5tkr4UUV43r7b2F8c9SspOnHg17cqyRstuHzj3kxtdvlLog9ghZlrxjBkVV6hs1U4XxzgRIrALUPGVhlgtd/VGIJ/AASW9tzoZD5sBo4SIP9z5+C6YpcWRbJdRKzS1gaXLmajEam0aLorsfVw1XNOAvaGtwqBi54Rw4HCjQEDdVZkfK/T7JelU/O2fNFCxFw8rQuOe7KQVKTp0O+vgu29sFuWAQmowhpsRVsiObu//MAxm7CzaApbKsbailpRJuLFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDndutZFdsf2YhAL8QQYpqpgCClWFmYLmbiN7lvGneR7QCiIGA9HFfwtsQS7Vy9NtepVg==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASt90vhE//4CNKBhlR6TQk835uo17v5sq5T4iKInBMNW/VpHtCbzXauaPti0Vl1XpviSu+3PRL07gpF8UrSP3T5KOOm5XrYWSs/riYCUYh6fMTOn60SzHR1PwBpZfQclvLemMepzWD97ZWa7fIa8St23b9GLQH2EnIOezKlUzhYXQqcXqP2mWrzHC6BFPf8XN1+2BEwiDd2PMQhPjVWSrXbMTmnxcXyuZtzg7ZqHqsQd09Y0nzqL8zgBGqVTGSHI/npg6SupSL8Ht98zbYiNuLY43PaOaahOgu6G7VibQDN7mgpGHR/y5kcKhxfXI250pMu0rUt2hsGO6UYnwtxQEPTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVEh46tLbAz9WKh9VnTeJEgCAl4WNvgovaQQPD/pB9YoqUyW0YSJFjAoDqVZ7vEzYRJA==]
+infra::profile::galera_cluster::galera_master: db01-bmf-de.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKrv9Zm8W5YNTPdHWfu+z3bX+tpiKogLzMaGn7P0BoIf973KhgyUhdTh9N8IWJoyn2eJ0Pnh/7uGItiIIvPDr5tkr4UUV43r7b2F8c9SspOnHg17cqyRstuHzj3kxtdvlLog9ghZlrxjBkVV6hs1U4XxzgRIrALUPGVhlgtd/VGIJ/AASW9tzoZD5sBo4SIP9z5+C6YpcWRbJdRKzS1gaXLmajEam0aLorsfVw1XNOAvaGtwqBi54Rw4HCjQEDdVZkfK/T7JelU/O2fNFCxFw8rQuOe7KQVKTp0O+vgu29sFuWAQmowhpsRVsiObu//MAxm7CzaApbKsbailpRJuLFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDndutZFdsf2YhAL8QQYpqpgCClWFmYLmbiN7lvGneR7QCiIGA9HFfwtsQS7Vy9NtepVg==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASt90vhE//4CNKBhlR6TQk835uo17v5sq5T4iKInBMNW/VpHtCbzXauaPti0Vl1XpviSu+3PRL07gpF8UrSP3T5KOOm5XrYWSs/riYCUYh6fMTOn60SzHR1PwBpZfQclvLemMepzWD97ZWa7fIa8St23b9GLQH2EnIOezKlUzhYXQqcXqP2mWrzHC6BFPf8XN1+2BEwiDd2PMQhPjVWSrXbMTmnxcXyuZtzg7ZqHqsQd09Y0nzqL8zgBGqVTGSHI/npg6SupSL8Ht98zbYiNuLY43PaOaahOgu6G7VibQDN7mgpGHR/y5kcKhxfXI250pMu0rUt2hsGO6UYnwtxQEPTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVEh46tLbAz9WKh9VnTeJEgCAl4WNvgovaQQPD/pB9YoqUyW0YSJFjAoDqVZ7vEzYRJA==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbJkoJUjDl0k5STXQWdpwevarYtBX4/mFj8y9Nh/6j2AOXv263t9eqCcxJSFbpbs/w6ZnI+szzdbBRuA0bvqdJDyx8Xb82wa0ljUTCSNX6sCSC3CXcp79CNTs9l0QTGmDW9g9/CSvJYI/V8DMTlkKIcVCRJq+/0RuACkqHNx7/M7NPfrSWwQCgKr07YBIVeXKr8fCOqinYOuCWioKGQkVvesDeUkkuPTYifXEFAAYOUFbGyfpWKQCWZ0guS/Oq+XXfMWqjHXJ1gw+Qs5aI6P2aSiCCQUUdzU0SLjpLVGXZa9RzaBcxqmKDa5rzO6PviEtNWULo6P6rdqcxykcpRNRrTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAMFYGdUVkkFsDwBgmzoEVXgCB51lNjYGHwLHZeMJBs4RiRoAfxMY3OMfe5xjThVYALuw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMMASTER:
     user: CMMASTER
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhNQJm/PJk1xoO98EFrBjMpAPAGEuGTG60Xojc6PQEgheEs8UiQNI84LoY/lMFwfuX0yXqyUOOzZMmPpGHHv04MJIwYgmT6ePXgYUuzUJynatTYW5wxttml/LmfCdLX8c80o3QA2ff1V64DTz9QWikvi/re4/WmlXXbYeFA9s3M/cE8ym0uWGdXOlZ0TL6Gj/XASeGuZRe+35Fxz+u/NMS8UORybPmBT1lNLM23RGmfnR4tJ7SUSco2BsAXwBN6S3GLu+VLlgJ+lhNOP7WtBWD7I7hKTdNJGUQ9/0775TIRoMycIJUJ+zYG527Jl3Z8Cxb0gBrmlMwD+u+zapSKMXzjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB4nBTPxyxtnxzyvty0yvqugCDrlcfjSi7//ConJ6YD7m04oOExfEEdS2P/wwJE8pEqSg==]
index ca882cd3655a77a0bb6114c1e3a9fd71cfd7f22e..30907db9910869ef8cdd0882745c8368438bdb19 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::galera_cluster
-#  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::galera_cluster
+#  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
@@ -11,17 +11,17 @@ mysql::server::override_options:
 
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 192.168.64.3
   - 192.168.64.4
   - 192.168.64.5
 
-site::profile::galera_cluster::galera_master: db01-bmf-de.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKrv9Zm8W5YNTPdHWfu+z3bX+tpiKogLzMaGn7P0BoIf973KhgyUhdTh9N8IWJoyn2eJ0Pnh/7uGItiIIvPDr5tkr4UUV43r7b2F8c9SspOnHg17cqyRstuHzj3kxtdvlLog9ghZlrxjBkVV6hs1U4XxzgRIrALUPGVhlgtd/VGIJ/AASW9tzoZD5sBo4SIP9z5+C6YpcWRbJdRKzS1gaXLmajEam0aLorsfVw1XNOAvaGtwqBi54Rw4HCjQEDdVZkfK/T7JelU/O2fNFCxFw8rQuOe7KQVKTp0O+vgu29sFuWAQmowhpsRVsiObu//MAxm7CzaApbKsbailpRJuLFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDndutZFdsf2YhAL8QQYpqpgCClWFmYLmbiN7lvGneR7QCiIGA9HFfwtsQS7Vy9NtepVg==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASt90vhE//4CNKBhlR6TQk835uo17v5sq5T4iKInBMNW/VpHtCbzXauaPti0Vl1XpviSu+3PRL07gpF8UrSP3T5KOOm5XrYWSs/riYCUYh6fMTOn60SzHR1PwBpZfQclvLemMepzWD97ZWa7fIa8St23b9GLQH2EnIOezKlUzhYXQqcXqP2mWrzHC6BFPf8XN1+2BEwiDd2PMQhPjVWSrXbMTmnxcXyuZtzg7ZqHqsQd09Y0nzqL8zgBGqVTGSHI/npg6SupSL8Ht98zbYiNuLY43PaOaahOgu6G7VibQDN7mgpGHR/y5kcKhxfXI250pMu0rUt2hsGO6UYnwtxQEPTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVEh46tLbAz9WKh9VnTeJEgCAl4WNvgovaQQPD/pB9YoqUyW0YSJFjAoDqVZ7vEzYRJA==]
+infra::profile::galera_cluster::galera_master: db01-bmf-de.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKrv9Zm8W5YNTPdHWfu+z3bX+tpiKogLzMaGn7P0BoIf973KhgyUhdTh9N8IWJoyn2eJ0Pnh/7uGItiIIvPDr5tkr4UUV43r7b2F8c9SspOnHg17cqyRstuHzj3kxtdvlLog9ghZlrxjBkVV6hs1U4XxzgRIrALUPGVhlgtd/VGIJ/AASW9tzoZD5sBo4SIP9z5+C6YpcWRbJdRKzS1gaXLmajEam0aLorsfVw1XNOAvaGtwqBi54Rw4HCjQEDdVZkfK/T7JelU/O2fNFCxFw8rQuOe7KQVKTp0O+vgu29sFuWAQmowhpsRVsiObu//MAxm7CzaApbKsbailpRJuLFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDndutZFdsf2YhAL8QQYpqpgCClWFmYLmbiN7lvGneR7QCiIGA9HFfwtsQS7Vy9NtepVg==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASt90vhE//4CNKBhlR6TQk835uo17v5sq5T4iKInBMNW/VpHtCbzXauaPti0Vl1XpviSu+3PRL07gpF8UrSP3T5KOOm5XrYWSs/riYCUYh6fMTOn60SzHR1PwBpZfQclvLemMepzWD97ZWa7fIa8St23b9GLQH2EnIOezKlUzhYXQqcXqP2mWrzHC6BFPf8XN1+2BEwiDd2PMQhPjVWSrXbMTmnxcXyuZtzg7ZqHqsQd09Y0nzqL8zgBGqVTGSHI/npg6SupSL8Ht98zbYiNuLY43PaOaahOgu6G7VibQDN7mgpGHR/y5kcKhxfXI250pMu0rUt2hsGO6UYnwtxQEPTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVEh46tLbAz9WKh9VnTeJEgCAl4WNvgovaQQPD/pB9YoqUyW0YSJFjAoDqVZ7vEzYRJA==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbJkoJUjDl0k5STXQWdpwevarYtBX4/mFj8y9Nh/6j2AOXv263t9eqCcxJSFbpbs/w6ZnI+szzdbBRuA0bvqdJDyx8Xb82wa0ljUTCSNX6sCSC3CXcp79CNTs9l0QTGmDW9g9/CSvJYI/V8DMTlkKIcVCRJq+/0RuACkqHNx7/M7NPfrSWwQCgKr07YBIVeXKr8fCOqinYOuCWioKGQkVvesDeUkkuPTYifXEFAAYOUFbGyfpWKQCWZ0guS/Oq+XXfMWqjHXJ1gw+Qs5aI6P2aSiCCQUUdzU0SLjpLVGXZa9RzaBcxqmKDa5rzO6PviEtNWULo6P6rdqcxykcpRNRrTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAMFYGdUVkkFsDwBgmzoEVXgCB51lNjYGHwLHZeMJBs4RiRoAfxMY3OMfe5xjThVYALuw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMMASTER:
     user: CMMASTER
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhNQJm/PJk1xoO98EFrBjMpAPAGEuGTG60Xojc6PQEgheEs8UiQNI84LoY/lMFwfuX0yXqyUOOzZMmPpGHHv04MJIwYgmT6ePXgYUuzUJynatTYW5wxttml/LmfCdLX8c80o3QA2ff1V64DTz9QWikvi/re4/WmlXXbYeFA9s3M/cE8ym0uWGdXOlZ0TL6Gj/XASeGuZRe+35Fxz+u/NMS8UORybPmBT1lNLM23RGmfnR4tJ7SUSco2BsAXwBN6S3GLu+VLlgJ+lhNOP7WtBWD7I7hKTdNJGUQ9/0775TIRoMycIJUJ+zYG527Jl3Z8Cxb0gBrmlMwD+u+zapSKMXzjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB4nBTPxyxtnxzyvty0yvqugCDrlcfjSi7//ConJ6YD7m04oOExfEEdS2P/wwJE8pEqSg==]
index e3e6a5630afcf56f5632655d64c0b23c621c8aea..9d185c4ecd4525a3be871132769f4a63206302b9 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-#site::additional_classes: #disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
-  #- site::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+infra::role: base
+#infra::additional_classes: #disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+  #- infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
 
 mysql::server::override_options:
   mysqld:
@@ -17,7 +17,7 @@ mysql::server::override_options:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwS6zo6MFyZ2bwUX7jqYK/7bxtEMCjlzPo0qKBTK7BybpZ0bXTP2tHB7lf/tMiZCuIYQXv0jo45IrDIDmjbI3F9l1+pe+9HTUi4Bldm3bgNYJ11hnTj2zvy4OFshQNT+Osgl4xyIeitW2QEicirU2Sxu2j2bPeYCmEcHQQ7+wp5kBTwNOFhFGAPT193utWGRNoM5F6kdyzH30w3ROEUiaHtBJ7guVP/dtOSu/2G6ZTZdbuelY9HIP0HY5Q+wF9ijGX8jcFgH/d5fjF1nC6U0cZ1+kAaATmO0tBhjd6fNNxnS7MwzOcnnjUb+55DCNLfbzGs2QX8jyg3yVMFgLDkvjkDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKUL10b68L7XHjlvWUyCRggCA+/9M2Vvhr06kb+3DCz+Pa9pE6xzBLP2V7NW4XUlFKKg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAK1sdC25CqwyHe+/hixKmOZnoCbLVd6spYkF+LD1EEK2f4JZDKSs+qtDFfrl/OxixGdlxdA5IH2YCYdSQv1qu2i+uIGRpoSrMGzqIbybhnv26fv57DQnF5gz6GiWL1DuSEs8wOtXGSnFscVqe7zvTP+EwljSfhp2AVVxa5XYfeEeln0/UbBQv93rzoCNhXMWoN0SbPWMzhBuA6OJxiFoXAhwsNe9Uar7+5sJypkhwASxIoqjtdLWIki3jb9lUQ2FqS9FRIEKN4cec04GwWznGf57RGq+rxPK9wQTevNx+3Q7K3J1nj1oejbQrznwsecI9L8ueVZQwChpiNoeZN37JZTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA11wRusEksu7P8icskSf8bgCDM8YkEhAMJN8Bp+DAElUPJN3kCTE9flIsBsLTs4m4VDQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMCONTENT:
     user: CMCONTENT
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAxF7B0gnNCjykLFCQGOtcyfMaXWzwMXnAOazEeK0PFf7SxgwKY2dqFFWTsExfm/TqXhXazfiuIVN9e6FdqaFNj30lrtOhnVl76tFvAUzL6Pq5CsjVHLDKDDbMqTU6WKWv0VlXdvttLrQSFxLypOWdrAGVpYssKzp9OpvSIp/Zsr5zB4dZerWFeo8sUNtNWttBv7Xvx8sAypWFykm4qapQlwAclHycoB6QAoGOFrVCL5zj+bWUTO8iV60R2Hu1kR0Vv20YZmk8oQBfnDXSj56ecpxZMv/VuYL8sxbKykfkmZnMGleMlnRtIynMRk8Z9YEt8KWLdoGCnXwO8qbhUkIJUzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDXv54RMcJWlU44oPuechxjgCD+8MNKTOLGn6UOIkGkNv91T/C3vyujF4XTF6ZwpqnmdA==]
index ca882cd3655a77a0bb6114c1e3a9fd71cfd7f22e..30907db9910869ef8cdd0882745c8368438bdb19 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::galera_cluster
-#  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::galera_cluster
+#  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
@@ -11,17 +11,17 @@ mysql::server::override_options:
 
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 192.168.64.3
   - 192.168.64.4
   - 192.168.64.5
 
-site::profile::galera_cluster::galera_master: db01-bmf-de.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKrv9Zm8W5YNTPdHWfu+z3bX+tpiKogLzMaGn7P0BoIf973KhgyUhdTh9N8IWJoyn2eJ0Pnh/7uGItiIIvPDr5tkr4UUV43r7b2F8c9SspOnHg17cqyRstuHzj3kxtdvlLog9ghZlrxjBkVV6hs1U4XxzgRIrALUPGVhlgtd/VGIJ/AASW9tzoZD5sBo4SIP9z5+C6YpcWRbJdRKzS1gaXLmajEam0aLorsfVw1XNOAvaGtwqBi54Rw4HCjQEDdVZkfK/T7JelU/O2fNFCxFw8rQuOe7KQVKTp0O+vgu29sFuWAQmowhpsRVsiObu//MAxm7CzaApbKsbailpRJuLFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDndutZFdsf2YhAL8QQYpqpgCClWFmYLmbiN7lvGneR7QCiIGA9HFfwtsQS7Vy9NtepVg==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASt90vhE//4CNKBhlR6TQk835uo17v5sq5T4iKInBMNW/VpHtCbzXauaPti0Vl1XpviSu+3PRL07gpF8UrSP3T5KOOm5XrYWSs/riYCUYh6fMTOn60SzHR1PwBpZfQclvLemMepzWD97ZWa7fIa8St23b9GLQH2EnIOezKlUzhYXQqcXqP2mWrzHC6BFPf8XN1+2BEwiDd2PMQhPjVWSrXbMTmnxcXyuZtzg7ZqHqsQd09Y0nzqL8zgBGqVTGSHI/npg6SupSL8Ht98zbYiNuLY43PaOaahOgu6G7VibQDN7mgpGHR/y5kcKhxfXI250pMu0rUt2hsGO6UYnwtxQEPTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVEh46tLbAz9WKh9VnTeJEgCAl4WNvgovaQQPD/pB9YoqUyW0YSJFjAoDqVZ7vEzYRJA==]
+infra::profile::galera_cluster::galera_master: db01-bmf-de.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKrv9Zm8W5YNTPdHWfu+z3bX+tpiKogLzMaGn7P0BoIf973KhgyUhdTh9N8IWJoyn2eJ0Pnh/7uGItiIIvPDr5tkr4UUV43r7b2F8c9SspOnHg17cqyRstuHzj3kxtdvlLog9ghZlrxjBkVV6hs1U4XxzgRIrALUPGVhlgtd/VGIJ/AASW9tzoZD5sBo4SIP9z5+C6YpcWRbJdRKzS1gaXLmajEam0aLorsfVw1XNOAvaGtwqBi54Rw4HCjQEDdVZkfK/T7JelU/O2fNFCxFw8rQuOe7KQVKTp0O+vgu29sFuWAQmowhpsRVsiObu//MAxm7CzaApbKsbailpRJuLFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDndutZFdsf2YhAL8QQYpqpgCClWFmYLmbiN7lvGneR7QCiIGA9HFfwtsQS7Vy9NtepVg==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASt90vhE//4CNKBhlR6TQk835uo17v5sq5T4iKInBMNW/VpHtCbzXauaPti0Vl1XpviSu+3PRL07gpF8UrSP3T5KOOm5XrYWSs/riYCUYh6fMTOn60SzHR1PwBpZfQclvLemMepzWD97ZWa7fIa8St23b9GLQH2EnIOezKlUzhYXQqcXqP2mWrzHC6BFPf8XN1+2BEwiDd2PMQhPjVWSrXbMTmnxcXyuZtzg7ZqHqsQd09Y0nzqL8zgBGqVTGSHI/npg6SupSL8Ht98zbYiNuLY43PaOaahOgu6G7VibQDN7mgpGHR/y5kcKhxfXI250pMu0rUt2hsGO6UYnwtxQEPTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVEh46tLbAz9WKh9VnTeJEgCAl4WNvgovaQQPD/pB9YoqUyW0YSJFjAoDqVZ7vEzYRJA==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbJkoJUjDl0k5STXQWdpwevarYtBX4/mFj8y9Nh/6j2AOXv263t9eqCcxJSFbpbs/w6ZnI+szzdbBRuA0bvqdJDyx8Xb82wa0ljUTCSNX6sCSC3CXcp79CNTs9l0QTGmDW9g9/CSvJYI/V8DMTlkKIcVCRJq+/0RuACkqHNx7/M7NPfrSWwQCgKr07YBIVeXKr8fCOqinYOuCWioKGQkVvesDeUkkuPTYifXEFAAYOUFbGyfpWKQCWZ0guS/Oq+XXfMWqjHXJ1gw+Qs5aI6P2aSiCCQUUdzU0SLjpLVGXZa9RzaBcxqmKDa5rzO6PviEtNWULo6P6rdqcxykcpRNRrTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAMFYGdUVkkFsDwBgmzoEVXgCB51lNjYGHwLHZeMJBs4RiRoAfxMY3OMfe5xjThVYALuw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMMASTER:
     user: CMMASTER
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhNQJm/PJk1xoO98EFrBjMpAPAGEuGTG60Xojc6PQEgheEs8UiQNI84LoY/lMFwfuX0yXqyUOOzZMmPpGHHv04MJIwYgmT6ePXgYUuzUJynatTYW5wxttml/LmfCdLX8c80o3QA2ff1V64DTz9QWikvi/re4/WmlXXbYeFA9s3M/cE8ym0uWGdXOlZ0TL6Gj/XASeGuZRe+35Fxz+u/NMS8UORybPmBT1lNLM23RGmfnR4tJ7SUSco2BsAXwBN6S3GLu+VLlgJ+lhNOP7WtBWD7I7hKTdNJGUQ9/0775TIRoMycIJUJ+zYG527Jl3Z8Cxb0gBrmlMwD+u+zapSKMXzjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB4nBTPxyxtnxzyvty0yvqugCDrlcfjSi7//ConJ6YD7m04oOExfEEdS2P/wwJE8pEqSg==]
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 8c115e118185985e1046c67ae616a27b3ae7341a..2355df28d0a83667ab94fa65ebf57c816191a643 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
index 56cd6dfd2d8ea27ddb58c0557b3970208253f697..9e46038230b7c410a3f35cf9c1296cf189986dcc 100644 (file)
@@ -6,7 +6,7 @@ mysql::server::override_options:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHVekrm5uqHWHFKmAFfaUuyvoQoNjZMHM4wTjQHrHnROTpNGE+SngUfktMIdl2fpUgLqa3DxBuV9aA5VDxylGj1fDtNiFdGK5RzzhSSoLcanq+3a6yjlqDuLQw9rwcP3Sd3HWrr7w5VNt9Z584oj+JRd6OBILKOJAJu6HcrRjDQ33fkeyVhpi06nGmk6BmmOtpdelBo6MhWVJQEc8r2Yj6AyFDXim1ecn/zpB0RWK4gDoxZ6lzc6K2zq4SilX+x69zHW16hgMWCjb2GgAMWOSAZTOtQ5ej4IH9U3dC5F6OC4lJ23vXTQZjHI5/coZU9l00zgoqvnuQ3xcYdtESf44TDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCtwLPpW9jsORJP3G64P0VogCCARZoTPLua1j2Zq8FmfoFY9kTjjDdtfDRf/snDMerYDQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiAEYUAJKUMbLeMfAiGkHWySTfYAQRnqQMk0dKZX8woQs86Exoc6vplF0ph/EGLz3NKhpJaOmPlQ7DQ+yre1PW8jWeP8C7eZa+nm+pFCozFDb+S8qTAQvpb0uIRzJzoqYNCk4XqagEZ7wtlJedeAWIo22daxX4VaJeqsmHbaPZ+3o594K4T+HQ3iY3crsSwmlhK0gdFTG7AZk+F0DA2IFQ1oPEd62sf8AVHKmMvc1Nh+d2bIzlzjfvPLVnkiLsgL/Che6YQmLAlRa/Rb9mI2TkqXCn5d7CxH3aIfLS1xoO6ZVxJzp2DCLyrsBgcAasXmvsrRvTaArH+AcTjvgiptY0DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYLTpSnf0SqSZEOHMpPTbmgCC3gyIJJCk8mjIOH/XjJ/8yEDurZggaynTi7yi9EBYKzg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMCONTENT:
     user: CMCONTENT
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArMfRiNvlaKD7/4AMvxX6qg8rVYEnOPzzN/6aRPz/JAgFM/1kKaJ/cGCHJ8vQCvpNoinbVVOCMaMj5J4LFZAFDR7at4B7decZferuW48Ooc2AgsE8Arx4E/ZDPugxr+K59pH2Fl928XErGfSnGJvsjLmNlQIrbui/0KDUH7nzCrx/j9s6uwdNgljdqAPdcHsm98M8MaoNp8/2tvwrDKIzuhdxkK7iMwI+MDKgMB0/1LgexaxdbTJE04xivdSDzCmt71FO+Uvn6ytaARl0m4SdaHML2mjoFG1t2rkGQmgZry1nXItBVF7GZwkxrhqXInY7rKSYysHao/NCU1eY2tu1KjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVtmsSNys2LY41pm6FIXhhgCAfQo1fBkXqF1mQCV5u6xNVgzECN80TsyPqCHT8yN4Raw==]
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 029b18413f4df43d47402b0780c57a4e76204f68..e41baf30c0159a829e501ccdf1dac354e5629cfb 100644 (file)
@@ -9,9 +9,9 @@ sudo::configs:
     content: |
       jenkins ALL=(ALL) NOPASSWD: ALL
 
-site::role: base
-#site::additional_classes: # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
-  #- site::profile::mysql_server  # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+infra::role: base
+#infra::additional_classes: # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+  #- infra::profile::mysql_server  # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
 
 mysql::server::override_options:
   mysqld:
@@ -27,7 +27,7 @@ mysql::server::override_options:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwS6zo6MFyZ2bwUX7jqYK/7bxtEMCjlzPo0qKBTK7BybpZ0bXTP2tHB7lf/tMiZCuIYQXv0jo45IrDIDmjbI3F9l1+pe+9HTUi4Bldm3bgNYJ11hnTj2zvy4OFshQNT+Osgl4xyIeitW2QEicirU2Sxu2j2bPeYCmEcHQQ7+wp5kBTwNOFhFGAPT193utWGRNoM5F6kdyzH30w3ROEUiaHtBJ7guVP/dtOSu/2G6ZTZdbuelY9HIP0HY5Q+wF9ijGX8jcFgH/d5fjF1nC6U0cZ1+kAaATmO0tBhjd6fNNxnS7MwzOcnnjUb+55DCNLfbzGs2QX8jyg3yVMFgLDkvjkDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKUL10b68L7XHjlvWUyCRggCA+/9M2Vvhr06kb+3DCz+Pa9pE6xzBLP2V7NW4XUlFKKg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAK1sdC25CqwyHe+/hixKmOZnoCbLVd6spYkF+LD1EEK2f4JZDKSs+qtDFfrl/OxixGdlxdA5IH2YCYdSQv1qu2i+uIGRpoSrMGzqIbybhnv26fv57DQnF5gz6GiWL1DuSEs8wOtXGSnFscVqe7zvTP+EwljSfhp2AVVxa5XYfeEeln0/UbBQv93rzoCNhXMWoN0SbPWMzhBuA6OJxiFoXAhwsNe9Uar7+5sJypkhwASxIoqjtdLWIki3jb9lUQ2FqS9FRIEKN4cec04GwWznGf57RGq+rxPK9wQTevNx+3Q7K3J1nj1oejbQrznwsecI9L8ueVZQwChpiNoeZN37JZTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA11wRusEksu7P8icskSf8bgCDM8YkEhAMJN8Bp+DAElUPJN3kCTE9flIsBsLTs4m4VDQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMCONTENT:
     user: CMCONTENT
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAV00ncxn5brk+kXiTSZiluSnt2tIbk1Kh3L0yPvGqet0oHHD7NL3ZzZPMMf2fOewoELgAAX3s0IB16Arn7Pp6cCGrSauoUn+aQu5xQggjpOtNzHsmdPXctp48pgSolVsic53rsC02mEgIjyAp93jkT+kDbIftD6mhLK+Md6CEK+qKxNmAdKAGMfojMfat9w6Pl1g+blqsR3818FW3TbE0fnKh6pWQy4l9vZ3bwEN300HC3gcFCHEFak+X0v0wYB8ZfcQOpa0rZD/STxsOO+RXFqS7G8m1qvs2xmquCDJHMXzkvikxW1I/PFoD01Xt42vlWPEq/iltRBZXhTw3T5ptnjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3YVpas/lmM/iU42uz9048gCAMG0MsVSbPy52ShYhnz5El1k2MnsUNAKw5X44NIK6tzA==]
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index a32e7f6da29c18b66f06e62652974062016753b9..bdebbb25ae41c8aff1c0e17ca0f7518d60d33183 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::galera_cluster
-#  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::galera_cluster
+#  - infra::profile::mysql_server
   - logstash
 
 galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/"
 
-site::profile::galera_cluster::override_options:
+infra::profile::galera_cluster::override_options:
   mysqld:
     innodb_file_per_table: ON
     wait_timeout: '600'
@@ -17,17 +17,17 @@ site::profile::galera_cluster::override_options:
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 mysql::server::backup::backuprotate: '1'
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 192.168.64.6
   - 192.168.64.7
   - 192.168.64.8
 
-site::profile::galera_cluster::galera_master: test-db01-bmf-de.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxYyu7iGMwOlOtMU72SFZW+kBTlcuBDYksO81rYfQu6JSvo1uxDxoQTXvNf/TxALYqxMDnp75R2hCp++nv/zAZ6y31WmGRZ3dof2bPnukldVYc9OmgDrj9st/Z8SnvujE3DQjKU3A4AtCvrCvGzrkd7tw0m+pIeRZoN+3RVrAGeYkbShZp5CLY4gWLLzWAR1zts4mkb6QrcR8tk1AoiMJrjbjOzpwU70y74gtYTQa3ZhNotzigSfr28kq9l4dY1MYOcJ8b6En94jwCpIbyHJdwdPKkYaLohu/JInY3BHl1CZRPbUvFioqofupJOC59vI6TZlpvu7GFyzpIaqvkH6bDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmu7SVgDg2ePPfYvSe07lRgCD5EgD+/DTECUX7c6n/Q3cT8j8kSaEs8b8CdYPSXnkvgg==]
+infra::profile::galera_cluster::galera_master: test-db01-bmf-de.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxYyu7iGMwOlOtMU72SFZW+kBTlcuBDYksO81rYfQu6JSvo1uxDxoQTXvNf/TxALYqxMDnp75R2hCp++nv/zAZ6y31WmGRZ3dof2bPnukldVYc9OmgDrj9st/Z8SnvujE3DQjKU3A4AtCvrCvGzrkd7tw0m+pIeRZoN+3RVrAGeYkbShZp5CLY4gWLLzWAR1zts4mkb6QrcR8tk1AoiMJrjbjOzpwU70y74gtYTQa3ZhNotzigSfr28kq9l4dY1MYOcJ8b6En94jwCpIbyHJdwdPKkYaLohu/JInY3BHl1CZRPbUvFioqofupJOC59vI6TZlpvu7GFyzpIaqvkH6bDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmu7SVgDg2ePPfYvSe07lRgCD5EgD+/DTECUX7c6n/Q3cT8j8kSaEs8b8CdYPSXnkvgg==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIyUewAys8rTBHZ2lviZQfI9ZCzKMmwmGpnBuqgHAV7VS/dAElkTzq7jcUhlk+Y973E8DN6txLGKa/D14uGQefhp0xjcHvQ1eCc52w89IVWdKUvsFwQt1LiTyDUExVk8/shRieN/RgIxKljOEcZJly2+sFxukUadByJCGch0npcDks4+d9uFZ2JFCCikbKb+WmNXlJRAKiZ2ejzbz4md/y/yrq9IDUVtaMMRLQUw92/KAT32eqpydSr0fIBsva2fLYU8QqSyZqjxJqfFdKzUdVTBNJVUphzDCDygwEJC63a2owsLWaquXia4G6RX5ZQCti6jQO6UxvwQax4IaObCRJTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAuv3TkSFDP7Iq1pctp+G24gCAqXSmm/eUvvUS1N3GAodaH5bz6pUnZT5i0EQiQKawCug==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMMASTER-TEST:
     user: CMMASTER-TST
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAjJxua1zlrQQFX25uhzWKHk/+DeYaRPBVUhNo1ifsxJn6Dl9dufExxQ8WP5SOivCiZuGbP8aOo8ikOG4gx782dHaYLPRlUsL3jDusGExu6cpEdlAANr0YZMO1wp5Xvs6Y4dyUS9CfRxrCCe7/WT6PHJxbqGZxDVBK05Udu9XuuH7WgR3S0hSHhXf0Yr3AWdR6pCeNF2V3Up6ObxoeGB/Yns4E2O4m6MR3YRqgpWkMdyOs/AScOrRnQ2N4K9R23Z12ejq2Gwg6N7aJR+oXOg24bBbJhcAQcooJTVLkqMgtyO/3mWYsmaBTqjTo/6VI1xkncU32ezqzrKpVJfr3u9lNTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAnsl/LIdX03N1FYLFRfFN/gCCvyllLhBP0G8Lb1k8rQwXtwxpaIWJ8wPF1vIkQgXETkw==]
index a32e7f6da29c18b66f06e62652974062016753b9..bdebbb25ae41c8aff1c0e17ca0f7518d60d33183 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::galera_cluster
-#  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::galera_cluster
+#  - infra::profile::mysql_server
   - logstash
 
 galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/"
 
-site::profile::galera_cluster::override_options:
+infra::profile::galera_cluster::override_options:
   mysqld:
     innodb_file_per_table: ON
     wait_timeout: '600'
@@ -17,17 +17,17 @@ site::profile::galera_cluster::override_options:
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 mysql::server::backup::backuprotate: '1'
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 192.168.64.6
   - 192.168.64.7
   - 192.168.64.8
 
-site::profile::galera_cluster::galera_master: test-db01-bmf-de.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxYyu7iGMwOlOtMU72SFZW+kBTlcuBDYksO81rYfQu6JSvo1uxDxoQTXvNf/TxALYqxMDnp75R2hCp++nv/zAZ6y31WmGRZ3dof2bPnukldVYc9OmgDrj9st/Z8SnvujE3DQjKU3A4AtCvrCvGzrkd7tw0m+pIeRZoN+3RVrAGeYkbShZp5CLY4gWLLzWAR1zts4mkb6QrcR8tk1AoiMJrjbjOzpwU70y74gtYTQa3ZhNotzigSfr28kq9l4dY1MYOcJ8b6En94jwCpIbyHJdwdPKkYaLohu/JInY3BHl1CZRPbUvFioqofupJOC59vI6TZlpvu7GFyzpIaqvkH6bDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmu7SVgDg2ePPfYvSe07lRgCD5EgD+/DTECUX7c6n/Q3cT8j8kSaEs8b8CdYPSXnkvgg==]
+infra::profile::galera_cluster::galera_master: test-db01-bmf-de.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxYyu7iGMwOlOtMU72SFZW+kBTlcuBDYksO81rYfQu6JSvo1uxDxoQTXvNf/TxALYqxMDnp75R2hCp++nv/zAZ6y31WmGRZ3dof2bPnukldVYc9OmgDrj9st/Z8SnvujE3DQjKU3A4AtCvrCvGzrkd7tw0m+pIeRZoN+3RVrAGeYkbShZp5CLY4gWLLzWAR1zts4mkb6QrcR8tk1AoiMJrjbjOzpwU70y74gtYTQa3ZhNotzigSfr28kq9l4dY1MYOcJ8b6En94jwCpIbyHJdwdPKkYaLohu/JInY3BHl1CZRPbUvFioqofupJOC59vI6TZlpvu7GFyzpIaqvkH6bDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmu7SVgDg2ePPfYvSe07lRgCD5EgD+/DTECUX7c6n/Q3cT8j8kSaEs8b8CdYPSXnkvgg==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIyUewAys8rTBHZ2lviZQfI9ZCzKMmwmGpnBuqgHAV7VS/dAElkTzq7jcUhlk+Y973E8DN6txLGKa/D14uGQefhp0xjcHvQ1eCc52w89IVWdKUvsFwQt1LiTyDUExVk8/shRieN/RgIxKljOEcZJly2+sFxukUadByJCGch0npcDks4+d9uFZ2JFCCikbKb+WmNXlJRAKiZ2ejzbz4md/y/yrq9IDUVtaMMRLQUw92/KAT32eqpydSr0fIBsva2fLYU8QqSyZqjxJqfFdKzUdVTBNJVUphzDCDygwEJC63a2owsLWaquXia4G6RX5ZQCti6jQO6UxvwQax4IaObCRJTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAuv3TkSFDP7Iq1pctp+G24gCAqXSmm/eUvvUS1N3GAodaH5bz6pUnZT5i0EQiQKawCug==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMMASTER-TEST:
     user: CMMASTER-TST
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAjJxua1zlrQQFX25uhzWKHk/+DeYaRPBVUhNo1ifsxJn6Dl9dufExxQ8WP5SOivCiZuGbP8aOo8ikOG4gx782dHaYLPRlUsL3jDusGExu6cpEdlAANr0YZMO1wp5Xvs6Y4dyUS9CfRxrCCe7/WT6PHJxbqGZxDVBK05Udu9XuuH7WgR3S0hSHhXf0Yr3AWdR6pCeNF2V3Up6ObxoeGB/Yns4E2O4m6MR3YRqgpWkMdyOs/AScOrRnQ2N4K9R23Z12ejq2Gwg6N7aJR+oXOg24bBbJhcAQcooJTVLkqMgtyO/3mWYsmaBTqjTo/6VI1xkncU32ezqzrKpVJfr3u9lNTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAnsl/LIdX03N1FYLFRfFN/gCCvyllLhBP0G8Lb1k8rQwXtwxpaIWJ8wPF1vIkQgXETkw==]
index a32e7f6da29c18b66f06e62652974062016753b9..bdebbb25ae41c8aff1c0e17ca0f7518d60d33183 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-#  - site::profile::galera_cluster
-#  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::galera_cluster
+#  - infra::profile::mysql_server
   - logstash
 
 galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/"
 
-site::profile::galera_cluster::override_options:
+infra::profile::galera_cluster::override_options:
   mysqld:
     innodb_file_per_table: ON
     wait_timeout: '600'
@@ -17,17 +17,17 @@ site::profile::galera_cluster::override_options:
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 mysql::server::backup::backuprotate: '1'
 
-site::profile::galera_cluster::galera_servers:
+infra::profile::galera_cluster::galera_servers:
   - 192.168.64.6
   - 192.168.64.7
   - 192.168.64.8
 
-site::profile::galera_cluster::galera_master: test-db01-bmf-de.pixelpark.net
-site::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
-site::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxYyu7iGMwOlOtMU72SFZW+kBTlcuBDYksO81rYfQu6JSvo1uxDxoQTXvNf/TxALYqxMDnp75R2hCp++nv/zAZ6y31WmGRZ3dof2bPnukldVYc9OmgDrj9st/Z8SnvujE3DQjKU3A4AtCvrCvGzrkd7tw0m+pIeRZoN+3RVrAGeYkbShZp5CLY4gWLLzWAR1zts4mkb6QrcR8tk1AoiMJrjbjOzpwU70y74gtYTQa3ZhNotzigSfr28kq9l4dY1MYOcJ8b6En94jwCpIbyHJdwdPKkYaLohu/JInY3BHl1CZRPbUvFioqofupJOC59vI6TZlpvu7GFyzpIaqvkH6bDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmu7SVgDg2ePPfYvSe07lRgCD5EgD+/DTECUX7c6n/Q3cT8j8kSaEs8b8CdYPSXnkvgg==]
+infra::profile::galera_cluster::galera_master: test-db01-bmf-de.pixelpark.net
+infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
+infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxYyu7iGMwOlOtMU72SFZW+kBTlcuBDYksO81rYfQu6JSvo1uxDxoQTXvNf/TxALYqxMDnp75R2hCp++nv/zAZ6y31WmGRZ3dof2bPnukldVYc9OmgDrj9st/Z8SnvujE3DQjKU3A4AtCvrCvGzrkd7tw0m+pIeRZoN+3RVrAGeYkbShZp5CLY4gWLLzWAR1zts4mkb6QrcR8tk1AoiMJrjbjOzpwU70y74gtYTQa3ZhNotzigSfr28kq9l4dY1MYOcJ8b6En94jwCpIbyHJdwdPKkYaLohu/JInY3BHl1CZRPbUvFioqofupJOC59vI6TZlpvu7GFyzpIaqvkH6bDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmu7SVgDg2ePPfYvSe07lRgCD5EgD+/DTECUX7c6n/Q3cT8j8kSaEs8b8CdYPSXnkvgg==]
 
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIyUewAys8rTBHZ2lviZQfI9ZCzKMmwmGpnBuqgHAV7VS/dAElkTzq7jcUhlk+Y973E8DN6txLGKa/D14uGQefhp0xjcHvQ1eCc52w89IVWdKUvsFwQt1LiTyDUExVk8/shRieN/RgIxKljOEcZJly2+sFxukUadByJCGch0npcDks4+d9uFZ2JFCCikbKb+WmNXlJRAKiZ2ejzbz4md/y/yrq9IDUVtaMMRLQUw92/KAT32eqpydSr0fIBsva2fLYU8QqSyZqjxJqfFdKzUdVTBNJVUphzDCDygwEJC63a2owsLWaquXia4G6RX5ZQCti6jQO6UxvwQax4IaObCRJTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAuv3TkSFDP7Iq1pctp+G24gCAqXSmm/eUvvUS1N3GAodaH5bz6pUnZT5i0EQiQKawCug==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMMASTER-TEST:
     user: CMMASTER-TST
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAjJxua1zlrQQFX25uhzWKHk/+DeYaRPBVUhNo1ifsxJn6Dl9dufExxQ8WP5SOivCiZuGbP8aOo8ikOG4gx782dHaYLPRlUsL3jDusGExu6cpEdlAANr0YZMO1wp5Xvs6Y4dyUS9CfRxrCCe7/WT6PHJxbqGZxDVBK05Udu9XuuH7WgR3S0hSHhXf0Yr3AWdR6pCeNF2V3Up6ObxoeGB/Yns4E2O4m6MR3YRqgpWkMdyOs/AScOrRnQ2N4K9R23Z12ejq2Gwg6N7aJR+oXOg24bBbJhcAQcooJTVLkqMgtyO/3mWYsmaBTqjTo/6VI1xkncU32ezqzrKpVJfr3u9lNTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAnsl/LIdX03N1FYLFRfFN/gCCvyllLhBP0G8Lb1k8rQwXtwxpaIWJ8wPF1vIkQgXETkw==]
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 63ad842921fa65feadc79cc349524155cd99366f..c34df256f5f57c510bbce2a13550d7444e9384e7 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 mysql::server::override_options:
   mysqld:
@@ -10,7 +10,7 @@ mysql::server::override_options:
 
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeuHxLFF2TX6br1Qr64IwewKmlR6yDJpmwdzHzB0x750XJ2MVZP5isQookK4LkYEsZrlnqrqUYFhpTcYozAn7hoJceKUk/KhNt7k6eWWxgeaa9T7GPZIVPiTFVoFiE6NEeXQpG7fQOthU4BrAVBDntj6/LJkHufe6VLDTv4ZGoOSg3ICFIUwm1meZ2jZSjwvxlHH7GtkbsRmUPVyzWErZl2xGgH+BbZ+fToeGDsu5TICrk9XNbGXwgsSUUkPH12P+tDvKuwLaPDL8Qp7VXr1I4a0vM8+bip2yJvrVGM9uiDWkN16c53o2aaTZ40NGvtR3XJwsszV2Nn4HmtvnCVehDzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC4wE9blP1bZWNkx3aTkBSrgBBR7gAIVg+q2mIMUTGRS3Ft]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAe0KiPBpUBLzFSTdb0CsMHfnBwE9Rr69THLyqHAtyrBq83/6tr7oIp6f77AsOM3x4h1grdAS4N/qilV2endjhH48e/7WBftxU3jwt4sRme8/LGcjRgxtQDsINgIX4MWbPRjxBbo1iIEHA9HE/fD2K+8WK1wuYlGPI7Kn5Sk9+UHxLSNNTSIHPel29G6nwpeNAw1kAacEWFEnUIP4AviToOnTGj9FIrwi9xMb22jJ3gkrzyO9HCsIxGLtimQcayQvGxXBd5lzhsD3d3KE0grb9bcibuAgYwlEUpsA6oyYiwWkUL81sw4vZJj1RJnk+dykiTzBejHWQgi8ToJBT5TZg1DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAwrAUE0192AUrWeRqq18xYgBCdO9qFWG45RWW6ZtdH2ZVA]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   CMCONTENT:
     user: CMCONTENT
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUEvK26J+IyAdMc4rK6rjfQ19SjVTk8tTnRLVqzdydmDayk186em3FSYiMgErc3ldsYrGJuHggLq3UP4hi+9ke/l/ImMSIekusg4pHEaBBQ5Qm+JRUBzlJDdRCj/QYNx5ZMY0or0vr32Vx2X0S0KD1Bq9ApW28A4XIVFACxGdaAb9ThENs+9m6qjlCEnvnItFPrDq5Dh2Pj1MoqOQDGotIRC+6nVtujn7NzgRUKGb1MuMO+d64D+V9SrFdCcr4+ywQZ0JxJYp0nCd3ooa+COv0wRSkorbPVUEA7v5v6LZNgcyDX3RmfpAguE2LouPZ1LDMRcL7D1qHTK4ubN3BZqFRjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBt6e9pVRI1hiBsJlfrF/FMgBC4u/YWTlvYRLk4dLZpGTBX]
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 69555b779c5fae8b48912c33f9a8e2e1fdefb966..b74479dc40fd2aecf0ba4f567d3e912a3e140768 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - java
   - accounts
-  - site::profile::cron
+  - infra::profile::cron
 
 java::package: java-1.8.0-oraclejdk
 puppetconf::server: puppetmaster01.pixelpark.com
@@ -42,48 +42,48 @@ sudo::configs:
 #
 # Author
 #
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHiAyTkjYu7u4DveVGZYC9TKUmFWwAVcll4SFMZ604E38Xm+5rNa8TVAcW9lnnA3qqtbEn6+zwdm/aaSZqq9f/jdtbEcHH2syGq7WcdWtmR7bKVsOWz2J0JiGWyKlCKkAHP4kSWYJ2dQUMaah9rF/4qMaND36Z5fiBoTu/+hfNW0or+eqTHB25E0apIfir1x4MyKwlrdryvYqVlAVczAha1HxIbfNAEhPu4ij0dS3Y7aULAlXyULSBsSM8RmfXrGzrkphAH1lgt6ubk2B7rPchu5CKDl63YVYjz6u7nd2wNcj8a31Gwc8r3bsLbOHVaPKsgeQ8/SiA6kNHZu3oFQ9YzBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBt6tSmxQnKOlaK+zrP3CKcgDAiKA5trIvwC+HOEXL5LN6XpIFTNN4TLWccnKJoHneUCJzdw3vK19RN23XEwlb+aCk=]
-site::profile::aem::author::license_product_version: '6.1.0.20150507'
-site::profile::aem::author::license_customer_name: 'Day Training'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHiAyTkjYu7u4DveVGZYC9TKUmFWwAVcll4SFMZ604E38Xm+5rNa8TVAcW9lnnA3qqtbEn6+zwdm/aaSZqq9f/jdtbEcHH2syGq7WcdWtmR7bKVsOWz2J0JiGWyKlCKkAHP4kSWYJ2dQUMaah9rF/4qMaND36Z5fiBoTu/+hfNW0or+eqTHB25E0apIfir1x4MyKwlrdryvYqVlAVczAha1HxIbfNAEhPu4ij0dS3Y7aULAlXyULSBsSM8RmfXrGzrkphAH1lgt6ubk2B7rPchu5CKDl63YVYjz6u7nd2wNcj8a31Gwc8r3bsLbOHVaPKsgeQ8/SiA6kNHZu3oFQ9YzBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBt6tSmxQnKOlaK+zrP3CKcgDAiKA5trIvwC+HOEXL5LN6XpIFTNN4TLWccnKJoHneUCJzdw3vK19RN23XEwlb+aCk=]
+infra::profile::aem::author::license_product_version: '6.1.0.20150507'
+infra::profile::aem::author::license_customer_name: 'Day Training'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 
-site::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
+infra::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Author
-site::profile::aem::author::oak_version: '1.2.7'
-site::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::author::mail_to:
+infra::profile::aem::author::oak_version: '1.2.7'
+infra::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::author::mail_to:
   - gerstenberg@pixelpark.com
 
 #
 # Publisher
 #
-site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYdR+YqNXHmBT02M0v6XzyqGqI6C1tSrttKzOhka9kVde3KpVTIFCZjP7qg7SEvSPYesgcTAEPNJBGfFOAwZ3OsMLO/ikdGbZ2+nTIyB+CV8mGb98djBCkKjp69Qf6Vc6hl25djj7oj5sgoV7TqHMovrxxzkiqcleUCsz66h+uOP7WLBNnevRez7kqbfanwmeNoV2n/g1ZEX/oVxfthBMruE2cwLs45tSBeNx7244MYOv2tUyjMgm4odjwFH8ADWMvS//cGrWlblTQrFaG5c/6WCsBqj/mB9LmP3s6oykQd/At4Rxn04/9HjYjHLeymBkoEDs6Pe0Cmtpze3WdXdQWjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBocffLcP/NHPsJFRPpyIttgDCTdpMMU3E+vHV0mgruxSOC8j/oSk0cMtfDeDhL1v1kmTy6+RhxKGkoshUCJ5Ymq9o=]
-site::profile::aem::publish::license_product_version: '6.1.0.20150507'
-site::profile::aem::publish::license_customer_name: 'Day Training'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYdR+YqNXHmBT02M0v6XzyqGqI6C1tSrttKzOhka9kVde3KpVTIFCZjP7qg7SEvSPYesgcTAEPNJBGfFOAwZ3OsMLO/ikdGbZ2+nTIyB+CV8mGb98djBCkKjp69Qf6Vc6hl25djj7oj5sgoV7TqHMovrxxzkiqcleUCsz66h+uOP7WLBNnevRez7kqbfanwmeNoV2n/g1ZEX/oVxfthBMruE2cwLs45tSBeNx7244MYOv2tUyjMgm4odjwFH8ADWMvS//cGrWlblTQrFaG5c/6WCsBqj/mB9LmP3s6oykQd/At4Rxn04/9HjYjHLeymBkoEDs6Pe0Cmtpze3WdXdQWjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBocffLcP/NHPsJFRPpyIttgDCTdpMMU3E+vHV0mgruxSOC8j/oSk0cMtfDeDhL1v1kmTy6+RhxKGkoshUCJ5Ymq9o=]
+infra::profile::aem::publish::license_product_version: '6.1.0.20150507'
+infra::profile::aem::publish::license_customer_name: 'Day Training'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 
-site::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
+infra::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Publisher
-site::profile::aem::publish::oak_version: '1.2.7'
-site::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::publish::mail_to:
+infra::profile::aem::publish::oak_version: '1.2.7'
+infra::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::publish::mail_to:
   - gerstenberg@pixelpark.com
 #
 # dispatcher
index 2bc3acc4002f8181fdd321b42ebb9f45dd7c2b31..148a899659aebec6d48028bfc8bef01219e283bb 100644 (file)
@@ -5,8 +5,8 @@
 #     apply: true
 
 # admin:8Z7YrhLk2zOG
-site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALVpH8ef4BshDYRnThveSnC7hLczTJ1b7BQ4TGzADdVKFq3OW9czp7OSLlan74Ld5crOsQn+4fLQWSKRTOxMAKkPU31jVwzQd7Y0PHTyo5EAWoUNGbfR3jt1MAStWfUzeaLhi+bmxWV68SdIHOfV6lUSUpZca/rBehlQbORKygiopT60L8gTGdqiMZNTWGnhuA/59Vc57ssMJGQpv0EZGbfwTqrVQN2qnJHjAd4Sdph1EytlV+Fgo//NjQNzJ2+NQ9wl1PzixgZSGAU8HEYBe+4oxZ/BBR3/hiPHQGp2HBzy6OPynFP+RxNYI08gmeNIOajob5u5GAqgRVAH2dGr5xDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCX07CnIhjH5gnVJk7BX2X9gBCCCHVuiYEEZoKC123D7fin]
-site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABEVGusGv7HNHvLKGWJvFEe2kkyaCYeUvuEHBsV/2h789GrApbuSYREq0s2FY8z+qMgeUoySKtZF2ARO4Qk/eprjD6oMzfZ/xf2Ga7XgEaxVrZLHKLUIUt2xmftI1fJiDPuyff94vxK1NThCwwYNkoZmz/IkiofImxlYdQKOGGgXg3w53SAk6szVA01E27Al7s8ogib0IYcrhdAWcn1RLqmdBj0FWI9/WV6APIQdpAB3f1cDk/SRx5Sdf4NwN2EnBsX8waVq+4irlCws067tYMDRdRhia7SjjzCdBc6JzTs7AAEannhnEl1LmKUjUxt29f9iw4b8xL7mFBkdnrT75+DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD81RIzpWvsCu5WCh6oqTPBgBC2zQKCNqpsa/EjV6iElGJx]
+infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALVpH8ef4BshDYRnThveSnC7hLczTJ1b7BQ4TGzADdVKFq3OW9czp7OSLlan74Ld5crOsQn+4fLQWSKRTOxMAKkPU31jVwzQd7Y0PHTyo5EAWoUNGbfR3jt1MAStWfUzeaLhi+bmxWV68SdIHOfV6lUSUpZca/rBehlQbORKygiopT60L8gTGdqiMZNTWGnhuA/59Vc57ssMJGQpv0EZGbfwTqrVQN2qnJHjAd4Sdph1EytlV+Fgo//NjQNzJ2+NQ9wl1PzixgZSGAU8HEYBe+4oxZ/BBR3/hiPHQGp2HBzy6OPynFP+RxNYI08gmeNIOajob5u5GAqgRVAH2dGr5xDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCX07CnIhjH5gnVJk7BX2X9gBCCCHVuiYEEZoKC123D7fin]
+infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABEVGusGv7HNHvLKGWJvFEe2kkyaCYeUvuEHBsV/2h789GrApbuSYREq0s2FY8z+qMgeUoySKtZF2ARO4Qk/eprjD6oMzfZ/xf2Ga7XgEaxVrZLHKLUIUt2xmftI1fJiDPuyff94vxK1NThCwwYNkoZmz/IkiofImxlYdQKOGGgXg3w53SAk6szVA01E27Al7s8ogib0IYcrhdAWcn1RLqmdBj0FWI9/WV6APIQdpAB3f1cDk/SRx5Sdf4NwN2EnBsX8waVq+4irlCws067tYMDRdRhia7SjjzCdBc6JzTs7AAEannhnEl1LmKUjUxt29f9iw4b8xL7mFBkdnrT75+DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD81RIzpWvsCu5WCh6oqTPBgBC2zQKCNqpsa/EjV6iElGJx]
 
 aem::packages:
   service_pack_1:
@@ -26,19 +26,19 @@ aem::packages:
     artifactid: 'cq-6.1.0-hotfix-9381'
     version: '1.1'
 
-site::profile::aem::publish::jvm_heap_min: 4096M
-site::profile::aem::publish::jvm_heap_max: 6144M
+infra::profile::aem::publish::jvm_heap_min: 4096M
+infra::profile::aem::publish::jvm_heap_max: 6144M
 
-site::profile::aem::author::jvm_heap_min: 4096M
-site::profile::aem::author::jvm_heap_max: 6144M
+infra::profile::aem::author::jvm_heap_min: 4096M
+infra::profile::aem::author::jvm_heap_max: 6144M
 
 # www:yIRN57qmO28y
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiBukxV7jmUZA/lYsE7pL0KpuGQ2ViHubHZehBUwtxa9zOgyrB/Tlr2Z79THHZsjSXGOzQSK1di57m8Hn15fUVXacrjvLeYsnA2bg+EgQb/ZzbdSQBTuWyKwDZ3bkXPnX6OwhRuSsYvN/pNjc/sgfNdT/j/staZEshMAQVCgJ/WekVAALaWK50yYWL5+JUNfYdRiluKOU39IkBGp5dPQhNWDFPezSiRbr7yDnSL6pAYxyj1pqTXmlGnzzqvA3tk83q6nVgM7nEsNzaHcrlRBVPTezfwyjpPahCTnAYGquMyMQ2wWmqxYapKPDrpyPdN/u+VzaO0wv/oocRwXBAUAGcTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDY01oPkVnWlNvTokIhrHaigBC3RE6PdNfrlMoAnEA5Kk4F]
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   bmw:
     serveraliases:
       - www-bmw-de.pixelpark.net
@@ -67,8 +67,8 @@ site::profile::aem::publish::pp_vhosts:
           - local
 
 # Apache Author
-site::profile::aem::author::enable_apache: true
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::enable_apache: true
+infra::profile::aem::author::pp_vhosts:
   bmw-author:
     docroot: '/var/www'
     servername: red-bmw-de.pixelpark.net
index 4bffb396f495a9d8e0a84593470bdacd5ec0fb1a..7578a13832b36586d8b2087f2d756ae5e304fa2c 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - repo::redhat::zfs
-  - site::profile::aem::author
+  - infra::profile::aem::author
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index ca11eb5f6a9c377748321c114c133d89bccb0f91..1be80b578eefe91b3aad39e1b259a2bc0d7f5dc9 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - repo::redhat::zfs
-  - site::profile::aem::publish
+  - infra::profile::aem::publish
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 2675cef36c206cf2e26382e91f455c2b148c97e2..7ee48a76cb73367f5238525fad3b2c3a176844c0 100644 (file)
@@ -30,10 +30,10 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
   - apache::mod::headers
 
 apache::default_vhost: false
index 19456eb011c7866a037e4f2fb00644880bad495d..6fe6d9616cfbd5a02c35319818aefac25a6bdf79 100644 (file)
@@ -2,7 +2,7 @@
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjgIlslu9h1hCzV+n9BsoynXr/T9ZPJhAXG/7Bdo3U5ruwLLFpulw9JOYK9LIoo6hnU6QyH3zbiOt/iHuv54eUhZOl5KfRBZ+xtNE/lxE17rFA1LqaC1X7t7zLp/+nH7aomxLo/l1+JZKaQQ2WIFvMlAodrV2r5PKNy8Gv8U5D4r7tkRqOWDFuuVev7LLbOOE4uMIooZUDlhkPHJNmIaB5u/6myAsIJXUXbKsdLiSzqQDRMoQ9zcY79XDJ3LGUSRFaoPZWBPC5SdHjEREjO6TS8kKBHm/VjyR48lvA8LSEWhgjfBXXBJGSYIgIZWIaecyZyFsUHVU2hImkTw/iKUXwjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCWrXNvB/BgelVcWZJ0ZdJ1gCAlUcbqItPp6qDXbqw+kdRYPuq4jkZQ1+EBwTo2oAnLrg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAObdig3np1YiIvoZpieJn4Flaqde+wl92yKVpbcL9IY9m264t7PVYl/nEpIMgcAd84pwzgw7E09slwLPQW3NwW5k8deViVn8P1x4A29lwLDmsd5+gSzFb+MNNVPtVYKginDvFvZwdEN77qG4bWos0suQX37uoTRxCAPasF9UMQK/mwSgrxJTY+j7bOSL+QcIrvzORY8X1acLBk9MyqKAB1P2v70CP1Z89GANEAvoWlaRzdqGNoQM8mzbMm/+zjo7x1CkN9Oay/JW8Fzfe0KH8DCeWV6+lpIXRzmHlxUufTB9EglU7zbV4+O4VcMwlwH8BafLU5FWRCRnptcAiMp18hjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBCmPPlAsT69iOLKsbzpYXUgCA7LmKNjWfA7Uhj8EQ4BUF0KFiKKgNU4r2WHzuofClMZg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   gruenderwoche:
     user: gruenderwoche
     password: jI8AS9FZycSPdFKY
@@ -10,10 +10,10 @@ site::profile::mysql_server::databases:
 php::dev: true
 php::pear: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: xZAnxmu5hjAQoK4b
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   gruenderwoche:
     version: '7.6.15'
     site_path: '/var/www/www-bmwi-grwo.pixelpark.net'
index a0aad7b127245793e5be14e2a09e0818a802615c..f765dfa746b939f672267c65269b27d72fa2d9e9 100644 (file)
@@ -2,7 +2,7 @@
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKM93awmoEa2WEyRFI+eL9EYUBRCJ/zC0K++uppIARvaJNqqbFT0ogK96QByY+w7VBDU0KQjYZKJai8oqssxLQYqMT1AT1S9TtL0epDDUB24VYMeJ6zKCN/v2jnYmxCAV5v4yhrkFXJzH0yQs7jh+vaYVM35RW2VM9hNeJG5P3yxPXMYhEcyt/elxJSSnh7salh3HkbwB8C/B7Nw22wp77rklO8eam/HIqbUHuM9ul+EyAmxoCuTrkH/m1dnPX4j6mik0PxlHrWvIaAVkBReaRBFqkCRzk5tpCPuXdDOO/GcNg6yBuR6uhiS/uwgQIA4wy76xD7uOm2OHrYJ9+J24azBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYJ5DC4CApVNQSZdPkJd+JgCApAjCGGqY3We5lTVp5e86JyrsAOQDRtV4mlFksGhUPGg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAR6xsBx3+S8bgkaf/UHyA8Fn3XckANuwX77FuYAQ6Y547pL7cfFulnix0H6QZCTs9oIg7wS5hTnayzWbrQpuCBewql6Muei/dn6mKYLFu/R5Nmou03fBOT6tVPlT4TPqtD7SFbOj1LWzG+gDFxBvG2AZMEB7OWuIOdfZmLLu2TeNuit/Zgp+s9n1JpLn3JWleRJIVczeuJQuVAfKzufxe1ioBu7IVkt8XEDsYBGKMPlagXoDtRbzot/yxBgZyere2mSU2EpdD/Tf/toB/1dMfcoGx4a48f5rrm6kpfA00D7AZld5+u0zuJLd+JtiDau0ikaKBKP3yBCEKLFprkvNxGjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCerbX3z4ZEwIOpC8KbPuGvgCCmVI6tSzPxvZ5iKzeeCJ7B5foNlmSwhnwQEFHau5HcCA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   gruenderwoche:
     user: gruenderwoche
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjbWj2SRIrcSFjZWW2IouMdjAyYPogSZOymjom9iJnk5D/BXhcX98uTONAaLj8mwPwOIUVNjwqZjSacSfSHuA71+qJZQ9wrbQ9+ce3Vpg17WcBUJ6xMw7m15UgEYsaGOSi2cD45GlfJhXMwibx6ePQFmFBRoAHS9X2x1ClNc55Cckjq8vusxT6jbNplT7ay9e702972g0n6H7BCjwOSb/64jEb4UvEscGsyDsk3qSCQnX+2KkGq7QJ/VXrK/+c/QZJRSQMKN5h6Y/Iwjmd2xSA4Qeyfdaq6A87btahNRKI0df5A0XAkvjdSwsLZ9/i1UAwnYJ39W+xZi3Tay9C2QauzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC/OHqFIRcXklWevSYpDv8IgCAtODviOzmnSTqlsI/7fBUvTfctyqFYRnD8tePiWc3UZg==]
@@ -10,10 +10,10 @@ site::profile::mysql_server::databases:
 php::dev: true
 php::pear: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoTIYPVLxCsFFZV0+/1WZ5AvEJwIkT9EgEFmqpz5Q7RGZn385ZvJwI4IJKwMjVzny6NUbnPlw0f5yiTAK2TLHKYNtVamTopFYt2E8YEG6jK82w5ZHakZ/Fa6RfsccoIDPty6z7MM64wuNpmpPxLzSg2UXYzbkKFd4e6NnrUh5szbctc1db6NnRIlKEm3iKe7FFwF3blFBBZhY8ms6M6Uj9gh9xK7c5QA0sjUZd/0I+foQvmIcv7aPJabiQSOhLkTr3hm7a8VyilC2AmpfP98Vt3vJsWxJL4a7tvo0c+k6aS0ya8gxy984fOAGjZhQ1mD0XIxbc3klS9l6IJ2d6cNnrDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCFr69MvCBcz4vbKTcJV1mggCDbDDdruL+0FBBIGmtjejj0L6q02F9+/Qq49MBjkSaIjg==]
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   gruenderwoche:
     version: '7.6.15'
     site_path: '/var/www/www-bmwi-grwo.pixelpark.net'
@@ -127,7 +127,7 @@ site::profile::typo3::projects:
     php_admin_value:
       max_input_vars: '1500'
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   magazin-exg:
     servername: magazin.existenzgruender.de
     serveraliases:
index 2cacba9bb71d7b74b82b39a005d381220cae95b6..020bfe9baf3bc4098a7948341ac95361fa61ecdc 100644 (file)
@@ -2,7 +2,7 @@
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVvmiQtCIC3PdhZOWHBHSE/S639igwLABG7VzOn4MrByQSzBvPhilFFNw+aUHyh2MPfsHAGFF/IFWZkDqmySFj6Q5IuTBzabpwHE1DhzR+8DLmKxtOZ+zSpIvfa+h0s8FX1GGqAVY8Et0JbB6GnZ2057T+Kc1IgWZf/mKmvM2EHFfgsqcLmw4oxz/rdW+Q6NOMsmcj8T2bZCMXYopI3a9tTKeOgHkrs31vyb8MWHK68xJIWPGaSHFVKyaPlT+b33iMCC8MVv838vhvLfe9sH5GlakgXs2OrvAW1ILwXpv4jES73gBUEYXTRUvMAfET4NGJXZcWYiYYE3DC4/kbc3RlzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBALGuz2fgEW/gJl1Z6DYl+3gCC7rPlCsmXnXNftgfyBqLhjkDnnCB8m3ZZtdqI+jqPa5A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAH8aQQF8KILPiVmPySEqwxJrVjWuQcen0taWGCum1dUXC9hPsALJ6x5b85ZcfQxyPbbgu6Bsm0L0Uq3bRC8ev1nxvokX6xtFJfIhcL9i/c5RCAVdmehed5VdqBsc1y+tVJzfh0ZN8SZf+bgJcgm9RfnNdBoxQuiDDGrPdohXjRP9fDjVwfaRSUNg0cibTHjmzOYCR4LNMwSU9BzXz3EmEjF7WKNOtZiPfL8mjVqMzdjeGX9MuvFpTnv2xDx2HaHEBeLc4ENeI204i3racRjHgSQ+gsCi/lw1CFBqu1ITnaFvNz/j7oDk/3QzKYVJMaIGW65Q4AR7dAUwXKJBhbDqEgTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC+iMSKZotegaehCfw7qVf4gCAhociax3RDRYybTqn8GtBqXh9iiXbCf5QIEJYMjEKoYA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   gruenderwoche:
     user: gruenderwoche
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASEsofS/5YgozpEr4LoyDLRua2G1C/sK9ELdaR/bQVSPxCAjO0gCxREJBB1wy57F1psNIkv6xqI6PMhzOwXs0qv0ZOhLAH9pJjp44fRyuJZwTmCcysYFCRw1YOvxm8R1qnQu9vLrEFHmvZFAwXRBHkVnw+upEOxWIUwkjmOOx+pMYzX51eMxT8KiqmoVBEqH5AYFKnMLr8jWE9bdpRaaF79kwwWM0rO2VDQga3uClnoxemsByfAwTnMPyPuXslGo70FLRxvP117lAORjOTG3+e9H3JkSaF0uOv9aRu2IaEuDmsAWeiwVTE7nZ4zSDttrtHBGnu42yW9C4m8JBffZX+DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBLqFAJLkOOEo0h6TVHdaj6gCCnARDoVlsXYt74SuQSfA/qQz88vM0OnX0k+V88SFxqkw==]
@@ -10,10 +10,10 @@ site::profile::mysql_server::databases:
 php::dev: true
 php::pear: true
 apache::timeout: 1800 # temporary for migration
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAL/9BZJBKMne3z5KC9A3kUCz1LrvEteRUPnwkQiz+qT9YhZDfMQCASZ4e0ylxB4T/55XM60ajDai22y2gPq4jDdMqFLeWYQy+1WS4kpeMTf465KuWrxAQUtVFEBM+PQe53+4USr7KSVUofufOA+UCCb01yQIfN6QPxRMij9rcCjRU0fhbtANkOGxQyzm26ECTPlTBjaOl8+Eaa5Z0CMs0Y/O7KzoawbWPRe7ESd2CN4Ooyabn1rrgMCzQeVfZ9WqCIKfhYGaFTQX/X7QHOXwYyMJJdwAEw2GDUecbE2dG0U0no1uzth4MfoPiPTvxhbg3otLpbSVBOt9rxYH0XxxLujBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAK+e31GjupB7aqXOrl4zvdgCCnwwYIL195PyxzFkEvC+Nnft9rdjC0JQSTNH57MKmQWg==]
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   gruenderwoche:
     version: '7.6.15'
     site_path: '/var/www/www-bmwi-grwo.pixelpark.net'
@@ -44,7 +44,7 @@ site::profile::typo3::projects:
     php_admin_value:
       max_input_vars: '1500'
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   magazin-exg:
     servername: test-magazin.existenzgruender.de
     serveraliases:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 5bd131cd8b165e7fab367c108579fef63bac8ce0..bf42d7b694f0b80f676330eb71dbc267b3ad0b13 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 accounts::users:
   mike.milarc:
index 5bd131cd8b165e7fab367c108579fef63bac8ce0..bf42d7b694f0b80f676330eb71dbc267b3ad0b13 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 accounts::users:
   mike.milarc:
index af95ee4511ff7236e9ec4bcf1a38e47faaccd686..03c1b0f2af7be56b73ea9b59005a570a2399dcf6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
index 5bd131cd8b165e7fab367c108579fef63bac8ce0..bf42d7b694f0b80f676330eb71dbc267b3ad0b13 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 accounts::users:
   mike.milarc:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index bf7395f883453b91dbe619621e9b48843057f6ce..a86ae86de67547284e1baefc58a37fb7277120aa 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - accounts
   - pp_mcollective
 
index 55c711f1aa495ddffcb9d7bfe584f38e4055aa0b..71caae4e5481ea163f4fc1f389c469be4a3dcec6 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 accounts::users:
index 9d30be274ddb0d2d2b020617b0ce5661c3c9e1c6..1a29cf47ab67881405c34daee30339750a7bc9ca 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
+infra::role: base
 
-#site::additional_classes:
+#infra::additional_classes:
 #  - logstash
 
 logstash::generic_resource:
index 5bd131cd8b165e7fab367c108579fef63bac8ce0..bf42d7b694f0b80f676330eb71dbc267b3ad0b13 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 accounts::users:
   mike.milarc:
index 5bd131cd8b165e7fab367c108579fef63bac8ce0..bf42d7b694f0b80f676330eb71dbc267b3ad0b13 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 accounts::users:
   mike.milarc:
index f43166890d34281dbb0439feea9a52323d23a1ec..a203e2c8df92c44275e2bcf34511bb5568683f4e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 mailman::enable_service: true
 mailman::site_pw: 'CHANGEME'
 mailman::language: 'en'
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index c1c14da01908ea442169934ae90ffe338369a1de..c90ec476aad915d4a05de6a97939c2082daea259 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::role: base
+infra::role: base
 
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index b7587f0f694823790cf32836022faa46dc3eecc6..a0aeb7cd4df6ffd45e596c566e6fe0328d793d58 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
   - logstash
   - solr
   - zookeeper
index e09df46da398be4a16f8a52e90888a6146e83aba..3b349ebf96ea3942efeaad580b291ba696e904cb 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
   - logstash
   - solr
   - zookeeper
index 1581473af82fd733d75237346e3507a1968bd0c1..f0281d3307b9fcdaf50f6a52f0a39eba7abd8436 100644 (file)
@@ -28,7 +28,7 @@ solr::cores:
 
 apache::default_vhost: false
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAA99fMDcku0YVZ6iGjWLJ0SyNookLa5DcQM4qy4ccId+UgOS/7fRcjQa3+TEPH26cBnH6yU3nqSPEoB94NtG7oGUP/UYJ0gFDBoLDvixGKItd4NkTYU2Ac94JjFRF+FNxXTvT9R2oPoJPsNsKM+lHY7d6oPD2FWCEyt3vjFxV8Vi4no5jDzTttiwtB/RMrCHjKoxjVHHh+f12fFvCgFS1tDTxWeckNESvD06K8kHjTgRuVP/SrkdKeMIcW09MJuLRlQjPDfGfOR0fncUwL4M4DtDZUs1ZQMszf1A+WpHst8EWGRAMVfZlW7LmczxdZLDlE4g4uRWLospi0YBFzdtYPDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA302qMqHx/UHmKRsDlv0uogBDBDvhIN/87hDeBt4DaAw4u]
 
@@ -44,14 +44,14 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   buschjaeger:
     user: buschjaeger
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANXY+CqjsZhYlwL8a7tG4QghAFhWEfa3nFyjv9nUW3pC5R+GkfZY4v9Cic0cFx6OAuXYXxHVhNAqjJ5a+fnk4CQShW0W4J3Tj2eULc6gN2qvnlyQffYpU6Q3riOgfxvM11yi7U8Z5F8B7rWwmsgLC18c/NIq2WH9Wzl/AL6VPESDKxB6hTYe+QVqVunaxL5tAf6f79A6ixAcxwtW3Aduh8PsjIR/yD+/8l3YrEY5n551YBSnWMblvzAhDylF//tGx1X1+O3aUOn27NPC2j6W6Jf+Kv1o/ncevzlGmycRPb024UTseNfrNVxeI1sFQFyly6k292y8LEJiT8Q6gJwD1wjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDeGfUxqEwhFpI7qcJ5t6EcgCD6+Y34GhyBcZUS3ngLYlYiM8SF2daJWsV1FKxO2eVhZw==]
     host: '93.188.107.%'
 
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   buschjaeger:
     version: '7.6.15'
     site_path: '/var/www/html/buschjaeger'
index 1467319b6ccfd50786e12789b02f7c94cf0312be..92ea949b0d364ff07cc48538aa1f3dbbe317a0c5 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
   - solr
 
 accounts::users:
@@ -33,16 +33,16 @@ repo::remi_php70: true
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASNstNQOCo8uMJelKhHYYb2+K93HY8AFHpBrjsgE3i8L7hxLi2+HkIb2mnQCyCXuJ+DnKxJbUeHbLLExSVK8SVm740uq8cSIqzDAykWpML0fR7/7BLvlcmtwbZ3CjE1o3nKRnSYr0203VYAipWJnrbsSUTbOzXLalmx27u1a1zMv84uCH77f+RWDbR60glqC32nCDvgZ7MsD1MPIS8NW7u8/tKmrr9+4hPhyDLD0rcAnwDCGjENmxtodmPJb+fmNelgpFP4IgPK5MMQquJbskZ5Q7zMyW71vWI55XgtEyIhfb91rpKr9Q6K1h8ljQ7N1LTUfBFAg4w7M+WcJHlIEZ4zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBf37OGlSaT5AYfsVlybM/GgCCXP8RbLaqs5fXJo0lRFtVawkBqZ6XD+gj8008bkmwPHw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgIXGo2subpsANz05/Clokty70of1dQGyHczL4EvtSR5MRq137V/V/ZTFO/m8caMwDfCEpU3XCpYzbr5RL5aAc6UU4teLUI4caSUCWOnA3oBF517LFdJU8fbgi5r6uPp0qXU+CIWbRuuwNFa7Pod/fd0tlU7IWO2CpFe+Ku6I27yoToct6b3DfjeptDlSZvuNAIoAa821gw7g5f4NEjsCoNbIKRleFapQJ13OgTK4LZ3wykxZ081lqo3CAjwkA0RDaFEpOz4VgpMM8wRkZ1qd9fM6nDi4TtUcpZD5W8idngbXTgYlNfrZFtVKyTSeNVkmRqO7R4ONVY2N9eOwoVwvTzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC07hf0xKpQLjXKruIx9Jt3gCBz40EFWC07F+o2DyZcVoxg9Th40oQztEyda3/L6DuAew==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   buschjaeger:
     user: buschjaeger
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqAPfjkpxjcB5OcaggCEMoZHgfmgXMVfpG0ND7UBSK8O0nYKGS7Z7CP1SrrRXxU3HmSiwhm0t8BE7j1E4wtkeacvv8rxDN85FE84RtDO08ZYNH48SZ/FUpXbLtAAyuP+wF2ZGBHtjGGYHYDP0XJpACTVgExkN8vyNa8N7Y5OPZwfohbDZQZEo2kY0NXeNnGEPKVgzDQevtlbScWk2ut8xDf0hL0aqa/K+iDqC1OufylB1VLoDEWWKKU8baxwZTVf4f4GfbkF96tqt+RTMfh08Zxlq7UOK1bZNvkKs/ThxsxffmtMhkcBnB8x7L+Ft2+ylK7SBwql+CuwJmE6Xiq0hFDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCiYj0KHXpkMN7Rn5o+9LC8gBBoSH581Kj/zsC951SN/uis]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGDX73w7OdqMbm4JkeBBJVafsYx4OGYDCqfrhzsClhupNMp+cMD7HY3MeUEfgnt4dfjxckX1ZrOaJrswK65FnoCzBCK4rGtYAOhl6ZKbvfIgEQy2dKnie/3C8oc4x30LTKM/c1Tk2YeNdxu5MPFrUhTTiLYPt1vSXG7NJ+zXevKnFS7cWFxVL7B9NuUdZKK3GBgAEp7NBsyNK7/N6gVXAXRYH/nt1/3H4Lb9THFsqa/FD9juCfC09h3liuJpsaF89ViwKT5puccuR4jBdf7wRZfKhFY1UDb+7Y6D0iZ85MKMKmpoeOc/CRXnhQFkfK1wG5i2M32flrVWU9iXAM6+tDzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCgeAiSxk2sF3Jm+/pCCqDSgBBKvchnMQMHsgMGCOWaJ4ET]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   buschjaeger:
     version: '7.6.15'
     site_path: '/var/www/html/buschjaeger'
index 4a48b46673b28fd67beab0dfa1e1426bc11d6575..9d5a7cc96dbc3fcf2c1e28ee47e331f0df8ba6a2 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
   - apache::mod::headers
   - solr
   - zookeeper
@@ -35,7 +35,7 @@ accounts::users:
     apply: true
 
 ### SFTP Accounts ###
-#site::profile::apache::pp_vhosts:
+#infra::profile::apache::pp_vhosts:
 #  update.busch-jaeger.de:
 #    ip: 93.188.107.176
 #    docroot: '/var/www/html/update.busch-jaeger.de'
index a502235e5a869541ea8fe33fddf6ed77c79a8543..3421142d8feff32324e2199ea96b5d7b1172f1d4 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
   - apache::mod::headers
   - solr
   - zookeeper
@@ -35,7 +35,7 @@ accounts::users:
     apply: true
 
 ### SFTP Accounts ###
-#site::profile::apache::pp_vhosts:
+#infra::profile::apache::pp_vhosts:
 #  update.busch-jaeger.de:
 #    ip: 93.188.107.177
 #    docroot: '/var/www/html/update.busch-jaeger.de'
index 74b1fd2ced3a9260e96aa4ff4c038ad73b0e38f2..41e9f322aad92f4ec0afad5fd5b8dbab30d4fe1f 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - java
   - accounts
-  - site::profile::cron
+  - infra::profile::cron
 
 java::package: java-1.8.0-oraclejdk
 puppetconf::server: puppetmaster01.pixelpark.com
@@ -39,48 +39,48 @@ sudo::configs:
 #
 # Author
 #
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANje1elaoXse8wFd4QxETNifOXtNfGTx8sCYCo9ccVZLhnP57XeGxZW1W0HyxVdQK1reoKDwKhFeuOMrrHSL0qd8o6Sg1kP5m/AgnL0Grxfxc8WCQQlHALshpQCYNJNoaLTcSxyYm4IXwXTE9WlhFlyR8g9mQFh04v8SqGtP/zerzN3Dnbl1FUv1P/hX/INHm+yHS2Vnl1LC4p2m6XKUBH0FnwTaG0k/RG3xMsXd78/+tbqqjcBBMQCDLz7vDdV0kzV1dur5bFYY22XV/ya8rh3KZLviaw6xZDYG19FI/4hZxEuvNciAL3Nx78D02nX/gKNmSj8yg7sB9PYX8pSgkcjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAYdyd5FPaMFRMFMa+/Wr7gDBEkwnMCMZRX9f8aUCpkwsayki+sY+zshF/67FlAVuqK4Pb3x9fbZ8wbE5mPa0BhZo=]
-site::profile::aem::author::license_product_version: '6.1.0.20150507'
-site::profile::aem::author::license_customer_name: 'Day Training'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANje1elaoXse8wFd4QxETNifOXtNfGTx8sCYCo9ccVZLhnP57XeGxZW1W0HyxVdQK1reoKDwKhFeuOMrrHSL0qd8o6Sg1kP5m/AgnL0Grxfxc8WCQQlHALshpQCYNJNoaLTcSxyYm4IXwXTE9WlhFlyR8g9mQFh04v8SqGtP/zerzN3Dnbl1FUv1P/hX/INHm+yHS2Vnl1LC4p2m6XKUBH0FnwTaG0k/RG3xMsXd78/+tbqqjcBBMQCDLz7vDdV0kzV1dur5bFYY22XV/ya8rh3KZLviaw6xZDYG19FI/4hZxEuvNciAL3Nx78D02nX/gKNmSj8yg7sB9PYX8pSgkcjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAYdyd5FPaMFRMFMa+/Wr7gDBEkwnMCMZRX9f8aUCpkwsayki+sY+zshF/67FlAVuqK4Pb3x9fbZ8wbE5mPa0BhZo=]
+infra::profile::aem::author::license_product_version: '6.1.0.20150507'
+infra::profile::aem::author::license_customer_name: 'Day Training'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 
-site::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
+infra::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Author
-site::profile::aem::author::oak_version: '1.2.7'
-site::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::author::mail_to:
+infra::profile::aem::author::oak_version: '1.2.7'
+infra::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::author::mail_to:
   - philipp.dallig@pixelpark.com
 
 #
 # Publisher 
 #
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANje1elaoXse8wFd4QxETNifOXtNfGTx8sCYCo9ccVZLhnP57XeGxZW1W0HyxVdQK1reoKDwKhFeuOMrrHSL0qd8o6Sg1kP5m/AgnL0Grxfxc8WCQQlHALshpQCYNJNoaLTcSxyYm4IXwXTE9WlhFlyR8g9mQFh04v8SqGtP/zerzN3Dnbl1FUv1P/hX/INHm+yHS2Vnl1LC4p2m6XKUBH0FnwTaG0k/RG3xMsXd78/+tbqqjcBBMQCDLz7vDdV0kzV1dur5bFYY22XV/ya8rh3KZLviaw6xZDYG19FI/4hZxEuvNciAL3Nx78D02nX/gKNmSj8yg7sB9PYX8pSgkcjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAYdyd5FPaMFRMFMa+/Wr7gDBEkwnMCMZRX9f8aUCpkwsayki+sY+zshF/67FlAVuqK4Pb3x9fbZ8wbE5mPa0BhZo=]
-site::profile::aem::author::license_product_version: '6.1.0.20150507'
-site::profile::aem::author::license_customer_name: 'Day Training'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANje1elaoXse8wFd4QxETNifOXtNfGTx8sCYCo9ccVZLhnP57XeGxZW1W0HyxVdQK1reoKDwKhFeuOMrrHSL0qd8o6Sg1kP5m/AgnL0Grxfxc8WCQQlHALshpQCYNJNoaLTcSxyYm4IXwXTE9WlhFlyR8g9mQFh04v8SqGtP/zerzN3Dnbl1FUv1P/hX/INHm+yHS2Vnl1LC4p2m6XKUBH0FnwTaG0k/RG3xMsXd78/+tbqqjcBBMQCDLz7vDdV0kzV1dur5bFYY22XV/ya8rh3KZLviaw6xZDYG19FI/4hZxEuvNciAL3Nx78D02nX/gKNmSj8yg7sB9PYX8pSgkcjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAYdyd5FPaMFRMFMa+/Wr7gDBEkwnMCMZRX9f8aUCpkwsayki+sY+zshF/67FlAVuqK4Pb3x9fbZ8wbE5mPa0BhZo=]
+infra::profile::aem::author::license_product_version: '6.1.0.20150507'
+infra::profile::aem::author::license_customer_name: 'Day Training'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 
-site::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
+infra::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Publisher
-site::profile::aem::publish::oak_version: '1.2.7'
-site::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::publish::mail_to:
+infra::profile::aem::publish::oak_version: '1.2.7'
+infra::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::publish::mail_to:
   - philipp.dallig@pixelpark.com
 #
 # dispatcher
index 1543ee4301d5a0d6b25d93ebefaa3159e502db33..a940ec645e00a778fe8b239fee7d3ad24e27f544 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::author
+  - infra::profile::aem::author
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index c6dfe7008dddc8894ce90c3fde109caf3e84848d..e312ceee534737ad66b332c93b9b19f42172174c 100644 (file)
@@ -1,26 +1,26 @@
 ---
 # Author
-site::profile::aem::author::license_download_id: ENC[PKCS7,xyz]
-site::profile::aem::author::license_product_version: '6.2.0'
-site::profile::aem::author::license_customer_name: 'test'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::author::admin_pass: ENC[PKCS7,xyz]
-site::profile::aem::author::oak_version: 1.4.8
+infra::profile::aem::author::license_download_id: ENC[PKCS7,xyz]
+infra::profile::aem::author::license_product_version: '6.2.0'
+infra::profile::aem::author::license_customer_name: 'test'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::admin_pass: ENC[PKCS7,xyz]
+infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-site::profile::aem::publish::license_download_id: ENC[PKCS7,xyz]
-site::profile::aem::publish::license_product_version: '6.2.0'
-site::profile::aem::publish::license_customer_name: 'test'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::publish::admin_pass: ENC[PKCS7,xyz]
-site::profile::aem::publish::oak_version: 1.4.8
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,xyz]
+infra::profile::aem::publish::license_product_version: '6.2.0'
+infra::profile::aem::publish::license_customer_name: 'test'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::admin_pass: ENC[PKCS7,xyz]
+infra::profile::aem::publish::oak_version: 1.4.8
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::author::install_files:
+infra::profile::aem::author::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -34,12 +34,12 @@ site::profile::aem::author::install_files:
       tarmk.size=256
       pauseCompaction=B"false"
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::publish::install_files:
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -122,7 +122,7 @@ aem::domain_mappings:
     create_sling_mapping: true
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   cosar:
     docroot: '/var/www/html/cache/content/test'
     serveraliases:
@@ -177,7 +177,7 @@ site::profile::aem::publish::pp_vhosts:
           - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://dev01-publish-cosar.pixelpark.net/%%{ich-trickse}{ENV:language}.html [R=301,L]'
 
 # Apache Author
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::pp_vhosts:
   cosar:
     docroot: '/var/www'
     directories:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 9a43db290d94b3d4299505ccddf2d00a5f7f0b53..166a9368a0d44c970ae53da05f014c8cd2f8f1fe 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::profile::apache::enable_logstash: false
-site::profile::logstash::apache::enable: false
+infra::profile::apache::enable_logstash: false
+infra::profile::logstash::apache::enable: false
index 98c11dd19a89021041819a9bd77511e7697c8483..f36504e4a60ec72daf37451a13f8079f67243bb4 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 accounts::users:
index 19fc179fa9ba59b4147d8558dfab4eb3430abddb..06c470d2e465333556b60f3097a7b6414ca8f848 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 accounts::users:
index c5ee114aea641a099ec3145a9016f8a922b242e4..4de5ec261961e02862a500c96ee24904d07d0051 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 # Appzone
index 6c2a1d66ec4d7d48947004cb688448d5e82d6e74..fc7bd1a092c18314118135bd7a59386d76eb6558 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 # Appzone
index 3a7d0d24e17304b7d256d1812d92b27f27def8a3..c73cf637a7530bdd42ec3b7f32f61e5f37805c12 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 # RVS Zone
index eabe824d0d99f8b7340a2134da6ef5e13fe70aca..45b4bd1378564a070c82371b8a86e504b6e51e28 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
\ No newline at end of file
index cccf38358564b6ddd08b2a3a852a1557485f97bd..cfeb8c9810deee7ec61d77b3ccbe1960ca25db63 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-#site::additional_classes:
-#  - site::profile::apache
+infra::role: base
+#infra::additional_classes:
+#  - infra::profile::apache
 #  - apache::mod::ssl
 #  - apache::mod::security
 #  - apache::mod::rewrite
index cccf38358564b6ddd08b2a3a852a1557485f97bd..cfeb8c9810deee7ec61d77b3ccbe1960ca25db63 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-#site::additional_classes:
-#  - site::profile::apache
+infra::role: base
+#infra::additional_classes:
+#  - infra::profile::apache
 #  - apache::mod::ssl
 #  - apache::mod::security
 #  - apache::mod::rewrite
index 776fe2fea062a7d4117ee04ed06b9224782306b9..f73a29f12753dc60f11c94d80fd45c0c95009b2d 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 repo::redhat::oel7::ol7_MySQL56_baseurl: 'http://public-yum.oracle.com/repo/OracleLinux/OL7/MySQL56/$basearch/'
 repo::redhat::oel7::ol7_MySQL56_enable: 1
 
index 776fe2fea062a7d4117ee04ed06b9224782306b9..f73a29f12753dc60f11c94d80fd45c0c95009b2d 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 repo::redhat::oel7::ol7_MySQL56_baseurl: 'http://public-yum.oracle.com/repo/OracleLinux/OL7/MySQL56/$basearch/'
 repo::redhat::oel7::ol7_MySQL56_enable: 1
 
index 4460a189021c0c71b312be8dc709950b106c2a24..50a6959f91069dfe585273366257ebce87264ad7 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-# site::additional_classes:
-#  - site::profile::apache
+infra::role: base
+# infra::additional_classes:
+#  - infra::profile::apache
 #  - apache::mod::ssl
 #  - apache::mod::security
 #  - apache::mod::rewrite
index 4460a189021c0c71b312be8dc709950b106c2a24..50a6959f91069dfe585273366257ebce87264ad7 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-# site::additional_classes:
-#  - site::profile::apache
+infra::role: base
+# infra::additional_classes:
+#  - infra::profile::apache
 #  - apache::mod::ssl
 #  - apache::mod::security
 #  - apache::mod::rewrite
index 4ab7227380cf690786997d36e1fee86e9131df73..401b387ccd4ce2e13bd003a0bd15fb14a7aee522 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 repo::redhat::oel7::ol7_MySQL56_baseurl: 'http://public-yum.oracle.com/repo/OracleLinux/OL7/MySQL56/$basearch/'
 repo::redhat::oel7::ol7_MySQL56_enable: 1
 
index 4ab7227380cf690786997d36e1fee86e9131df73..401b387ccd4ce2e13bd003a0bd15fb14a7aee522 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 repo::redhat::oel7::ol7_MySQL56_baseurl: 'http://public-yum.oracle.com/repo/OracleLinux/OL7/MySQL56/$basearch/'
 repo::redhat::oel7::ol7_MySQL56_enable: 1
 
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 95189ca1953846b0b96deee52d8efa050e2daecb..4d0e6b262b85c78e395048e0f597b44a83ed1955 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
 accounts::users:
   axel.knauf:
index 250490ade5f2d7111611af3e23ea4717c810e6d0..8bc531746ccda6bc872c20054cbdc2c6f1f16d14 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 5a3d5fa6f00f70c5038fb095022819abb7b04977..70e9230ec2e3693a1d79c580ac6a640bce3337a0 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index c3b2217805aaab3b0e887b3c78c920bd12a2986b..254bf8108f6cc584d9388f6950db26395070f4a5 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index db54031e4d5bb30ecbee651523eb4ce4ac196422..5531b044faeaa7df3520498eb0cb3e74aec47560 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 785fa821be19e34b8607e22ef95766c2a9ad0dcd..d78c832c9a038c5b63b527b54af7c3ef40278f6a 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 69a0fd78408c23df8799c1b479f5f8c0c74e16d3..b6b139af6a588eebccaa99a50a6028cbdd45a916 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   tobias.rotter:
     apply: true
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index fba98b0abfeb116c52ee2d99cc4fa7625f4f374b..cb6154b6ed25b432bddc3a335746f9d7cc2ba770 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 7a14939dce01b951429138ab06e695ad3023fbcd..c2c186baf026c7b22457122dfa1f99b0545a9027 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 4824cec1fbf9f4157b28f1df630ce69ae8b2cb1e..a3e10a9b6390eb6ed8c08ac8758c1b660831d613 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index c7ca7e628777670bc5f18940f7cb5eab1479b1b4..db26ec80fbc204c9a06ec202a75c0d504d1cce6f 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index dfe0fb8f018305f4c88def327395cfabcb6520b8..a4694f0097327553cffffb1d52f2615c6f403688 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 
 logstash::drop_grokparsefailure: false
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index df5b062d37d7cfe82274458efe40584e8cdbbeb9..b77c8fb2cd8f9f4078990ddb25a56ef131aad30e 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
   - logstash
 
index 2c4c8aa93ec726133cdd4c8ed040a4d78324e9d6..713fd3700ccf9512a42301f4fa43dc1e0ceb75e3 100644 (file)
@@ -11,7 +11,7 @@ accounts::users:
   
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjsUBgGkgr18EVCOwgfufPrmu1mCq9hwAj5zAGUQs2auf0QsLvn8/+TugvpheIraoQ/D1Ux1APtTcqfgoIA7BLDNK2ynYHvUT69B31ieX4ZqHZVvAKTL2KAyTdCURR4RoXyDAz4n4600xpslakIx7ZOqjRu+HoEA0oFYZ1paF9KExBBdGrdNKDR86rpl5ImpLOvKbt3MzYsVX4KCcY5L2bs3H4p0TIqMZlFQNvC162euCij1aAfoW8fXJQ6upcOkTxB+ByGPyw/g24SQEw6UjzBnrIrviNC8yHfZRF1oyd8Au39kSMNzes6twIoWvLPOPazjEFxjv5MzeOIpk4bMoTjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAv6rydRsXTjWKmDrt2VWWvgCCOJAjP+FiC+KhyqIsKM01zbwhYStOYianhOtLj9QvWQw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUwttipMSbtNA/fle3i8++i6e5QdJY4Mjdd7AGEK1F59uwoK/rt2tOJHeBSwc4/U7/jzKKwZB1QCJIbwCQe2PIOn/A9OgTzlujvdsCn44DtaWB/RpL7JhQgClQdOZIXWie4EzGp2Q7/WVXqmJ+rJ/ylnlfkRwvfwqLTNhhFidJ+FRzqhpDRY0V0l4HzLuDaHOvXrGkqg6yMyBdFce8HU0bLNEjXVg5Ku1sZkA9oTQHBCLNdV+FDlUSI2cPrEf64Rvf0Afv1vWgGtsY1pfzoJ0mi0fgqW5RDtogod0ZYnjmEAUZE5lM9PMCBsmadu/2Nq+PdzeXF0AsA6lxwnc0Z+jFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB4Sk7b2cyOKF5fxcgnHV+NgCBeOzjCBeYZzq0T6FU2iYdAjQigKiXGTU33jC2ua7U6+Q==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   dpdhl:
     user: dpdhl
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIl+3liXiECefOfZt4ad6Khqw8iyYTnXBi7rUbkCHvL+orLFG9moDU++qfmZdjDL2clGLuFRZy9itrlTqOe5yl0PHPbzkcncBvpUopVjABjtRa6HGoDdmpEoucoHiaUvmmWt/YrNzSAsBWgIBB6piGLuKhUc70O/rvIUajb9Ml6/eSIL1I6Hva+ez5UDj7ooFk13AW48qiA+M4aKltqbBeOxmuAI2PT7EMdrTsr4K006p8J3VbJ/mWPMyH5d22FSrwlPBmDZVHNazJ8UE+ySmJVhlXTNfvXBrDa6D6KFKudvQuB+xbjQo9HSOj4vdskGPoCeXVecWmX0LrLVUiH9rbDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD+1KWZZ0bbxlol/jegoL3FgCDijv4sqonEfVWHwEHwA0OGNr6S/tRY2EQgb7DQAjenEA==]
@@ -19,7 +19,7 @@ site::profile::mysql_server::databases:
 
 apache::default_vhost: false
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   'delivering-tomorrow-com':
     docroot: /var/www/html/delivering-tomorrow-com
     servername: dev-delivering-tomorrow-com.pixelpark.net
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index b3f2372e87bd42dfdc251d96f3d0bdff3b460f5a..0151fbc13beeeaf6d32f6a87852063a5e5679dbc 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-#site::additional_classes:
+infra::role: base
+#infra::additional_classes:
 #  - redis
 #  - elasticsearch
-#  - site::profile::logstash
+#  - infra::profile::logstash
 #  - kibana4
 
 redis::bind: 0.0.0.0
@@ -69,7 +69,7 @@ logstash::manage_repo: true
 logstash::repo_version: "2.4"
 logstash::java_install: true
 
-site::profile::logstash::output: []
+infra::profile::logstash::output: []
 
 logstash::generic_resource:
   redis1:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 2e6aba281bf02f11eb42db06a6bd95dded6dbc46..65f4d9c887661de8ebb0bbab892e55660003fb50 100644 (file)
@@ -82,14 +82,14 @@ sudo::configs:
       %dialog ALL=(ALL) NOPASSWD:REMOVEPORTAL
 
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::headers
   - apache::mod::wsgi
   - python
 
-site::additional_packages:
+infra::additional_packages:
   freetype-devel: {}
   gcc-c++: {}
   libpng-devel: {}
@@ -238,7 +238,7 @@ apache::mpm_module: event
 
 apache::mod::wsgi::wsgi_python_home: /var/lib/python-venv/esysta
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   portal-http:
     servername: portal.esysta.com
     serveradmin: dev@emperra.com
index c72bae746016c3e982a0b8ccaa5d43447a16f1e4..2748829e9fdd6981c80a7f041e218fb0d5efa917 100644 (file)
@@ -125,14 +125,14 @@ sudo::configs:
       %dialog ALL=(dialog) NOPASSWD: ALL
 
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::headers
   - apache::mod::wsgi
   - python
 
-site::additional_packages:
+infra::additional_packages:
   freetype-devel: {}
   gcc-c++: {}
   libpng-devel: {}
@@ -159,7 +159,7 @@ apache::mpm_module: event
 
 apache::mod::wsgi::wsgi_python_home: /var/lib/python-venv/esysta
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   dummy-http:
     servername: test-portal-esysta-com.pixelpark.net
     serveraliases:
index ce2591ff9f7fa08c4e0cf196db3cac7337e5311d..c1018a2ac6c00e4a6b11e5f095ece7e2d30dbe60 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
   - logstash
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQdcLAa+Rrvg81dq4fpZOhFwbmE/BU/sNsJYtlPKlVxIkvY4udMbslM5pA4S6AJgjFF3CqLyZn4rHAXn2ZBxBYkChQ498+W30+X7dZdgPF1zhLtyKBtEjFb4scu90xOgZ2pvuXFWE7v22sUH0fDBLb/4Qyq9DRGKKWTM52uI4YOXgMki1Jp4cnmdRTHwaFfRLF9mSG4kHPJEpf+EAtOzIFj9Rga1GszkhjlvPHwzuHO1FCsjuHipeCywEzvSCmXPuWsScRFVQjzqBDZmYbZG/kvvAHbB60f08P0NpW9FBVhy23x0AJzsRAjD6cR2ChcfTrUXVq3FVBWv9w+pRfM+5pDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDqvUkBU1mMjvrKhcwOjcC9gCBnKKst5OUsohlxnf20wtQey5kV3DqdzmL+BNo4k7Ct7A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEARu+ds0/mOiBZ1Z62cNIH8CycPi+ZEQbn4W/izHXS33GcNTx2xRgX4RX7UPbWZsnPibwB8/072v7iypBS6bC2HT+PJT0PHrFxabSdBmrIAN0OVlDW8X1YcFkRg593kE6YNY95WhTRkEP+YXnIMNhFOGLbUDf3bgr0tWZsVeoiAZ55MUhFMQJurHXYUcq8tBt6k5CrVD3IS/ZcRR3eBi5RiK9k+SyNsV5Gc9UMtR4eQnxeuUAdSHFaksV9vt6SHewLKfKDwW7jxAPhSem6Lkib+Af6meB1kgd9cNo6MAqLHmv178g6grz7HZIFONKfTRec5o4mUA6Dz2PAuNFllb50tzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCV3HKnbFEKTjjX6FXRCTRZgCCb76r8Ld1UfbjSjAUuodkQLP6M+m6BMMSrknWx2Uv3OQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   emperra:
     user: emperra
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAV2nON32H67q2UZgy0UZ+Rpnk66Dhv8Wvez4CDjWy+n9xgE7WCjRrute3KwKDnjdfLfvaYgG4RGeVLlfeYER13eHvLmHgAQdGUmWaQBhkbaCJQrGxY4CSMhanKv4S1jR1g7K6pPaOxOQ0H4vLfRgEVVs72oAlqrPOw4xQ7aXmJryARROmbJjlCiNF6rMTQ06KRpHGfadgWzNRd7++IvDrrtu2PTzfr7eEwOSeWwnCDPPrrxJ/r/jnBdEYKrsEVaLaqMfNp7O7t/QXYBosAenBApmIqF3ST45HvTrIKbkGFXmgA4JZGNRRk29BrdMlw2zbRH9lpW8Requ16Fo198IK2TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8cgKeNlD+SYdLRF4sEyuagCBzmwQdCV2PeNUCjkf1S/MJ+LkoBSvwRwaQQ1j7KbCsMQ==]
@@ -24,7 +24,7 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   'www.emperra.com':
     servername: www.emperra.com
     docroot: '/var/www/emperra'
index 266716b353e78d00e5a845abe35d75ebbeb502fe..7f7ba235937911de5f4dc22c2d8601a16f0de474 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
 
 accounts::users:
   markus.baumann:
@@ -32,11 +32,11 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoS405UErGdABrTEbiT9RTT6BBAQvgrVCww76IwoVWmerISWrLe7vkX+fG9wuaeLPBGaCE1AF+TpAopn5y+7cab0JwYEpkfBTfyBff5psqymb0+OYK/rt7si6yjncdCX/YG0iHAd/I/veNQk2ZQls1FBl3Re2pFISTQUalHf812pn8vRkmuTiXIr5oxH6CbXYKyikKhVxfO0BDzOt6tGvNm6SGPSZakvsGdhwzrxY+hbMY9sGbK4Rg2LdF259F/zLKxTf+mGHX+tWKDdNnhC/6Q/mfgleObJYDgocJE6GoEM0UDAQJGDXhW3W/Zw9nilWqrng1muTEy8mLYhzdoLjNTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVOpScmtiJKkyJ7GK25Vd7gBCaTLPmlL54qrAKp2tUdu2S]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/captive'
     servername: tstcaptive.berlin-airport.de
index e0d3dd191296b17bdf8870a5af0e699c3474cc5a..41b3fe1a7ff84d4267e10357a5f885956b985484 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
 
 accounts::users:
   jenkins:
@@ -14,11 +14,11 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtWl7/86zeNqLlwrzd83QW50Fy2tMnsfWqib3TTEQy0uN0DCsHv2izUfdDXYs3nwfgFG9IitpCdsAiMzDVbIJtXthnazJiikJYs2sh7OTJIN4pRkWckGsuLwWI2DMW3gTvhArrXuonY/xM7DOTFKoAVcFnyQ5NAqRirOx2dS8jOgKnVCny8uTNL1UrnNh3sSip2ZIaOO7aIxKeZ2nYiUiz4RQDIbWmdF/4big3m0UmiMnvvsQ8aUavpSt3vG9/vjdQnBhEV57spmqsvJLasm2fu+6/1dAbP7tASA2XPdtNC+ymOTqnCK8dR6I3wk3+yxUP7gPY85LyoOkpp/UiChrlTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAJaFEaZSd+y28aSMJhmn/KgBDyEJ2HyF9CB3TK5XdM/Nh7]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/captive'
     servername: captive.berlin-airport.de
index 2a99ea13f7d58f8deab518d5f6144ea29b3f8c46..1eca09f8d48480ab25f51ed876c7d4ceb8210a97 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
 
 accounts::users:
   jenkins:
@@ -14,11 +14,11 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtWl7/86zeNqLlwrzd83QW50Fy2tMnsfWqib3TTEQy0uN0DCsHv2izUfdDXYs3nwfgFG9IitpCdsAiMzDVbIJtXthnazJiikJYs2sh7OTJIN4pRkWckGsuLwWI2DMW3gTvhArrXuonY/xM7DOTFKoAVcFnyQ5NAqRirOx2dS8jOgKnVCny8uTNL1UrnNh3sSip2ZIaOO7aIxKeZ2nYiUiz4RQDIbWmdF/4big3m0UmiMnvvsQ8aUavpSt3vG9/vjdQnBhEV57spmqsvJLasm2fu+6/1dAbP7tASA2XPdtNC+ymOTqnCK8dR6I3wk3+yxUP7gPY85LyoOkpp/UiChrlTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAJaFEaZSd+y28aSMJhmn/KgBDyEJ2HyF9CB3TK5XdM/Nh7]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/captive'
     servername: captive.berlin-airport.de
index a43c74e3053c4c6ceb205c4472d80ecd66e59509..539703ad706eac11b0bf34611c9fb0a34edda848 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::additional_classes:
-  - site::profile::wordpress
-  - site::profile::mysql_server
+infra::additional_classes:
+  - infra::profile::wordpress
+  - infra::profile::mysql_server
   - accounts
 
 accounts::users:
@@ -30,7 +30,7 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   orat:
     docroot: '/var/www/orat/src/'
     servername: dev01-orat-berlin-airport-de.pixelpark.net
@@ -61,7 +61,7 @@ db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACA
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfMbyvHaOKa2I8Vhlu/k1ZsuYFkP2p29VbDYFcQNBI/gFQ+fvntbktfKxZvjayruY2xZ6PDoqivLpaS7/EGLxBTeGi/Zt4Dn+msVjPQo23sp9Jv5fxHzHqvcLluMf/RgHR3ifvqsFm/IK+t2LcL21ORGYRqXG7l2LarrfZcrdd6P/lVfMyftxpwH4TCPKDUgf5M7+/J8fUO5OdKZVjzgAXiaz87yyJq4p1mHu9tZmBPw6ailYKUiV+oZaJ+cqS/ARD/Tou39EycTeqfIIXQWG7NpYxJn7PjuSfPewVreyD+08YIlhaznEXkD+4Us4mg52Asa2Nyc0XxoWhJe0GtVcADBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBACIXP1dGI+1jnC1JA6p3VugCAFHpDF3FV3/EaySmolH81jsH+RkV0+c6ijIw1Pw/4VxQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwPFkY6MBbkTUeYGsY4e4lvn3nXO+BHOXgN7DK0YsTrS0jMSmpbLhPl3g+KxhKlGI9Nu7Nd43aZaCaoTs+ZGxgp8b7H2JJqCSCNluEr0L/15lFyiW3J0WIgcQc9WFVrf1YTX4cs8SLLjY3w2/VdfV9Ox4P22uQwO+BWq3td60putVmS2nr3VzC4j7TWwmMYXioeIfrctH5ibGn6bOzUk+AfWLC+VbaL8bSR1/ZYC4veCMB1f6wamfgrBS+PQTYhp9wrq+JrtBkEpavArClLfa25ka2FY8FVKcfxBkUhmbEtxPtBm56EFMabvO61Mo2Z2mwLNtbR9EBXsCQWXjxgmbVjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAW06WG2rf0URSHRu6789hvgCB9tyYKOx1z8dovwB2sQgbwtpE25kK3R6+fUFysELRrEg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   orat:
     user: orat
     password: "%{hiera('db_password')}"
@@ -70,7 +70,7 @@ mysql::server::override_options:
   'mysqld':
     lc_time_names: 'de_DE'
 
-site::additional_files:
+infra::additional_files:
   'config':
     owner: apache
     group: apache
index aa8210c578f047caba8764113f49869baa9a8c47..2390ba9fa7b33c0691110902c42d16a11453a326 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::wordpress
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::wordpress
+  - infra::profile::mysql_server
   - apache::mod::remoteip
 
 accounts::users:
@@ -23,7 +23,7 @@ apache::mod::remoteip::proxy_ips:
   - '192.168.165.252'
   - '192.168.165.253'
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   orat:
     docroot: '/var/www/orat/src'
     servername: www-orat-berlin-airport-de.pixelpark.net
@@ -79,12 +79,12 @@ mysql::server::grants:
 
 db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEFm7AsxKJilokvKc/g4mQ58NYk1rfFZW5qEXHNpayh+HtPwMCo7ENdHJl6dRDe7MhOo24wVVE3W7VNYAEFjInb9SvsxXldQG2bgYTmuAKmv90+Lr/W1cfwJyGCc/Y4muk0B5CBa5M+1pk8QS8WKf/ztonhBj4h5Zv/aY5fIPFg186NBlmlq1mNJCQHxUu1Yq0a6arVs7s7zlWRn9i2HmyoweT1KpnjBzQNXdd1WGu6AGWSUy+ViD/KueBN9ivdndIZug/E4H9VaBtmUMM6DQmcckzgs7vCp6cVWy3kaURWxqYyZDl6099ww5zFjBIiaMYE321RNowuJ6626SWc3RiDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAdR3bds3LdvUWfxAa7zmWHgCA4kmk6eIvlUjNUGp6qKu0TsR7SYB5Pvwq1UgY/Wp01Qg==]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   orat:
     user: orat
     password: "%{hiera('db_password')}"
 
-site::additional_files:
+infra::additional_files:
   'config':
     owner: apache
     group: apache
index d902023741734c7e86a377edc20a75b616bcca42..f8092a5c888a72bd043c648e507edb43b659b67f 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::wordpress
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::wordpress
+  - infra::profile::mysql_server
   - apache::mod::remoteip
 
 accounts::users:
@@ -35,7 +35,7 @@ apache::mod::remoteip::proxy_ips:
   - '192.168.166.252'
   - '192.168.166.253'
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   orat:
     docroot: '/var/www/orat/src'
     servername: test-orat-berlin-airport-de.pixelpark.net
@@ -90,12 +90,12 @@ mysql::server::grants:
 #orat db user password
 db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiNc0z209cNXv77gwKWFrMF/eee4tpvKZ+tOdWWJu4SAxX4EX6pmXbcO7hu6ens7qWQTRtPppVrfziaLICNksr40qnQSa7d2dUgW0IS4w7t2TzV+ZEgDAgrCXZ6sd2ZNq/V1Cp0m/nX98JmB4cUL40XAkNhZ35jjMHBHU2LJ63C98AU9XEIkR1+EpS0SBcH2v9LCe5zpnKdg1plXKipvHZEiu2PuU+SVjyn84qFwEIDPEKxo7PpQWGeef5OnjtBtxUxXP6xYB2saBnJ/8ZAc9NItU2EKjgexeE1MDlDEK1wriwFd65VoE1j0vw/6il7ZdVtulD7uv6o4FVtBNENebTjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAHBCL/u8tycgCXm2Ek9JDXgCDjpqGL+UscVeGmTz+L+sWNh0xy5BPWeWXThvZDGZRKiw==]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   orat:
     user: orat
     password: "%{hiera('db_password')}"
 
-site::additional_files:
+infra::additional_files:
   'config':
     owner: apache
     group: apache
index 3a88a6c82f3b715135989d1469eaae00cfd0e338..0943c4bb4ee72598139c68ecfe5ef08d1ae7763d 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::nginx_php_fpm_server
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::nginx_php_fpm_server
+  - infra::profile::mysql_server
   - logstash
 
index f86fff704f1c086bb0052929906f7b2f71e75575..e187eae6d0879d349b5a50a41d061e752edb3c90 100644 (file)
@@ -25,7 +25,7 @@ sudo::configs:
       deploy.vogel ALL=(nginx) NOPASSWD: ALL
 
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApqjR17zsPQ4UNsDRooj5YvjODuRvrzhseWfj3l/kMbzM01ojXv6GOLwKXWUfOCVIF/pmP74d8zi1is6kngBQs4HhwWj9OeQfm5BT2ecFOkG/LC9+3sA2LQEM9eONEtf+7B6yk2N27JPHrOTGrOZRwcMDOegBFc2lKME9BXTnLms7W5gDPDetp1gHPAdTwvkqZ80F0YAxevg1xPLSc6CGI5mt9AdMPsY4xr2RnCWKiE2bA62JrfAwRCWdcgcQX1vcDv8QWkd7a/Bet01PntFetfHab/AURgCW5A4zWiU56k9AQfWr1caNUQ9PzaTB+2JdUS/rINu7KTeYQA/OCuqwVTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCx7Vbg5bYzpztboZrJOwnBgBCMA0PLKQSkVfXujmrbtOOF]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   wordpress:
     user: wordpress
     password: Ahth6La0quie
@@ -64,13 +64,13 @@ php::settings:
 php::dev: true
 php::pear: true
 
-site::profile::nginx_php_fpm_server::upstream:
+infra::profile::nginx_php_fpm_server::upstream:
   'phpfpm':
     ensure: present
     members:
       - 'localhost:9000'
 
-site::profile::nginx_php_fpm_server::vhosts:
+infra::profile::nginx_php_fpm_server::vhosts:
   dev-berhub-berlin-airport-de:
     www_root: '/srv/www/dev-berhub-berlin-airport-de'
     index_files: 
@@ -199,7 +199,7 @@ site::profile::nginx_php_fpm_server::vhosts:
       - '/index.php?$args'
     autoindex: 'on'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'favicon.ico_berhub':
     www_root: '/srv/www/dev-berhub-berlin-airport-de'
     vhost: dev-berhub-berlin-airport-de
index a74d0697ec1894ef4b4e928df21e11429b91a7eb..385aa9d8ec16a0284d64fe709e1820a4dc2873cc 100644 (file)
@@ -38,7 +38,7 @@ accounts::users:
 #    ssh_type: 'dsa'
 
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArKBt0vpxz9bU6KkgLOzJOgycMijRe/b02cKe+3k8HtjTOs7R2FYGBv1IxPCDi/C3m3jukt/+2M89RmK7eBC6Wv9DqKbPMWOhNIDbDqcgUJMhEh5CNGRodArFLHiJWz4on7YCNl+W9noJbFNyctOzGXJCawpTE0XXpX5+jy0/iMx4xhFtBfVrYXbqcZiK/O8/jMnU2tvu9sO3fpZG8uLEVnhL7+gJxtSciqgUP+39ZQySoIlYjsm9ASvsLCiKCdNkktGKM3jNMIE1E8OLS7DFOKCMVgyRr/A6LQ1N3sbbOBLZcG8SdDRUuct9UXY0EqVtrqDDw0lr0zRs0Ew3/UDsmTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA+JSSCdmOK9eNsL1Bz4aAQgBDOYi39RkZrZipluMr1YNQA]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   wordpress:
     user: wordpress
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWfDuXpV9jEl6uXIs62wrFLNe05AR+9Ai7lniDf/FXjGMBLYGDc62+YPvDF4f0v2PK7kYPxpz6VOPq8RD44Lkj6I7jED2vMLBB840I5SAZDCdHyhG28m1DbRr5lYXh7F1KRSvBbq1Sf1B5V29PppgUne+aypZ3+vsEMN4KjmpTwMDK9tlKUS3BPlT2b1UWE3UtUdHPFiixU21GATYFLLsEi/J1JLK2ORDMworEO5hlmHOWgNgXz/pwZvQixmlz0LrrK4siaexxVWHPF4jvlzJqMlfguiguYwW63jvnnF8Aed3y85WOskZMpElC+tdWSI/us/Yfh45a9GZ2AwfmG79qzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBtkPB2ijBownRs1oTtNK9bgBA3PUVID7Us5uf9pAagG3Iw]
@@ -83,13 +83,13 @@ php::settings:
 php::dev: true
 php::pear: true
 
-site::profile::nginx_php_fpm_server::upstream:
+infra::profile::nginx_php_fpm_server::upstream:
   'phpfpm':
     ensure: present
     members:
       - 'localhost:9000'
 
-site::profile::nginx_php_fpm_server::vhosts:
+infra::profile::nginx_php_fpm_server::vhosts:
   berhub-berlin-airport-de:
     www_root: '/srv/www/berhub-berlin-airport-de'
     index_files:
@@ -354,7 +354,7 @@ site::profile::nginx_php_fpm_server::vhosts:
       - '/index.php?$args'
     autoindex: 'on'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'favicon.ico_berhub':
     www_root: '/srv/www/berhub-berlin-airport-de'
     vhost: berhub-berlin-airport-de
index 40e4a643ffbd8b5a624ab2d65744d849f4981235..320625cb2567b59535227406a16832437cd3e06c 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::nginx_php_fpm_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::nginx_php_fpm_server
   - memcached
-  - site::profile::mysql_server
-  - site::profile::monitoring::mysql
+  - infra::profile::mysql_server
+  - infra::profile::monitoring::mysql
   - zabbix::agent
 
 mysql::server::override_options:
@@ -18,7 +18,7 @@ mysql::server::override_options:
     expire-logs-days: '7'
     bind-address: '93.188.107.91'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'wp-admin':
     www_root: '/srv/www/tst-blog-berlin-airport-de'
     vhost: tst-blog-berlin-airport-de
index 1b3cd4a69d4d5580e36e3798e22d5071fc92eea3..63cb1bb0b4728a62a1ee0dfdecbf762de8f433bc 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::nginx_php_fpm_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::nginx_php_fpm_server
   - memcached
-  - site::profile::mysql_server
-  - site::profile::monitoring::mysql
+  - infra::profile::mysql_server
+  - infra::profile::monitoring::mysql
   - zabbix::agent
 
 mysql::server::override_options:
@@ -18,7 +18,7 @@ mysql::server::override_options:
     expire-logs-days: '7'
     bind-address: '93.188.107.95'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'wp-admin':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
     vhost: tst-berhub-berlin-airport-de
index 06e14a1b7b87c10894eb72704684f231502c7802..1c67d56f5e65e4816c44ba0d692364ec1014f354 100644 (file)
@@ -41,7 +41,7 @@ accounts::users:
 #    ssh_type: 'dsa'
 
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVEnDEuZKy7xtfPvCGgTIgYEQ5Pca+udKFnxB5h3JSd6wuelU/p+cAAqGQVL1kCNZFJljAX479eZRp29bB0B8C22xWM+dsiOFRAiDKDPlVLRH96kysQC9im9MR4Qz5orcxEIUUQ3v5bWeQChEhhf+CJSBY7NoJcXEnI5urWMTZAKjtIhPrbT+VWnBz//7sBBQyiKPmdUkowyUG0n2H2kz2ss7F9P8SH6KPuhaCHK5dU1IsxAdQyrDToiaTu6qOCGpddlYY9xSJLtD9kx0kH3ynL/MHQWEfDVtVcdVltVRibAyU9D3SN8mUDj8JUuVIyenSGaqyzsXSnDzEjQqj5vGBTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCu7MS7qNeEKG8vYdt2/SQpgBC546WyJQC7GTYh4T7wzeah]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   wordpress:
     user: wordpress
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAR/0VNRXhmmdfmsOU8cwNLU/gSncJtRuh1pG9k6Vtd1zIUbKCTUA4hTfbYQDyybtWmwCLRx+AhrRkyJuyps2GEOeb0vMG7d/iETv/a6jCnDP2ykdEgyd292fLGTDcU0rvVXishZRWRsrIsvpG4wYwDDPRirWVR/hDehzQfKcLyEB8tC8TZQ1rTRda9XcL1d+opHkJEYAmO1EPaH04uqtbJYpFwhJV0atPsqRw1QdRJYRjOESMtL2rswgxtn0nXFFwXHoMhQVJLm6Kh88qMruOv1OKZoVZunk7j0jLdKa8yq5vKc2GkQ0OC2GkOzBs7p+0R1Ab4OX2gu4XkeKT3MYykzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBUYF+hvKPsJBlFU80PaPeqgBDKQBfa85DWni1LskPj14HH]
@@ -89,13 +89,13 @@ php::pear: true
 #memcached::max_memory: 256
 #memcached::listen_ip: '127.0.0.1'
 
-site::profile::nginx_php_fpm_server::upstream:
+infra::profile::nginx_php_fpm_server::upstream:
   'phpfpm':
     ensure: present
     members:
       - 'localhost:9000'
 
-site::profile::nginx_php_fpm_server::vhosts:
+infra::profile::nginx_php_fpm_server::vhosts:
   tst-berhub-berlin-airport-de:
     ensure: present
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
@@ -371,7 +371,7 @@ site::profile::nginx_php_fpm_server::vhosts:
       - '/index.php?$args'
     autoindex: 'on'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'favicon.ico_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
     vhost: tst-berhub-berlin-airport-de
index 89da93a3f5f666e90dceed9e902320c6db72a4ec..77ddcc7779ad0e39ce567a4f73f8d1ff0ac88139 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::nginx_php_fpm_server
-  - site::profile::monitoring::mysql
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::nginx_php_fpm_server
+  - infra::profile::monitoring::mysql
+  - infra::profile::mysql_server
   - memcached
   - logstash
   - zabbix::agent
@@ -19,7 +19,7 @@ mysql::server::override_options:
     expire-logs-days: '7'
     bind-address: '93.188.107.30'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'wp-admin':
     www_root: '/srv/www/blog-berlin-airport-de'
     vhost: blog-berlin-airport-de
index 3b7b240bda9c648e2351e0e5a527f88371790e9b..c5475df237bb25dad87c1e49ad84a9c1093a3c76 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::nginx_php_fpm_server
-  - site::profile::monitoring::mysql
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::nginx_php_fpm_server
+  - infra::profile::monitoring::mysql
+  - infra::profile::mysql_server
   - memcached
   - logstash
   - zabbix::agent
@@ -19,7 +19,7 @@ mysql::server::override_options:
     expire-logs-days: '7'
     bind-address: '93.188.107.35'
 
-site::profile::nginx_php_fpm_server::location:
+infra::profile::nginx_php_fpm_server::location:
   'wp-admin':
     www_root: '/srv/www/berhub-berlin-airport-de'
     vhost: berhub-berlin-airport-de
index 55ec1e026fc27a1af560743b69c3fc47cc2599ef..226078dbecb24a11c83f3a11a64445f976f03bf4 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 php::extensions:
   gd: {}
@@ -67,7 +67,7 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   webservice:
     listen_owner: apache
     listen_group: apache
@@ -96,11 +96,11 @@ php::settings:
 #  define_syslog_variables: Off
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web'
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuhfYLZrcdMdGV61KKhTxKjG4XxK3xua1rPvWPFVLWDqwYCwQABWMUnwmqq7rw+9PBapgbiZzhNUPsh6AX5PCbx9pav9b6SWgCnt8pseBMYoFXw3eh95MolTwaa2nV14GQ/7vChV/xqsVfuFHHgM+wNiyy4jlPJ3dk5agDzkrTtle7wFiG52OJkVylCEx/K1G6SfybFiZEuRCToHSM9z6JUcpTPUhu/TjiuyLyQ2mBInSVmbWG5pH//L9ZNAc0UKXBgeWzLO3W0m88XA80hHDwA95SSUj+//ZKOgA0MBol+7bL9HCCECoY2MAk38eX+ac5nqUBGVNxXt8FPi6jBwnKTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDcFY5OTVqjbaHKT24xh0EBgBADaxMVlFXTNFGJVCxht4/n]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   webservice:
     port: 80
     servername: test-webservice-berlin-airport-de.pixelpark.net
index 8c852eb445c501d6205519ce13932df9692cbe3b..823bb2f3fb86c3b6bc3c7de4abcc13a27f00a056 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 php::extensions:
   gd: {}
@@ -17,7 +17,7 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   webservice:
     listen_owner: apache
     listen_group: apache
@@ -31,11 +31,11 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web'
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   webservice:
     port: 80
     servername: webservice-berlin-airport-de.pixelpark.net
index 017cae2b0b35b5a2bb0a9bae9d8f0d358abc088c..6b7aa314cf2ed65ae5b69bd439b81c4a34793dbd 100644 (file)
@@ -2,7 +2,7 @@
 
 java::package: java-1.8.0-oraclejdk
 
-site::profile::logstash::apache::resources:
+infra::profile::logstash::apache::resources:
   magnolia_log4j:
     resource: log4j
     order: 10 # Input
index 4f830d3fa9ea7b712669f452194d08f21064ad32..d18ae89631bb158adb92626de717570111741a4d 100644 (file)
@@ -1,22 +1,22 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
   - java
-  - site::profile::apache
+  - infra::profile::apache
   - maven
-  - site::profile::postfix
+  - infra::profile::postfix
 
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHW+F1Q3vJWv/aCsBzVz1kV3wx06Us25l2WnIKOtED7zbePanPsnKhi+QFRnRQDSjUnPag+NQ7C6h7vq+lnx5THMuFmoN1fiqu7cpGR0uvryo6PcTeYdOEvnvfmqPrpaISBKyZeEegSug3KcTv4+08tzpBYUoL2YZJy9Q4GpFw3WquTgymxweDAvMwB6yqZ3hvec4bsC+RD+vKsSLtdgJCV+h345qVEiQPbFhwzT3tw3+whsHgkyCDOBs6yKpNWGbb/2u7EP/bqZ39ko4xleCCkUld47A8c8TWHIongLKN5iFrgDX2nRpxCOaZe00I63hcEGOOUlHzPhro5Kk70oDXjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKIzQrX3Lcve6Vm7WCaXvegCCw7pC5cThiyprSbBtEwQVMsj5twqZRFMru6z7Rh9kshQ==]
-site::profile::pg_server::version: '9.6'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHW+F1Q3vJWv/aCsBzVz1kV3wx06Us25l2WnIKOtED7zbePanPsnKhi+QFRnRQDSjUnPag+NQ7C6h7vq+lnx5THMuFmoN1fiqu7cpGR0uvryo6PcTeYdOEvnvfmqPrpaISBKyZeEegSug3KcTv4+08tzpBYUoL2YZJy9Q4GpFw3WquTgymxweDAvMwB6yqZ3hvec4bsC+RD+vKsSLtdgJCV+h345qVEiQPbFhwzT3tw3+whsHgkyCDOBs6yKpNWGbb/2u7EP/bqZ39ko4xleCCkUld47A8c8TWHIongLKN5iFrgDX2nRpxCOaZe00I63hcEGOOUlHzPhro5Kk70oDXjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKIzQrX3Lcve6Vm7WCaXvegCCw7pC5cThiyprSbBtEwQVMsj5twqZRFMru6z7Rh9kshQ==]
+infra::profile::pg_server::version: '9.6'
+infra::profile::pg_server::dbs:
   magnolia:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAByHW/z4adYcpXHd9rakjkF8rHoG/WErgLan8EovhtTv3iEL33slh4DdHNlWZOX0e/UKEiNl8NKWiYDE4uHsZXbj5lB1Thx8+NSVIY6LnUVv3jia63Qd6nwvBxLh+vOCvSXmRo3U/YGtDJtZRwMIPO0LhkoljzU0bx7c9PrGOm5VStoYzDJ8KH7HTrrc/MuqLc+x2AQ6Zu9NOZ25JAn/hj0qq3Ibx795vJ9TsUc23Ukkc6bZ83IMDZlHwJffO+frPA605tw30PK1mcz3QziRVN15AQp9fPKEh0RaE9SWvMxjQmMyU+9AlRVhyK7kPsFlBYTCHMW44C6T4OwaK78/ItTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD68JdmrlBVrRAOCZ7C1uh4gCBnUvlkA4wSfhwc8lpdZyolJseyA7GmiH7nUuIPvp6NiA==]
     network: 93.188.107.111/32
 
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   werbung:
     docroot: /var/www/werbung
     servername: dev-red-werbung-berlin-airport-de.pixelpark.net
index df48fdd35502a2e4a606658381eb5021ed3843da..fc8e26d83d88d0ab4e682d7e1a01bfe095792c2d 100644 (file)
@@ -1,20 +1,20 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
   - java
-  - site::profile::apache
+  - infra::profile::apache
   - maven
-  - site::profile::postfix
+  - infra::profile::postfix
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGIb7F6nrxnTYaT2ksgV8jiB68Fs2Hto5r8l94dZ8AwFWwz4w9ciRcYP3UE0zmplLQKANkTC6hR69HFghBQTOADkGqzR9TboHDUP6ysAYFj6qfAXvJ15Dd80x/cLl6Igbpqb0bVBCAZLvfyyMNYJb+bD++Y3ZlWP7IgVz7ftRXHVpUMstzo/k0LtM8jtCakJZGFbIsyUkO9FE9EpvBhOfbYL7yiSEKy1bIMI84AffzxXObjD89cI4M0uDpgL99rPNUzgxkTZejYhcnm5Tv2R84XTx3fnnI196WJ4Vi6/3WDlYEIdOOfayD/xAcfRNQgfeQZ6n7JM0MguIybLLvGOOQDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAcjNbdQC8VlPM0K21arXxpgCAan0rf6xfnxZ7Bw2VtqaWODGAwb45YruGx4KxApOUugw==]
-site::profile::pg_server::version: '9.6'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGIb7F6nrxnTYaT2ksgV8jiB68Fs2Hto5r8l94dZ8AwFWwz4w9ciRcYP3UE0zmplLQKANkTC6hR69HFghBQTOADkGqzR9TboHDUP6ysAYFj6qfAXvJ15Dd80x/cLl6Igbpqb0bVBCAZLvfyyMNYJb+bD++Y3ZlWP7IgVz7ftRXHVpUMstzo/k0LtM8jtCakJZGFbIsyUkO9FE9EpvBhOfbYL7yiSEKy1bIMI84AffzxXObjD89cI4M0uDpgL99rPNUzgxkTZejYhcnm5Tv2R84XTx3fnnI196WJ4Vi6/3WDlYEIdOOfayD/xAcfRNQgfeQZ6n7JM0MguIybLLvGOOQDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAcjNbdQC8VlPM0K21arXxpgCAan0rf6xfnxZ7Bw2VtqaWODGAwb45YruGx4KxApOUugw==]
+infra::profile::pg_server::version: '9.6'
+infra::profile::pg_server::dbs:
   magnolia:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAl6PguqU7LIKCMICTf1oGGD9X5Ir7tQ+ebKvHmSoq07OnLvfGWjqFWbxkzOivttM0mW6o/u0cYJTwemWySjQV7txozOP+Rg5CyawLdWp0T/oNawZp2MoPwASCY10f+pgQRZ1XGHa+rdrABjXNxDK/dJ8DoopoQG299qlmnqUMMDJN0fHxwRyLLKTKYJOzCN91AlKbfyayJkxnlfyENACHZtanhs1n2eIIuqIjs98rAZdDVeXJWu+7JtH3/0SZ3i19Zk+uAsoG6NhordjSOMBYmgYAjmdfVK4ho54l4x98CU4q1VlUK0jPNe9mmY7rZWgOKE4DBYOErZ/du9BEtRP1tTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDirL4eqEeGnBqHHwHfks7ogCBHjl/wx1TNQbj9CiWPOt7fz4x1Iw61Yu34rDnmv1K8Sg==]
     network: 93.188.107.112/32
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   werbung:
     docroot: /var/www/werbung
     servername: dev-werbung-berlin-airport-de.pixelpark.net
index bfa746ff416e205b11143370b62ba4d238777bf1..d7710d4fc077c474d7501d3f145a63581ba43fa5 100644 (file)
@@ -14,14 +14,14 @@ sudo::configs:
 
 # Postfix Config
 postfix::myorigin: 'pixelpark.com'
-site::profile::postfix::hashes:
+infra::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
   '/etc/postfix/generic':
     ensure: present
     content: |
       root      root+%{hostname}
-site::profile::postfix::configs:
+infra::profile::postfix::configs:
   virtual_alias_maps:
     value: 'pcre:/etc/postfix/virtual_pcre hash:/etc/postfix/virtual'
   smtp_generic_maps:
@@ -30,12 +30,12 @@ site::profile::postfix::configs:
     value: '+'
   relayhost:
     value: 'mx.pixelpark.net'
-site::profile::postfix::virtuals:
+infra::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com
   'httpd':
     destination: root
-site::profile::postfix::files:
+infra::profile::postfix::files:
   /etc/postfix/virtual_pcre:
     owner: root
     group: root
index 09be71df28889ad56560c96f6b094e1a368570a3..4906608a6c6e8e425d09d32c77fef7c545ad80fe 100644 (file)
@@ -1,12 +1,12 @@
 ---
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApd3XY8Y18JlpntryRoUPeVGb8dXR03sbpun8krG637yUVAfDlhdoh9GNyPEutCft2/xQRAf6nnm7nkLSwSicLomLv0goXAmB9r9+VZmYQEdj04DXKE/n33ipUlIXwWcX5hsfn/KqgJHfwL1+caNkSLIF3FHKwpEFB8AZ2/zPLkXCMWS6tj5d8clpJeuwhW5IfX2YWEzchK2ULXHz0zLkiqNOuh2FarA8hKnzXHB5UyIfc3IbSOFbsR6juzM33g3cSmgsGiXClMiuHkNrnxhlQZuPPcsfHzaXbn5GQvPRCRBHKti7E4dBUwU1ks8iFOFHTttSm6quVAsJxnQN56DFnjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBOQAgfiJWessbP5B1KX0HMgCAxqQwDwxo1Etm+Ncr82DGHQ653WuA3p0tGGId+gCBpOg==]
 
 # Postfix Config
 postfix::myorigin: 'pixelpark.com'
-site::profile::postfix::hashes:
+infra::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
   '/etc/postfix/generic':
@@ -14,7 +14,7 @@ site::profile::postfix::hashes:
     content: |
       root      root+%{hostname}
 
-site::profile::postfix::configs:
+infra::profile::postfix::configs:
   virtual_alias_maps:
     value: 'hash:/etc/postfix/virtual'
   smtp_generic_maps:
@@ -23,7 +23,7 @@ site::profile::postfix::configs:
     value: '+'
   relayhost:
     value: 'mx.pixelpark.net'
-site::profile::postfix::virtuals:
+infra::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com
   'httpd':
index a5c6a4d6d4b43eaf89f1112db393839e9a942baf..c95d681d9f87d0fe753389dabef173686ad38e9c 100644 (file)
@@ -1,20 +1,20 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
   - java
-  - site::profile::apache
-  - site::profile::postfix
+  - infra::profile::apache
+  - infra::profile::postfix
 
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJQUEpJnnHdTpk4lRjoeaH3w/uBY34HFRQu3gD6Y/6EPjul+c+hDKQqR1cW6Wa2vewKqb4MYexpVyEEQBNgGIYVcfDGr81YxaiD+qLs0ctGxo0+NRiPDDYFW14z1IO31pYgfg47wMPXr3dXeKm13RKApVpitkR9YCVnSoDqGH1hp1eGWVZC0kUYDf4WVVRJCMe5jjqdNbKSRRRxeFOE2OZ3JpgJpvbxAMIlik80jiHrmskXgdYvzV+np5tj5fkF311v9U2C79eeyNFWHo4ojpcYhvUF3eRB9kdLhFLNWB6Nv/MLgdUtjFoOb21DZRrhwE8qMd6K1SDfWhFVufpcMLPjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAux+VBUel7fXZo/yf5tGb+gCBBWz4G2wIs00AuGK6YkQq6n9ARUZORV2/h9YWtBo5GJA==]
-site::profile::pg_server::version: '9.6'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJQUEpJnnHdTpk4lRjoeaH3w/uBY34HFRQu3gD6Y/6EPjul+c+hDKQqR1cW6Wa2vewKqb4MYexpVyEEQBNgGIYVcfDGr81YxaiD+qLs0ctGxo0+NRiPDDYFW14z1IO31pYgfg47wMPXr3dXeKm13RKApVpitkR9YCVnSoDqGH1hp1eGWVZC0kUYDf4WVVRJCMe5jjqdNbKSRRRxeFOE2OZ3JpgJpvbxAMIlik80jiHrmskXgdYvzV+np5tj5fkF311v9U2C79eeyNFWHo4ojpcYhvUF3eRB9kdLhFLNWB6Nv/MLgdUtjFoOb21DZRrhwE8qMd6K1SDfWhFVufpcMLPjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAux+VBUel7fXZo/yf5tGb+gCBBWz4G2wIs00AuGK6YkQq6n9ARUZORV2/h9YWtBo5GJA==]
+infra::profile::pg_server::version: '9.6'
+infra::profile::pg_server::dbs:
   magnolia:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAb8nBpE8Ogg2c6C03678fjiLbWL1J9zpSg6SYFKGdJWzoMg9LGXjo0GkkmbhJGGAOiU8K6cyFtjsgABpNEG1RYpVafjebL6xbUcsybi430IXC28mBWLvBDYrsBoeuFrsfdtdZie9D8zWh33A9SYYsb2TTZdAgs4fWWlcHMtSrEsPAcxNcU7+xmau4VjySBRucRp4Gc5fTULqlvB2cz+qo3hbMvA1bzwS69QnU2+254dmMWgwyOcZQLd7y27vF/G44FQxazQyXMsM91nAl8m0LkgOxUiNA9LEzF4RqydYqgG7ITKFnqOu5hXwELXKxRUtpqjmMdUxloDzqd9+AqRsHvTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBzSnchMo1PitSSV9QcMadHgCCbcSXxTqr9Y4A1Xrp7QUHqMerPaCesoo2bqGqjks6AyA==]
     network: 93.188.107.14/32
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   werbung:
     docroot: /var/www/werbung
     servername: red-werbung-berlin-airport-de.pixelpark.net
index c2839a2e3354f277accd8e3c3016aae280e3b7c0..7053cf54f32a81a1bcb4a0d53d245355f68a48c9 100644 (file)
@@ -1,19 +1,19 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
   - java
-  - site::profile::apache
-  - site::profile::postfix
+  - infra::profile::apache
+  - infra::profile::postfix
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdX3G34NpvYPPEDmSQgmZf2n/8VPCB6mMiPnUbGZji5u0eHswaIpTFneSJliITcnrPL0W6b5PdQIReUYRZVDJeO3xqx5Opl76ioUMJSa3DUB5O/720JJWvT057fk3Yv/+hNOluSihUv8Uz2e5dyuY/M5j0mkYo1oXhNFyFaS5u/BsfQ+cffj4wMPJGRB75HcDbcCA8Do4m9FkQkFycqtbTVGHRjFPHpX53yxObdnLqFm/9iZDebaoNKYDy32JZiCfqsBQv7MvDY76eWCzBQt9gV6Rm641k1J0MtEylnM3RRMM0VTYfSWzQzR7I0naDnIXqkMyk8c+Q1L3ehKPegHpATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0t94wOrEb7Ip4y3gHIYLtgCBMjLREFtiILrsPMApj2XRfTPisKJ01uteBYqN9msAmrA==]
-site::profile::pg_server::version: '9.6'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdX3G34NpvYPPEDmSQgmZf2n/8VPCB6mMiPnUbGZji5u0eHswaIpTFneSJliITcnrPL0W6b5PdQIReUYRZVDJeO3xqx5Opl76ioUMJSa3DUB5O/720JJWvT057fk3Yv/+hNOluSihUv8Uz2e5dyuY/M5j0mkYo1oXhNFyFaS5u/BsfQ+cffj4wMPJGRB75HcDbcCA8Do4m9FkQkFycqtbTVGHRjFPHpX53yxObdnLqFm/9iZDebaoNKYDy32JZiCfqsBQv7MvDY76eWCzBQt9gV6Rm641k1J0MtEylnM3RRMM0VTYfSWzQzR7I0naDnIXqkMyk8c+Q1L3ehKPegHpATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0t94wOrEb7Ip4y3gHIYLtgCBMjLREFtiILrsPMApj2XRfTPisKJ01uteBYqN9msAmrA==]
+infra::profile::pg_server::version: '9.6'
+infra::profile::pg_server::dbs:
   magnolia:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPgZJ9LKFrUDgA7o/bizDq6xbMKCRtENBkfUuKEgXPayezvD+EoTZMI/hH/VpN3upeFlhLMogqm35tNQGuJjZn8d8ssp35p4ZPHm8QCITmc6z0c2IMmToNAo6UQK8JyCMseaWiGEIyjgD2YW/qmT92kyTPxh+mHID50Fxfw9Z4aZicuNyDUXO+3SC5p9/jigc8ZHQvyZloxJGnlDYM59FgJeu6Q6HlWZ04Fi5JPCjmQt50TqSTAWQ8g5MQtsU6PvG+v2kH5jmbUtA9DIIfiDmXg0a7SHQjbZL4dcOJt/n7hTeWLmqcHMt+RRGBY7BWGh/fXVH2cGlNqJg9PFvvaNGsjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAfFklrPO8bb6S5uFrQHgXfgCDbDPtcZyiB4c9buVdP+6SYuf2ktb1j8ZOZmBEhonyY3w==]
     network: 93.188.107.74/32
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   werbung:
     docroot: /var/www/werbung
     servername: test-red-werbung-berlin-airport-de.pixelpark.net
index e4e6098b6ddbff098b6b9a0fdebe668a9529e8aa..b679273e36551aff799baa4a6437ceafa1b19ca6 100644 (file)
@@ -1,19 +1,19 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
   - java
-  - site::profile::apache
-  - site::profile::postfix
+  - infra::profile::apache
+  - infra::profile::postfix
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjERwUbYn2/Cg+WUH35ynDxzEmwFO2DV6p8oMhaFUMvSXfwetUMIT2nKiCDyTLwRq5g65LUf4ip2keDimrtkdkKD7vPrqU+LERpeozm/wG2QyOgL9QDIbA7pmWCowalXFSt/eFBP6kCu6z5HVtlpzCyW3gdX/GUgGVNvk7+pof7EC/O/XpwDocq5cfe3LvuCNJEHZAQwmULW7pr4tckcAz+WugHBptqPGO69WPgO1A92u4y+JUVBtF6Yxlf9E9fev1MMgazr8BW3Qz59LvcGlEpgX7f18ZK0nEcwNuOEod1Kl70WT2qpxLqYx8RGzCxQ1e0gY54FdawAOn3n8Hmo0jTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0VUNoKD7inXcLn3O2ozybgCCGvPqfIEEjIo3Lw4H9EFsEonk94fj2hylT/+2ArqMmHQ==]
-site::profile::pg_server::version: '9.6'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjERwUbYn2/Cg+WUH35ynDxzEmwFO2DV6p8oMhaFUMvSXfwetUMIT2nKiCDyTLwRq5g65LUf4ip2keDimrtkdkKD7vPrqU+LERpeozm/wG2QyOgL9QDIbA7pmWCowalXFSt/eFBP6kCu6z5HVtlpzCyW3gdX/GUgGVNvk7+pof7EC/O/XpwDocq5cfe3LvuCNJEHZAQwmULW7pr4tckcAz+WugHBptqPGO69WPgO1A92u4y+JUVBtF6Yxlf9E9fev1MMgazr8BW3Qz59LvcGlEpgX7f18ZK0nEcwNuOEod1Kl70WT2qpxLqYx8RGzCxQ1e0gY54FdawAOn3n8Hmo0jTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0VUNoKD7inXcLn3O2ozybgCCGvPqfIEEjIo3Lw4H9EFsEonk94fj2hylT/+2ArqMmHQ==]
+infra::profile::pg_server::version: '9.6'
+infra::profile::pg_server::dbs:
   magnolia:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhOtd/ZjiYoVrZcbTOhTxchBlfxAef7+HdHOEUoBD32wUCi+S3/csempXXuSr3SvimZ33fIWgH1llSq/So+tNVdHs87ZA+9QIqu0v3u9peuexqkw7miHDICrka2Ian27diMRB+vtxwwHs7RTGKW/DofsC5rUotDZpPlzN3hKFHV7UBsJB57J3Vzy4Rn3EvpvrYo4Tdm0Tj1RC4Eyd2WkjKFl/b0UYQIDyQR+XttFSFNvgflWacOMBzNGn876NcqKB0f8YWemT8zlImCwai49jjwM9eYKG80KyG/FBUEIW6m1YhpVesE+9YFezevbJOLYp1HfJQrfvkJZm/3MUyVD2RTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAht5LeAV19QDgyiq9tC4+0gCAbv9heeAkFEaoGIryvb9nmwzEZpzCKbjXYtNkjH/az4g==]
     network: 93.188.107.75/32
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   werbung:
     docroot: /var/www/werbung
     servername: test-werbung-berlin-airport-de.pixelpark.net
index bfa746ff416e205b11143370b62ba4d238777bf1..d7710d4fc077c474d7501d3f145a63581ba43fa5 100644 (file)
@@ -14,14 +14,14 @@ sudo::configs:
 
 # Postfix Config
 postfix::myorigin: 'pixelpark.com'
-site::profile::postfix::hashes:
+infra::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
   '/etc/postfix/generic':
     ensure: present
     content: |
       root      root+%{hostname}
-site::profile::postfix::configs:
+infra::profile::postfix::configs:
   virtual_alias_maps:
     value: 'pcre:/etc/postfix/virtual_pcre hash:/etc/postfix/virtual'
   smtp_generic_maps:
@@ -30,12 +30,12 @@ site::profile::postfix::configs:
     value: '+'
   relayhost:
     value: 'mx.pixelpark.net'
-site::profile::postfix::virtuals:
+infra::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com
   'httpd':
     destination: root
-site::profile::postfix::files:
+infra::profile::postfix::files:
   /etc/postfix/virtual_pcre:
     owner: root
     group: root
index 577b64f5df5ef31afeb47021e95f07ac5b252679..ca7f9a275869ca4b3d9b52cebb6d7fa25e97d4d5 100644 (file)
@@ -1,20 +1,20 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
   - java
-  - site::profile::apache
-  - site::profile::postfix
+  - infra::profile::apache
+  - infra::profile::postfix
 
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAosbQqGuJj3xvFXbWBLlSA6uRKv/RVaCGmd4gT55yjhWZc0iMXBK3hdJWwhP9oZ3AZoEjQUr0I3PS6Amb85lDfR6xNeUnU3rfiGsI0FshNh2nHGru4WPXwD2p39R0thTpA+zyq+j93KeSc23ETEch+xeqD6BcUO+/JGXf/T1aIWlmyNJ1BDfok0N7uWM5+djLoWrFeqXkTc0o5zaTUtmD69U71nNxR99Xn0Ke+0RCC1ZUxq55nS3ycHd5LK8rXYK42ikuh7lIbGRYcO2rWWOQ934ybXDR+TKTv3l0Fggai1UfZ7kc6eqGRnljjZ/pf0SPs72n9qfGw4euri5VID42eDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDqcEY2c3OwWKyWS3VHEFpggCAzYWP1Kjkp1eLGPDuxOFqJXSzvoYJwAYJy2ofXWLUV/Q==]
-site::profile::pg_server::version: '9.6'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAosbQqGuJj3xvFXbWBLlSA6uRKv/RVaCGmd4gT55yjhWZc0iMXBK3hdJWwhP9oZ3AZoEjQUr0I3PS6Amb85lDfR6xNeUnU3rfiGsI0FshNh2nHGru4WPXwD2p39R0thTpA+zyq+j93KeSc23ETEch+xeqD6BcUO+/JGXf/T1aIWlmyNJ1BDfok0N7uWM5+djLoWrFeqXkTc0o5zaTUtmD69U71nNxR99Xn0Ke+0RCC1ZUxq55nS3ycHd5LK8rXYK42ikuh7lIbGRYcO2rWWOQ934ybXDR+TKTv3l0Fggai1UfZ7kc6eqGRnljjZ/pf0SPs72n9qfGw4euri5VID42eDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDqcEY2c3OwWKyWS3VHEFpggCAzYWP1Kjkp1eLGPDuxOFqJXSzvoYJwAYJy2ofXWLUV/Q==]
+infra::profile::pg_server::version: '9.6'
+infra::profile::pg_server::dbs:
   magnolia:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACuevcEHaFU/0zTkbj3Rhvv94deqLQKFcaYuqAI1m2ug0LVajmDBpyy/Vkl3tgAngpD6CGMQiVUkA7/YwWDUw6G6LcyZw+FeKPDU/o1+8mpvobCwmubWsteCt8AxmCMo4zJe0pcpDscqaLvc0pIY2xXbM5hlv+jESfFHwexdIVfUxhucPRcSW+A7kctrQYBYq3MOf9nuhUaqM3zCEIGXSECVcoIYVHz5Zogm9uGMf5oCIDUJ3VjS56nKFgMH1XCswuMjhqHHMTwTmT/HMMQ2EtvT+H48lQ6MEcUEMSz21jeCS4jB5VgnTy0rtkhE8uJ41sg3fpWNe+F3+ZgjSF1riODBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBm0y0G0hgfikMiQGCpinpXgCAZr6Xcc6m9Nxq/6/h6SonfoEY86dSds+u/zxvbfVZWsA==]
     network: 93.188.107.15/32
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   werbung:
     docroot: /var/www/werbung
     servername: werbung.berlin-airport.de
index 75891f76f186bc51d8c5ed3a9bf7643e50596f0c..0da85f6832703b739a8aaf82e673ef8bdd5b0898 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 #  - airport_web_app
   - unitb_mobile_website
index c263f789023149bdbad5cd962622c2001db190fe..3c5c80cfad41afb74fbff5f3b9578a15f24b18b0 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - airport_web_app
   - pp_mcollective
index 879304d2ab7fa7fedb82556463f3d0da627778ea..de89a1ad6deb4110f454b6fce1ae953dc8a3567c 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 #  - airport_web_app
   - pp_mcollective
index 7f2490926341c17e8425bf63607940470d71b2e0..a1f136806563440fa0f4acfe705fc3181e9b6806 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - airport_web_app
 # Mcollective wird nicht installiert,
index 83364821675ab2411b2c5ea8db78a8a8de6d8ee3..9b8fcbdce1536241f28a55d03f4bbc548241c3d4 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - airport_web_app
 # Mcollective wird nicht installiert,
index ac8798ac03c496dd460d33be8a566abec9bf3195..99384b9a4aee9ec35d26ade48182f8a9c91d68c1 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 #  - airport_web_app
 # Mcollective wird nicht installiert, da hier eine zu harte Abhängigkeit zu ruby 1.8 vorhanden ist
 #  - pp_mcollective
   - unitb_mobile_website
 
-unitb_mobile_website::database_host: "77.74.236.244"
-unitb_mobile_website::mailform_dbhost: "77.74.236.244"
\ No newline at end of file
+unitb_mobile_webinfra::database_host: "77.74.236.244"
+unitb_mobile_webinfra::mailform_dbhost: "77.74.236.244"
\ No newline at end of file
index 70bd40ef9e3209dacdffb900b85410daa80bffb2..9dc47e78e6cf1c71316b7171811b85e1f99cd686 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 #  - airport_web_app
 # Mcollective wird nicht installiert, da hier eine zu harte Abhängigkeit zu ruby 1.8 vorhanden ist
index a7be3fa578e671d47e10995670d9f9ab7372c957..f3ced7732f62ab18a7876901ed0fd70058e0ddc2 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - logstash
 logstash::generic_resource:
   adobe_aem_error:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 141fd4c7c3d0f02e792ac589009128573c33a49c..b7ef80199108ab889e8bff0f193354f78feccfc0 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwFTjW7nK7I/Ya9DVKJy8W45FC/tiwwF9kB0yYU8snwfjDv5SHB2snmXJDBv5v50nZEDkhGlxk6lmpXz/8fPB7fyokmKQycofge/yEHDI+LG54HjmzEa1aQnpHFnaLxo4mCmLmF0zgLfggtweLGilLOr+mVqdXwqq6vwpRRGJWsp4hUMPomsqO9m3ig+cWb5qjsd52cfil2ok+R7Z+r1+ywNqbD4Dy3TcdRDaHB13K/g+JCFl1EL+6nJ3wRQWDgPt+o1m8pssuhw1gKTuX+yWFnOFft6PrPS8wYmab2y3DRLQEy2UMZQ9T9Ivab7pe/Z+EKllvMevTqlFmkCfWbulaTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAD2txtyD7nnZ5SOEDIKIg7gCABTrwmFTYgW1Kvm3NKY0I7ZPZfE0jb5jsddqoKT8fLJg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   thejobofmylife:
     user: thejobofmylife
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjkX3DcL0OKI2UbB7NDSW+EUsdTrCNB+/dvs+WobV4M/FLX5LF1DzZ0gwxhMr3n7Ar5Ja3oPt1e1sLv3x/nmNKsiTaxszaM7rDckgf4e1FCmCe9kUi0ZpSHWCV0hzrRpwlUltbTNoZ1KBR19dG07eb0/BmrhBzg4IFZWiYI2Y+PsxCsD2E03b20QTKHfCS/YXVTU5w4M4rgyaQSv5mdRK+sU5LZgvwzDS/sx1SBbsvj094GCkQi4ouh/RzfymT3Qe2gzcso74U8/kCp+cHM97RULWgMoTXNZS5bIUQPK75I0MK5WD+APUcp5dq4KVWq1FRW0HODpDYNrhjBdkuOsbWzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAFBYHaLHG9BLKrG/Pjy7LsgCBkMJX2HbLHzchcB0T7f5ywCvj5zvN9KVQd8LaSqcWtYw==]
@@ -24,7 +24,7 @@ php::extensions:
       suhosin.executor.include.whitelist: 'phar,vfs'
   mbstring: {}
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   thejobofmylife:
     version: '6.2.30'
     site_path: '/srv/www/thejobofmylife'
index adabc6a3ac5dbcd345cda412e91f6ee5d734e272..3e18c15928fda0916fcbe086685153f428f70853 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 accounts::users:
   heiko.hardt:
@@ -10,7 +10,7 @@ accounts::users:
     sudo: true
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWXudurV/DQ/dBvIf5d2KZnVUKNEsiL0ORsQd2AXvdIpKwjyDk5cStt3YjhbQRDD45wT8xmUJUkYps69IIucCQU8u80q9L+A/Q0Eu1qxfjW6/v5WouUvBNl1A7SDVqxvF0SzaPYIsWoz+tdAVuuJ5J1gMRTNppuN/VweuxEaK6xPGGZt6Lem1v9qYvLxCcle5Fzrfc3jNsWO0tX+oOg83yNvJidL+vKqOX76QHHD9MxjJ2jvYrrOy8EZaBnum3MZAZG9Cy775a+Z2vrizd6XsqtEgPOpZTw6xvpA2sPm3xCscTE8CXQpgMLLp8ewOv4au7Od8RkKDy0mQRRW3djCdVjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD5ireaKVSiwZBJCD14ALfTgCB0yRhM+vYNpOr4PCb5Y/JNZiEaNTmTjZVAE5DUgLY3+A==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   thejobofmylife:
     user: thejobofmylife
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApIUJfbIFRX/HBubaUhhdk2C/PitAwHbmDtGYLmwDWytGweltBCa6HL38FdslfRWk2oA75FqXg15XI9yooSNouzfM2J3Dr1aKOzCdJ79UUGqYnZLdCYhFpDJCG8SbuLszC2/ZLzElk9uUcIAgAqeV8u2PdJW7T8HIuTRgOk28akR2zDHqWspkkJhlAHcqacqr4iPwVyeubzRFe6zn0zd58mGugN80gd6LH7CJ6pM67bWoO+4pOUf9eYjQzfhwixgihc1H8PM2ez/8MCD6R93GipFF2de1uCwq567v/a5999qcLHFt3NDc6Dm2LjNZbvFhXA/yie+yaBhGc+wTd+cwQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBlAc72xkf86b7E9lx7MCBsgCC0C6lojLVon8PCMmrXmubObCpgqnAhGm26ExlJBVcd+A==]
@@ -38,7 +38,7 @@ php::extensions:
 php::dev: true
 php::pear: true
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   thejobofmylife:
     version: '6.2.30'
     site_path: '/srv/www/thejobofmylife'
index b8029174f92d16f237073fbffba2e8519ebcc240..b2943104531df76a90f526a174da9c460109aae1 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 accounts::users:
   snipclip:
@@ -21,7 +21,7 @@ php::extensions:
   mbstring: {}
   xml: {}
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   stundenplan:
     listen_owner: apache
     listen_group: apache
@@ -33,10 +33,10 @@ php::fpm::pools:
 apache::default_vhost: false
 
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   stundenplan:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABAUJqbRuHiTkD91foQe71rsjKj+696faYP8eI0q8s9MtBqe/ia6jchEvtrHRZlSHVqfe2bbRtc3ycQ3W3KuZAw9FNZTVy0T6nxwu6+8gCdoDNb3ru5sQPZAQJVRWQ4DAm0F7AWlsNDVFAERB0PyoBkx4nEXylkcNiZLlFAcncK9sx99rpE/62RhAV+rsa54E0aNg4BQoRlOzqvv2z7CoYw2MVlWM2GAwq85HbZtvxyBzBcMowk3d4bDr0z66zZxfhalzS/oYAhpy0hfWUr4gMXomLIM7rUyukWWw/H0/uZ2zaBlsBdBiq8cYcAWYtzoPvGR5Xpw3ApNaANEHeJCfADA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBXhWhcwFFAs2JMvQkQuL0agBCh6t9LEzuHbOa/nicv0I98]
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   stundenplan:
     docroot: /var/www/stundenplan/web
     servername: stundenplan-kaufland-de.pixelpark.net
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 375b5fe28b232509b8b048699ed66a8357d23a3e..bc4673ede10e3e292571fa9e9c74d22bc7d60d33 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   sebastian.schwarz:
@@ -13,24 +13,24 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACFCAF9nJSKcyvt07objR8a63rNAoPWXjY20v1U03bEBlphrAvhjLOtkRdqpw+m+7l25Dl3vW9Zf2RPh2aYMAePQsorCfFhd/+b+dLmNLjp1OyNqpkbqa8fFMw9bfBwSRilFYYs16eVRHbRPdGFuVap6KE6i9zkyfEuvZ8jsEz7SvkhJbHRhmdc0tfZlTHaADwA/+2Ca9knT1AAypoVj1BMSclzRmTa8tX8fC5hZWqCoOl/PjwLdU5nqYXhmMDN8DldpqkmbhB+a1hxpU+9Cz9PRwgfkM62qME+GWovFvvNJKSUBjJwXKhlQabZMbSBfe1MEaTmGpvwmYnQ0EJdi8mjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBGkKJkjexxORZFJ6W1A7NygCAYRroVHhd5WDo2Kf1mESY3okHoTMlVX9hUqm9ESVfMaw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmomFUOfULQ6AqyhBC83fdztnDMp8Ozgs/IYyR+R5NzilZ9oQgw7IoFG8S605lGNu0txip70yYG00j5elrm2XpO53SfVN8ZzVeM+1jug7VNDL3reL0wHkUeI7TiGv7gSTG13WcluALOkxAAdopNH2jRWgpCEOc6k64JmPCygG7He+myYLW/4RzFx7X1xOPfswq1axf6Fenvo1UIp76zRUABvNNUSalACy/qnw/Q2kTJRBOjox8MpjB58yt46TwafWI9bFtVnA7LnIyIGZQj2/25upFwWgUQ8ipFgDcjvCy5dQVTPFDvYFCYolzGZS5j2BZNXskkRtdxKFyOVc3dJz+zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAkHHiavkDauIvN1nR6ObL4gCBvK9gKQhDNItqKyMjwBofB82NyYrKE9Al59uPkvHO+Pw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   koerber:
     user: koerber
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAadEgoKseYezoyT0MJcFlNtqi0dj74DvNLFBGVjXXH8XsWtsnVJ5TpBrZ1Rulqp4LdFXbd5IZSGC/6JugFkvgqyvzcQ6BE9aBPNJi6g6EbmO4QXsS2+nqmcc27DbwdHk/F9ypaKwCHOgTdGxqfuYm2LQUhTb5T9tUviW4GtaYX64heDkNbFG55IRkbiUtxJfqxzU/NtwWnh7XNz09t1rVGlrpHOwfFCR0qm3sQ0pSn8SWR2MU2mQJ/vm8xENC6tYDBnVIRX762VKrogm/bVseoJ16HHsRNuSwNxnfQPn/OZA/DEHyocb9Afu1/sdS7J58GG7WDGuBHG5BfADTmrvFlDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAUi37Tpqv6+dRJxWN7y+cDgCBpVXNxnRTjiILB9L4GvzFgvhyVmqCmHqfDbwbRxP9mVw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAMSngUaOEquuquBM64JyXehogg5Kkg1ntJcjPN7HdxtZvSoVrLpjknzc9LewuJhAoP7qU0f5vq5xCQdggPuhYOnQOoPStGNk9YMKibcJIapsIjlFjtIPzNgCECE4ziW6U6A+nwsWbQjAGDieF2QkgHmddoAWH3pB8SfFPkmlyhWSKt5OvlZqD/uEMSo+fO8s1QLClG8Uo3WEBQHQ49TwX64LDWulUa+xgfX8PBVQaMGZ9Ao6Kbg/0vk9CbfNAst8Hl90/+XGMx5FsWyM5FsRTj7Wqq8T8q27QcKj00X49im+KaGX83TqCabEJNj40OKxcOJ1PrEW4HhDzZJyUqRCRIDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBqTL1kOL7lOrL0G0HH2Z1ygBAEwLrKbLGIIvovUEBXf6w/]
   server2:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADpkxvrNgwVbz/oTqGcuhHknkX57MJBnKPM/YPuxXMVuKEiOLdB0PWLMu5i5aYymQEKJOuLIEcX7rePHvxbRzSaKCvrDVMcI0R9Q2c5ILHlG9FTmohBQQrzg074h+1iwOGaYNf80RVJWidORSy1SBEZJQBVenxA0VbMNSkbda4O2zYNGDhzGLR9QlqcxDACBkvEpdUV3JGzHdzfXHY0sCNPJA453peD2hqIWI3f2M+zkoJyrH2qppu34y2HcWnuOHoOefNFLBU8Gij8ZciKTdqyIaSs+yzyAW1/TiAQQWjyn3yuPWdLzHFw1vFqwkTeygkR7cfFauU41lZQZKsXWp8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC4Ia5YBmqiwNPIe1qNzPZvgBAsRpgGwmEXkDSWRu3fROnX]
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   koerber:
     docroot: '/var/www/koerber'
     servername: benchmark-koerber.pixelpark.net
index f6bea5dc192656d5e0caceb3a5f46ae507203ac7..e5c45de0ea4407360e0d16c2023ee038ccffb933 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   carsten.hensiek:
     apply: true
index 8ea7fd59937e909baf99a7b91969ec02a9d5837e..1dd068b7d97955a800d2c34f9011f0d58fe37ffd 100644 (file)
@@ -1,23 +1,23 @@
 ---
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
   - apache::mod::headers
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAa2zXJi+i/wqHe2n60SbMwR5Vz6LFKakRp7OQiOzH0ysCUJvyY483DEedK3wh2UI8/FxaDNt2tr3mB7dPqdq9zV9oVbDacuSDfSDZ8gR053yHlADfQsWupWh81htXYCXmT6avjzBKAuKK+VvC40oS9HzQGctdH0hy0lXu5bsCo2lzPY8Y9dxe3c7Ke/+3dXe4hYFaspqRX9ln3gfRiLHRCpJj+ZI5jyfyZSAtpZ2oYvE+ddBQsWoTT3Z9MXrWluIVwZqaxGnu8bVcqjPPWvcfxdd8raRjjZcSLE0Ca0hEz+al30SxoA1Kj0FY+97DYWeJsTRV4GRWfDraueJT1GazszBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBCk2pwriVW9JmUUgCQj1iVgCDcJ42RZQXXsWI+BMfiFUd3yvRMMH6dm7jUCeULVM46SQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAW7C+pZGj8hiHXrnkbkiHs2TS0wfQ6rDkO+Y6v9d4VbWqaKL4zYl+8QlrC8Ws/xsZd60YgUIUwTdRI44fyDNQpTBjGlBUwvnZV60IXAK6UEV8elR1s3TMfl77dkz9w5Vk0SJoTwwzmB//bVdfcDnyL6t2amNnhMnclBEITuAXVvr7SJzncLgA6z76Gd2JTTVqvHao+CtWBdYuMLtCVcCBVJ0ymRp3mGv+YMJiejb38PzMvVPi/1z7PMIw/X+9xS/lFkLbHneaFi3GnPsexNee871q6yIJBlQiX5Z12XQhLsFLRn5rliPXruSMkqphZeAPLh8+PhPDNai1pbjF29qy2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAf61/uaNLT3fSUpA0XJfFMgCBVUgX2YgNlvvxUyDldYaQuP8izAdII0hTIhTtkXeuC1w==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   kutchen:
     user: kutchen
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYxroeuejPKYu0gcShTEHJECqPXqty1WX3OAvOlT2ygvYJwoF3ZzcDiCEEzNdZ9r2dU1I5RSVcwMSw2i0BKdYu/KfL2ycsyrXSKQHAg1h39zplqE9iGZhW5Ek7P8vIxsyKlvduopCoOytIaxlgILBCqA3FFj6/0CqZ5KWZYNJMAA9BR6/erYp1F4LBdkMDDd5a6Qsc/eVJNWIZSs0gmW/y2c6LotORX57z9oyFQrJRtKowTnzeFNbPlr79NoLU1jJKRX8bk1uT4dWakCIq5XwD0AZEZPZEaDMkqAE328gnxGwlFZ5XbqeQWWVxQGtREPg7nl3OSFiCoxiiAr5kv4pbzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBWkPyiqNI4in/oZ4sgqcdKgCC/zkALKXLVmSDisIKJ+SdhCdqksfH10DcwdOcf1uSLEA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAA090D8anowEAVYSRimiIZUG/sppdPHhJPUMjNv2qHQ5Z7z2VYr4WK2DwMqqccYxpfVMXQViNswD6vcN7Oi9T22YDqq0c+725WR1MqVKj1Cc1UmzHA8mYRM2ziAbLEA9FzXrd7/EusekPJUQu0H+CEAO40q3TZdJdvUk/21dgE0PteqmSl7DyWqSU6hBR57dOeAq9MUw90MYrxDMaIW3CPIYqBbGGAqdUNthPZL+DlHL6eGrMbAFRVTLB8H0Mv2MPAfM+KK1Z85ZDBM4vlOlwVE0xL+DpWJ0UQifrIiFqIJ1J/enWrvz1x3kdTP/f+8Sze7vn+IIs6QpUjJc9kRNIBzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBusWJAcZqgSfv0JH3bn1CIgBAVKbaG6tkAhuDtgZ4FS0us]
   server2:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKMH2K5M7NOiQ3erBk3OmaQbYqHYCAXMmPBsxOqSFxIwIHBM/YmNu/eyGaUydWYzi0hU1m7lSYCeIeRTbhQ6q0dySjjtm1hI4zw2bZp0kjQlWCp6VHDULfdxvt+1PXlm3UfoXFHi6OQc22dUCvIIRSw42RsE+IcYEKuKWPrvkpWKZd3NH7MVR1COCGi6e+U34Y/CkR9+zzTIZm0zBM4U/Woc8Cv98AxFSTBisWUcCjVxY/eDnL/0ThVna4pRzdKh133uy0ZG2cEvdMu8+eGq1ReZWHjy/BsrPucfm+Sdaz14a7/r2Mga6kONu0Z2WDf8N1uI/r1CJgPKEz/YupQuQnjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATofeZqO2Pe3jpC2POlxNhgBBgua8V5ppk5MTshDXzNLRh]
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   kutchen:
     docroot: '/var/www/kutchenhaus-co-uk'
     servername: www.kutchenhaus.co.uk
index e531cffcfd10ada3438b64e9ac2b783ba43704e4..f2500ac16908556d953e18a0d206b0e43aaa580c 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - sudo::configs
-  - site::profile::apache
+  - infra::profile::apache
   - apache::mod::proxy_ajp
 
 accounts::params::use_www_tree: false
@@ -41,7 +41,7 @@ accounts::users:
 apache::default_vhost: false
 
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   dev-red02-lbs-de:
     docroot: /var/www/html/dev-red-lbs
     servername: dev-red02-lbs-de.pixelpark.net
index fa110ccf3f1a1438fb0f7df988f9da340799466d..d5b97f2c23c1d399369771b5265e3853fc0e613e 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - sudo::configs
-site::additional_packages:
+infra::additional_packages:
   python-httplib2: {}
 
 accounts::params::use_www_tree: false
index d85af3fe5955bf44868753457540a213616b1d1c..5c43212c74360ee53351f6a2af400ed8c69bd15b 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - logstash
 accounts::users:
   muhammad.naveed:
index b8a1418a55e57012dcb23720cec11a056a983e1e..f06f30c43b74f10a7d69a84854965ea0e108ffa0 100644 (file)
@@ -15,7 +15,7 @@ apache::default_vhost: false
 apache::purge_configs: false
 
 # Old Data
-site::profile::apache_server::vhosts:
+infra::profile::apache_server::vhosts:
   dispatcher:
     docroot: '/var/www/html/cache'
     servername: author01-linde-com
@@ -34,7 +34,7 @@ site::profile::apache_server::vhosts:
     ssl_ca: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
 
 # New Data
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   dispatcher:
     docroot: '/var/www/html/cache'
     servername: author01-linde-com
index 416eb90a910a64a894cb3def8fd82610765ab3aa..01f11709dd24c490951ab489c1e8b6f691c8ffb8 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - logstash
 accounts::users:
   muhammad.naveed:
index 42ed51495e0ab614bad17930564b9e303dd84a00..ce9dccf50080028f421d3c86168d8ddeb2ed7fb2 100644 (file)
@@ -16,7 +16,7 @@ apache::purge_configs: false
 
 
 # New Data
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   dispatcher:
     docroot: '/var/www/html/cache'
     servername: test-author01-linde-com
index b183cb793c0bcb9e2a1f050c3f98832d778eb891..b971bb846c210826bc8a77e44fc3b2c8e6dac360 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - nova::compute::libvirt
   - nova::network::neutron
   - nova::compute::neutron
-  - site::profile::mcollective::common
+  - infra::profile::mcollective::common
   - neutron::config
   - nova
   - nova::compute
index 4e9d5d1f20a0fbe7d4e313a8d78470bc2083bc5b..1d7dbbd4f873ae73cd74af89139edbfa10b78f8e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 xymon::modules:
   - 'ceph-health'
   - 'ipmi'
index 344a805a97d31f21fd25c4a069fdf50201921659..7c57b7f2ddfdb497466e55e7aaab4137df073f3c 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mcollective::common
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mcollective::common
 
 
 pacemaker::corosync::cluster_name: 'storagegw-cluster-cloud-icehouse'
index 58798661319911050fa196a394811f9ac0f49e72..160bac33c67754f5b3dd307f659d6bdfbc5bacbf 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - galera
   - nova::conductor
   - nova::config
index 2ca146484d69e1abb57c2f29fe057dc6eb830910..8d2902bff8f62b88edc409e3ba2e7353d15f2b51 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 xymon::modules:
   - 'ceph-health'
   - 'ipmi'
index 269ddeda7b3f3db8dfdce9ba8d1fddb6e0a1ae1e..6e5c05ac0bb1c7861f7cf2cc62714a368b0a62fb 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - nova::compute::libvirt
   - nova::network::neutron
   - nova::compute::neutron
index 7000e183baa3d2bba39ea01f521b68f5594922ca..537db94976ef0b3ae9d8f8a0d9f64609e86d5d5c 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neutron::agents::vpnaas
   - neutron::agents::lbaas
   - neutron::agents::metadata
   - neutron::server::notifications
   - neutron::agents::metering
-  - site::profile::mcollective::common
+  - infra::profile::mcollective::common
   - neutron::agents::l3
   - neutron::config
   - neutron::pacemaker_agents
index 4e9d5d1f20a0fbe7d4e313a8d78470bc2083bc5b..1d7dbbd4f873ae73cd74af89139edbfa10b78f8e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 xymon::modules:
   - 'ceph-health'
   - 'ipmi'
index c37e001bf25dfd4a53389726d59b4ee2ca0b1cc1..55c3a274f547fa4f54ec359112fdbf11e8d38427 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - hosts
   - logstash
 
index 250e691c18d1ec100678618d38405ab154046a5d..7ca2e3d2dfac5b7d0984f928393a2ba3c6048192 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - nova
   - nova::compute
   - nova::compute::libvirt
@@ -11,7 +11,7 @@ site::additional_classes:
   - neutron
   - neutron::agents::ovs
   - neutron::config
-  - site::profile::mcollective::common
+  - infra::profile::mcollective::common
 
 hosts::hosts:
   10.10.130.33:
index 622c7f04b8f169d3765699aec09c3d1b6dc2ed2d..f009d2f68a8d0dd8f7da6d677959ef2bd786f0ac 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   ivan.prikhodko:
     apply: true
index 4e9d5d1f20a0fbe7d4e313a8d78470bc2083bc5b..1d7dbbd4f873ae73cd74af89139edbfa10b78f8e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 xymon::modules:
   - 'ceph-health'
   - 'ipmi'
index c1add12af4b91734c7fd436e39f3e3a08f647a44..8a8f1f7efdd297935a3c082053f09fa00003f52a 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - galera
   - nova::conductor
   - nova::config
index e81e5f14cb005e7d4dcb613c251a7ae5d4fa090f..956b7de0b633c175b3a1a0cecb8b4c945e0a0648 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mcollective::common
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mcollective::common
   - rabbitmq
   - pp_python::pip
   - hosts
index 4d3ef9183ccf12b5c198f0d9fe42ec01c65c5e37..8ba323fdb24c6a40b9bb0cff10b76ca974004dd0 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neutron::agents::vpnaas
   - neutron::agents::lbaas
   - neutron::agents::metadata
index 91cdf118def4d1354151d8305aee453a1e7f51d8..3c7562895b2a40691497e67c5789c064af97a511 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mcollective::common
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mcollective::common
   - hosts
   - logstash
 
index 09e3cbcefeaddc64447bdc118e33dd099d148556..4e72a75034264d0381e2eda60106b656ac990834 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - nova::compute::libvirt
   - nova::network::neutron
   - nova::compute::neutron
index 48ed227716af0ba936973aff7be1ad0efa12609e..14f24db3e59a2c8de9e5d13995facd2521adb202 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 accounts::users:
   sten.friedrich:
index c46e8bf75e4c079d07adf994c455d6701cb13aae..f43b3d91e825ad112fd88d8c2775f6d3f2ec4ce6 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXxJOj0mdC/LBMHWRQjOBY4hlHOJJTEJF6CYRshxVGoXY5ovj1hNC3XTKAhnII5k+n9XHkFWoK2bCwhRny89me96XgGzbVEMWlgRDSRZzPWjuYOJRQJHMsTe8mOFl7MLNQhhIjUD+09Bh6Hzx9gQ36l6fYbciMojBOYwx962GxQJX1oZXbjtixkIz0bJ7+//5Q2n88zyf2FvJdxMcQrDKcRKqoD6KH+D23rkIrJ8rfTWk6mz7Ta/RMGYjUxRPcJwhu8V1aHaQ2Fl4ezOGAz7pYu9rJRVN2zADdyTqqVRUKoNjpm3BSTgu37b4BnztWIuaf369sVbbg2ioTvfTD6H5wjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBWtzz4ZcVRB6zyWM5+71AYgBDRI5kDRuDfHW+XHUrs+5b9]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   specials:
     servername: specials.mercedes-benz.ch
     serveraliases:
@@ -45,7 +45,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://www.mercedes-benz.ch [R=301,L]'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   specials:
     listen_owner: apache
     listen_group: apache
index f27c410bc8693b01af028ffa8538c2d22af411a4..7a9e4ed9f0318a9f54fa1156d9b8c3f4c01f902b 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuRQFtXyKIQx/cdCRcdD7e5bg6pnsSzVH0GfXAePV119E9nloZxI2suH2JBgLR3uo70fp2c6lkRmegRT4kosw5ON6gsrJPatS6SwJryjQ2smSrD8cw/wPr7IHBQWRX0sg4MsoA8f1DmasjNyNY5vPun1mmk8aqaqu+CbOxy8yh+yYw8t8dlXmNc8LiMGIO0gKmbX2/vesMhyb6Y8N1EU/+dY1GEw0gQgzz62TWGxVfeaBTxy2MkEm87++cpGfMVIamkKPGV0Fg02PjGeCRR/1Qs7xl/XQs+8x61KkY8SxmgZ3kqi8vnlxqYFaUejBrUQ6OtoO/Umurqof+SWqshYetjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBACOs0qVrqT0ISCJkhfunx4gBBQeNMEjvNFKsNAC1BOgtl0]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   specials:
     servername: test-specials-mercedes-benz-ch.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
@@ -43,7 +43,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://www.mercedes-benz.ch [R=301,L]'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   specials:
     listen_owner: apache
     listen_group: apache
index eb67c3c3e48df624a4018c4ad7cfa7f39424ed34..b8f75d3c9c62686f0af95e42ac4b152db7446626 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 accounts::users:
   deploy.hamburg:
index a3534030f7cf460781e8f5fa7efb758967024f4c..7cd3b124f110e790a6208ce5439a5df2b0086044 100644 (file)
@@ -2,16 +2,16 @@
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVphaT//OpAFXb1tzi049WDOLUrxo5zlZBwxzNOm+hWE6//1QBCCnIN0VO70OVUIL9IjgqLyLZOPlEbcz8CGyx+G3B2IDBwh/IJIKABkSzm3eXU5aqbNdtxYo9YN/Hb5f4selcpXWP6cp3MYJ7RWPt4bDACPk/pdTWV9jaAz2fOAOiXTcdGt9COCiw3N+tXMtp0Bl9tJwe9c/TSG/noYmJm8IcBF8b4Xw7NnZvKiXNMbqyB8gQiDnrDE8Qrgwi6qBRLwPeQ7XxAFl5BNLqyUzpoVLeso7ETaqHDWcuGEQneKIWJZ7FMgCaiVjhgRnVqWXradXn4y5WeLM/nHtVb5tYzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0eow/cSInwD3H0q+oYFdWgCCd3XoLqBBNX+i6FeU7PxRWDLYS2w1+BHaidZRzA+x97Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvO9tbteIdbXryVHcDaSXX9dpMHsUQ+y106A7xPIqVmVoGTuj+5Vz+0g5lOVplFeP4DZQB/M5Q9CGrVfvRfO4F2rMaN+Dy2lvOiFLZEQ5KWKisBaoXU8fk+dLDgtScSUPMj0q2j31IA2yGipS3+L1xORIXNOlvxxLziddfb8KatMbG9N8kYh8ztT3pkOHX9FpZlxw9wN9byrc2L3e8BC0rRneerqzbe7n9QbtncGR2Z9qX4vjG0vHW1PFpk1ePdDuaflXdBDF0i9zGCyy7YITJXB88TbywhcwugdVbINoY7VC1a81uZGoHuACevJKOLaZjEMlHZhiV1BF+Gb+UQpnZTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBwEzjT2emf/WEXunq5l2BEgCAl8I1R+Ag0rc0vRq3/OgTjLbbyP2/fhHcn639HVjg4wA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   tmodell:
     user: tmodell
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHI9jtb1cXAFdxC7LQugIs/tm9cJTTYutvzq290sHYylcgZZEx5cwVEovOxUXos7aA8g9wC8lTWhllLHeEr2NQ+jiMnElD77BUmb5aLbU85L6Gcnq93/rlM9Xo3JCKszLUnNza8l1B/RbHbkrlB514CJzqro2J+drthvaiaymuSXTrYFuQHf0kBCFBN0GCvdkvAwAGrgYo+ag8YZxU8OFn1mgrAcWnA6klI6wj3H8rDTdkC2juleNIJh75X+PlUVwRUc/IxYXwJAdKf3nTRDv2q8h0ub1wkvkcQz9Jp2lZtofhe60Zy0o+5d/jdZ9OqLXcdIldk9GPcLmOogEJ2Uv8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDVdpD3QbTkYJQWOOOfWlBfgCDuRr6YHG035jQRShvjs06DhhyytuZG9+N9E06x6KTv4w==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABl52nYw7vxS7QiR6Nb7fFPYnhgbWndAA1rctYQIoLa6zI+3ywr+LCL+7Ukrvc86WnzO37CKa9IOGLb2NxWJWU6D47CXaLtsCoUqTOeCxqvCk2uxvblCv9pkKUaPhKVAWA7jPeDQW40MauTZKZL4L0gTTYG61c/WDxQD3kuAeaKncWGzt9RPDUigWmQcA4fqp//d3dcEQSVO24PFVhWbPAQ26/Uv4V7+bRdeY+lHdLkn/YV/nDwWWJoC+u68vDZJiOnCPg+AVz/5urR0XFMJBIne+LLiHTK/7c1/VOal8lDpY8FoW3bOXjp3PE7+FnM2dvAArLzfF/fRcdlotzQG76DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC1kQOoVWuztZjlMvn9qDlcgCC40/T2Q6nBB14pwDkhu0nwO0l5mleNpHEsJuM64mf9kw==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   tmodell:
     servername: test-www-e-klasse-t-modell-ch.pixelpark.net # WAF Domain
     serveraliases:
index b196217ab09cbb14ed1d1ca9c52908c26db9efd0..5e5bd96668aff01878458c1e3abdb738989ba2c7 100644 (file)
@@ -2,16 +2,16 @@
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPRXlA6AWdjZsk58ZiKR8s3WpulXkUEXUlpkaK3QD3CLOijnFhaB64FPFxwDPaNX0dcUVVpCH/5tfrtraEr5eiMefKI61jlMBev18E4/epbrS2DzophuNScmFHf7hBnqRymgZEsPF4EpProBgTCjMkkeeVsMjM4pQhBSKJPBI1+GfOM2nocCBVx0SyDTdFIdLuMNn4FQkba70em3HRuVsa8CdHl6JeZj6DvBj6dDjT/tAX4yoE6JZg140l/73HfmbOivyn9XwLlnN0K2/wpmCPHz07lfDzSqe8+ufyrAP0xXKq1MmNu+OGZRJ9LVEsAmVQTwT4SuZSRPfD4XaFYRvTzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAwLNdeBIL3hc7hc1v6LsRQgCDMvi/9uCs/LDvUlZq3iuaHmgSztawxZ+Tx/XyIz1TzwA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbz2f1nevHNfH2EOz1pBO2cyFdTTtgE8xMwXHcPyzlNCGhcHm4WWpgpEW1YOBO7LRfOfgUe9jNIK6/3EMkOdMqbsbxe8Z02luzx5OO8TnH/7H4a/gy8YgNZy9MDBHEQHjpUD+kKvmN9Xqktag5kJuoZDcer07FPK6WXnngN/Ew4yKqgfMJwB/4acIhVAOYkcP/x6YL9gO90OUvKHiTZYUnGJ632IgcpqOwAVrLqL4NkbBEjdubiccb5tMfApgmyFPJ+B10hGop2rsQUtxI3SSpKQc8nRrMAMFnBB6EDK/o4561IEmugXyRvDy5DemMq9EBmAvwOp4tcrL51SmCz+H2jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGyG6OMGUsDwTr6QjlqFeKgCBttFii1kPvGQngtEjj1WBrIC7sBbsIBQPCO9MEUuqzSg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   tmodell:
     user: tmodell
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAg6xl33i3d0A8tswf2okK6aG3MROxZnW20X8iyYsX7gAxK0euNtlJuJmazdCqK2B4dDzcZbSNfAdZnbbYEVGXT3Lx+5qEPQdALWEATDYx6JxwpCbdXwtl+rr602KY4NVyNPdwB9oqrMEpaGyMnOoTTEYf6OUCOwj5OzULltdsd/Lo7YvLVmfS27mzeaYerRWNf5+cdWsyuR7zn3MMCF/1/xg6p7MaD0f9xCqjAaleEAARM1je6RpEbHaddQaUOYfK37Kjgg2pdAsx900dLGvXmGFpeqseWsNPgF5IPGaWdvKrEw3hsT4yTkkXya3amAqK1SAtMVW2okQi61g7GbPa8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBsdHb7ALZ1fWHQnEzLoZV2gCDeG8yhOr6USZmhli96W4FAM8yH2ljtBdbJP8cAC99gsw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAX/3ZF2jIrDWpu0+Dvk6gWqLnoojfUBQ/gkaYlwGlKWFUgbF+zYQnW6QTWi4k9tyivWTR/imzURpxVgKPJaU2arkU+eV9z+oHtGayefaK7aV16TkJn8OKuQ4xC3RaNQfEaE/FtFghzYvBBPxcvfcxnbYlUsPO66IPSwtxCJ8vI4QggyipIlzhxLokOGDuG/cMidJ9P0DGSPLtsZMn7pLsB2Y6f8cK7njGvhxl87W50u1BQCDXQgnlUWf8z6cL8wWRCy13tTeIy181IgboQoP3z7OliNTZz18UCEaYC/680notGqHws8bO7ngNwEflJPIzmXJgj2DxTKywXkqH9QtMTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDLBmYCBSIp3ErDzA8ynNE7gCAkrXpLrjaZ0cy5ZNSP4fAidujl1KZlDs92z8Uo+NqVcg==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   tmodell:
     servername: www-e-klasse-t-modell-ch.pixelpark.net # WAF Domain
     serveraliases:
index 8867cbc0df7bc266bbcaadee148cd10504307e80..a5d2fc997680f0bc2c33b3bba0c731b5d5bf742f 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
 accounts::users:
   sten.friedrich:
index 28ad2f324096b49079f8322a0699be8cb97cfd78..c3643fa5b4aef7854d36e10b363c0db670852a18 100644 (file)
@@ -1,17 +1,17 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiNfdQxwaDXcABk6GCWmLyBgiWeeLpnwvRSTGzW3MX5bn8b/PuD7wv7cXGOZVWovjsYkZ1oP/31mo9Kh/e/xtDnjRpkEJJ4ypewD9adoIWLZgbxg9dQ+vM2brBXx2rtJdWtJDWQGzhsfWZqj+UQapsmG/gYW5//zUcq/Q/NDUEKLMFYEAFdWnlb4pBx2D/eCis3tEqSV8kXGo6NCpEKHcbLZHJDicl/mDzb+HseiZhjTjp5aVYV4UZxaGlZcmFsblOwRv5Bb+fwg/IFRJSSqtzS+l6lLRAVkR2nX/eKi0LN+d9wxaQJmsEELYo8zqInq6Zwqa0LbgIn8SAu/3I8+ASzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCDCPB5ZoX3m2Ir+ZL3fqZTgCBUtxKWK1Cu+pNWqNUJcvFzZL4eCvXUqLPPxqakio9abg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAh7667vGKT0aIaFt4eQ1/QiayWjhIs73Ju/BavbCvD1Xc8gikCpg6xfX7eoodB7kmH0ZLg8BQ0cXomVSXlqOAqfh7esFF6pcvKBd5AB5Ia9Jo68NKzLRz6QojurlA6x6YlB4QnlOXa3xzVbWuoC/GkcAcAerr+dSSZUv+9uju0R1r4dLC7gpqEHmkUdbivXN2hWWDbwQ7dOBUQaF+qmMauYmhz9osVkA0/vyv/KRozT6o5Ti6HFdAlAr+xm9TXOEQklJgCCUL7/WdSJMAx1OZdQ+OtVkZA8Koao3QyJ7O3aogyjfzv+a9ejQv+yPXq4DA2BwYF/DBiti/YyhX403fAjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAaXUo8AC/TRJ9wVC2suPf5gCCXtBbMi8PNkEXqaZk2XJt6Vjs+KXreoZfsI1G084MFJQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   specials:
     user: specials
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAT/uxybW0uYIsJSG4Y90vwSIKzMjUjCyg781lZFI3OP+VEKa3bqPOHFZzcMoL2BaPbWDulYhwOMNSkWISGwqGGysU/rHuKpiAJvQ7IDRf7M1n8NbXKtggly5P7jzHlYxUMSJBAo3zu2zJVB3NdVIhABdhC1jBWRkHrQQxzAmHJNI8h5lwdzwNncrVIzuaiPDFXesrqa3yfw8T7vt66CNny1DlLXhZI2uIL3TarV/+qrFgt5KyNiNuUg188P/i6UZiT7NOkzODanynY5sxkqdGCFw0GtrrJCvHJDoabfVJjz0/OTALbcRSP2fCJ9PppHqyZbqFWqhM4WUhGMyQtX4GhjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmtQb9tBfy601ZZUtE6HGwgBDEB/o4b9JmcJYbdYNVAhkP]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAe2qIb0EwtiE0MPOd+J8wYGQj1/Jz1XFP4uNZDq9fvRyMS6wVEVUo5dzoo6jSqx8HBiEvuH9gS9EFge5sueQIqktEmNvn6PIiV+4IZLTmpCe+L5abSH7DePemeD+fcdmu/PXuPWJPiy7DbLjyqxgZGF7bVzqDcwJ9dqLSmT1Tc1wjAz8DLno7h02SkS6v50NfAYKyqrSL5Y3q+JyUhpcfkytf73VD5khLMZ83cub1bA2z4SVFtpnG3z7JzWA7ghq2j90JHYFYU3AOpTFoCLrIhFlR4NDhf87R0HQqs5eiQwQ09WD2bWwb3VX4rCqn8hU8hPk8sfeJVsKk8Abehx3eCTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIrN8hxyNA4TpmNwXrq2AvgBD7niBqJDkh5ljCCPoOU6xT]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mystar:
     servername: test-web-mb-mystar-ch.pixelpark.net
     serveraliases:
@@ -75,7 +75,7 @@ site::profile::apache::pp_vhosts:
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mystar:
     listen_owner: apache
     listen_group: apache
index 9b77c719457283e4cf71e5fd471548554a5cdf9a..2614e502fda1aa0dd666383ff3ac14a25b771acb 100644 (file)
@@ -1,17 +1,17 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlknEfHZoeKckLq9yrdNVgDSC5mMGetC0/uQvuCWk4VfJuGGoWIGcQPxjJFnde5KACNDfh4Loa55Q3GrJi7mj7JPVw8CYPGMf5y6gsEmXtCRZ/g0JrRywFscrtIk8zvTLikbpb9dPeP0qo9C1TV5ZhXi06FvZuKs2+0Jxu9Qz3p0dUTh/89dcWdLI1nO/04611udyMDvjt/2kzckRkXCbJ7Wp1aVLEPhz6OaxsVG2VWzWNdONfOfPsVwFsymb7aPZDzsKXGWlUL3W9XqxnOI098YFk1z6V4R211lFhAlyghEyB8YdiZ0sgvpTGjLeTbMXEVpXqT1gQQDC9GB5YRuCQzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAqQykEibj1k02f0b061JMwgCCrNBnNROa/gn9Np5BBwuE0diG7adSVL3fxCgjvWFyrvA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXITHR/6xX0rm9oRG1vu2oYDhB3jGudE8KusgvVd8DZEmx8mQHctO7T6TnZ5BXp2f7i9ZoAA4ftfEj75cSY4LUCdFGiKKdngord7APvs4TQMuxjKqEhdcON2b55GloRJio896XjyLwzuWuSe3cgob4pqIBd0LC/WrBlRe9cTVjHdROXDhViftDrxK/atoaXaAKvhNpZZIEFO9e5kE0ELWnaxgxsPBaY1KbnRlaJCoEgfq22ZF/CV9Vvpu6a3S6zncOJ+P3j878Wt6SdFumHwtx6Hk2jNGIqWANdu6JZesg3Dg9YUs2YzMr3hS5rENtxPY/ZIdntyketcAZeWWT2q2pjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCdtCWWkjwB+SHrr2OL5lWcgCD+rblg+qi9pttynWyRflot0Z205BrYLa4CHUPWPTlj1g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   specials:
     user: specials
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsMFsv8Sv/9dG37rvIvL1/fGM4HOSFDlCtHkxX74/JJAeRBYA4ss0u/I3AVANrD3y4/rE+jOPr3OZXROOHzdcTARdkCimXjZFCExuOA7/gCpgb240Vhs8/EODZ1CfgYyP/n60sN9PolX1Z2UpZMt86QC6eA/grpM1uprAg7HSo/M4PI2OI98FzuRHATobDUzvDHHoWUtKDpPmZKhsiLPFvGPIIDIHLQ3k1CkSM/vUAgR+P5hy90J2cY6y0gMrmYY6U4EJPDbfZJAwlro/4vR+v+6SsPrxnhY9Os2mbJnq6j3ik2SG4blErsV2zTansPifbAGgs8PxcY++oF6RcdZcVzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNHwsh44mLAsQe9WHHZxYYgBCE1jEEkQEGr/AGOlleHjWx]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASm+pFd8a6Fq4tglygjMd9IXmKs7z8laQU5xB4Ju58l9nbAqRWmAe6hqVPimDEKJV71ef4jFNadLmCbsjmLPZD0kwL6arp1J2kj148p4uJpzFam02NGi7pFeE2P6NKMAS+X6wa59KIzeWNeko69/MhoFxfqmmh7OJEngeLS9o4GN5J7goFwVKVA7sMxriSxcAk6GOfzxWq1OEhDn0NOnQ8HFkxiAiRj3hkGefeaN4O2RkQNnCzoSe7gfaNhSFMbpNBCXv+w5AHszEB1hLEV8uWo1LrM/FLFwCPftYPZ2pnrrt5HVJ62jht3u/HAmK6gZdTlqx9E26b6kSgFdLUzjbGTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBuozhFFVm8rN79jkp7s+EFgBAFR1x9EMHTV2skhqDyyLfg]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mystar:
     servername: www.mb-mystar.ch
     serveraliases:
@@ -84,7 +84,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://www.mercedes-benz.ch [R=301,L]'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mystar:
     listen_owner: apache
     listen_group: apache
index 95873e3c1d4e3a219b11c0169d513a0bf8d99e85..a4521b9d568cb4e7bda868a3fe7b9a230a67cefb 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - java
-  - site::profile::apache
+  - infra::profile::apache
 
 java::package: java-1.8.0-oraclejdk
 
@@ -20,7 +20,7 @@ sudo::configs:
     content: |
       jenkins ALL=(ALL) NOPASSWD: ALL
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   me-adapter-service:
     docroot: /var/www/html
     servername: app01-mercedes-benz-de.pixelpark.net
index c1dc499a4ba1ade624e655cb562c0a3a2e48729d..f6e874ffea355a91f82e2f1f8300186db4c49b7c 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - java
-  - site::profile::apache
+  - infra::profile::apache
 
 java::package: java-1.8.0-oraclejdk
 
@@ -20,7 +20,7 @@ sudo::configs:
     content: |
       jenkins ALL=(ALL) NOPASSWD: ALL
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   me-adapter-service:
     docroot: /var/www/html
     servername: int-app01-mercedes-benz-de.pixelpark.net
index f7eb7751dce9858b762e21e42bbb96108c17eb76..2e41a3af2ed88a4382158a45f1f4a9dc18d07d72 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 accounts::users:
   deploy.hamburg:
index 7d92927b3da01ee012be9af236621be0e7ebe2d3..842ee84263727fd1dc00409e6f94682a2d6e6e1e 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWnMQwy6D/dB/uKCorz673MSgtwVufWtjsEZe+duNZpUtneaICgd21ZjM3lS9GhDcJLzbUwSVkDW0jj1geKEAGWU0FsfBTsR6h3cmK4NREYiuFENKwYv/v96cqzn29x8yaMKMXGp75hYWJyAoyY4zojp0O0JUqk23O4MvxoMPTCITIhkssoCw7N1uJxEBzdhxBdc7SLVvAOMye3kLUgyloXTzPquZYFSKKagRwzOtSKGZvvuhx4WRnD5eSfj5E9LAEmqB0zP2HUdHu4yrXHQjOjKoHH/lbkNNtIHb4jHexENCJ1PodEE08DUlEIIksZYt+2nCDCr7oLMkkFc7V6UQ7jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBCED8a4gGAHy8mR/4pEpo1gCByLVvhvXLo2bLgqonqOiR00rD8Tq/laXl2dm4hs0nL5g==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADrLdOGrte34WJak453rYW0uiIfVH6dO52UDPExDJhfT3gi1pJCy4wb0w/3WqkfHYslQfR02dl6Z474aNFk8d7dof9tnJQgbj4jg2mwNxUkIfWor8Nc/7gUjm5UKADR0uM57enpgn1p8BV/yvghzH3aESINIcvYIzGbFjxNqjYm4vf4e8fXAqkoYibH5YkQKPelb/DSv0nJRmaLiSqV5csDcNljymdHL/X9ExLqBvPW2GGSfwgVEi31T2KQsmalaLMOz6u6BenEzOgWcWJ0Ot1cG9QqHmiEuUhl9OJhQ/m3ndQ1eCfdK0e53n2Rdjw2zCwaS56UiXKM1axZYwRIUX2jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD8fKbRo+etj9q5iBbyFmR0gCBjG0yagtJcRVNp5JTY/SP1ZFYAnQax29oo99XBnaqblg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   roadster:
     user: roadster
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN+kpp5KPBups4qE2XjVcuweMohB64U9PU92GHUJx/mzxtmsJ5q4IV5GLV0tfXSG/gK38C+zZPGtlzDCCn8vf44fOBCLJ+bOiSbOankp7J3lCNYm+2dvIRuwRWRGY66doLMJyCnP/ZX8DnXptnvkaEZbZT7fi24uZjOuvnbUcx0GegL+3yUjDL4OBKL+muyDoH40ZDwmDXUjAM5Ds7N8BRrym0eMe3hrkSxISdsIDpXQucvEzxXvwjm9e9XBjbuJosdQLqs2SiP3An4l/6bx7EfNgBlaNcLpVklnHsRoHsf8kSTFYoh1aEKwXGbkONJxwxRU62cclpVxiXFe65BPJWjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmhxYbfFtlh1gYynvT75D2gCDFEaWnef9jJtDvH4p0mmcQAhGiK/rubmI+xdVKyhrcpA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOFhxv/YoZzOkysGiDqaKcaB+HRzIHBryuRJiFHupCN5+RUfYrsWAI244v/0xEHiiOH/yQgbZVAGR51xcteM5Ftode1/nUNwfCSqfDtnXsTRlOVNutB3RmJBO1POlvOcWHmZYPSHJmeVGBwFc/APyoVcGRyVPpR0eWkDM+4ABHP9fWCr8TVS5vzBDe2Ntfhy+7vp0hqU6PAusP4PobZr6ibocgG+YofJ0LZor+/Gc6oDjvlq+fI6SN7msWs8FmJxt2jhUvfTJmnKKPN8FKyJ6tEsLXu7gtsP3Ds0ANuoiodw8V5F3i5sZ3XFPBQOXM1hswJ3gveGuRg54b8idh+SPWDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDGhL5WKFqryC8KFwOOArJlgBBWRDAk2kXr+CaRO5hN+sQP]
 
@@ -16,7 +16,7 @@ sudo::configs:
     content: |
       deploy.hamburg ALL=(apache) NOPASSWD: ALL
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   roadster:
     servername: stage-amg-gt-roadster-de.pixelpark.net # VIP / WAF Domain
     serveraliases:
index 2ed296c7f8b1521a13f905dcbdf5ab195a9248e3..ceb8842c7b10caa3289168a87429bc62377d935b 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGD5X5UBYM9B6g/XqET4w6/DdTJA+WXRuSkCL69upZwdI8HPJcRtgp87nCqANmNj4r9pu+GAVHau3ZnyrcZf17R1piCURnUr7wQ5a224iisV7K0m9f6QdrOlPfamExN7f6QcEw6h6Sk86JBElQRaQkT+XSbjb03ZBvjtCn/9e3u42IAFyCm1EPRSvTFn7GH4I5HCPXJ8Ed96e4ACs8UdLoQRnbGDvrS81UQAg66YgioimgjA8UQzEElwjQJp1Bby7wGx8604jGe8fegGJdspPsWSyo1bcDrzevI8TV46DORcNvexRPJ4zoL88cZSj1fhuakKvzFlXWYuy4HZZyUwnWjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCuSG9z96MoCXK7zwLNl+qFgCBjbpCes4TqdR91VEQkirJFZB9AlB8CO7J/vHrSevBPwQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATUET4dQKJjg9PndDLuWq++9TfWOt+0xxBL7OsgeudYGiSvte3nc4wvlElW2FlP+OCDKLxwAGxAd2jS5hkt1K3xm+L08iZ5bSlHSmDmDXfIZDazvQlR1h7YUzDNfcVnHJSK1N08SQAFpfPpQ2Q6bvbAC9+4htG8DeXe4fRX5KPDr8gFgOILIoeQ82rputWUAVzuoYNo/CDNL1gVyOwCcjAk1CrICLKMAsF3ioBAE7pDg8HDFQ0n+N/nzwii5CMgDQp88Xbw8gCNEYyFGr0ICtHnnSRMlZ09lb2nkvdigCaQYN2tW3AE3s1oa9BajQhMHmlBhj+IF5uH+gxvV6HccUgzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlQ9TxLEagxIRstVAVVH85gCAEoyAU/Gi5mttYI483QEaaNetVlbVcoNAQu+MIFc5nUw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   roadster:
     user: roadster
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfzhdEs+YlemhfObT8Krx8eUFRpU+CEPUMs6mpx1oMX64x35yFkkGtayV+zPFy3qocx0rtR9GIJfWhpJe7cDk+cc2v2hisJdPf/i2v4cPgcp4I6I/Uj01OkLDlInJbA10V3CDTIXt0rlZyPe5QFSrcqrK7ObIZMgeT3540WvgsowAeRv0piaD5dmMROHhULOicNIDAOQTTLnIjZNccpYHFAFSHiQk0VUcbr2xiKUx2ROS08aISg2Vc07jQNNYnMJhcspRgfzQj1SxS7HMy4k3A0n/bnODmovZZUO0kDbFn0TgRDmzaRppe9tXOj5z0NJtijB7mltEE9rmrkmLxGkj2TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAwDI7zJUE/VQTYlWSWB44VgCDyVtI6Ujh/pSuHpOjH2a6ldFByaQwZtQ0UOq5EKeVdHA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbTMnMcX8tEm23oipsnWXYQQj7pE6Gr330O0kYEdSyThblrjbmk26wndMfUbF0aB78ddAgp80ZP4n1948BMo+JKS+eH5wwF6hRxC71E0Hh/j6sjyjY8n8PTJrNd2ZRXPRm8sqB++XSRsnzu0MxoqGkgKFkkx+rMmf6XgKvIGPn0qpvmT0jHzLnDV5aIUwiVMzAIbqZjIPBTDkY6h4hbAEBF1P5FyLKf09WXyzCSQmShmWemMccg5htNMilnGPRYP/jZCzEbkCknzzqgFNA8xE1ZJxNDJafUWtqzpA2uOs68YZTGL762KuWY3T2yWp91zFWjVW9hBj6tFfIi5j+kQCcjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD3HBawMh2dK/9fSLY+V82ugBDw3uvO0fjWNB8P06/cBldI]
 
@@ -16,7 +16,7 @@ sudo::configs:
     content: |
       deploy.hamburg ALL=(apache) NOPASSWD: ALL
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   roadster:
     servername: amg-gt-roadster-de.pixelpark.net # VIP / WAF Domain
     serveraliases:
index 99dcd16e7ff5d07cd0dacd40efac7d7dd8d7c6c1..8f86ada53521f327ff948b58ced1dd7aaade2e5d 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 accounts::users:
   deploy.hamburg:
index 35594d841be189fb9bb4f8169d98c458a3b80ed4..902f2eed52fc0df62299b476c49bfecd46892cea 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiWzg9SvrEEUDRfi/draP4ax0KUfayaqM53WxMhtNj+4D7KaXMjsI9ur7gKgGxLwHfDQ40EHQMtg3e2uvjLacoXrl4A5d0ajcALWOv8iOpiMCPzy4CV++29cfZd0k82ZJheCotOTWMdauIQtdUok2VophvFwC09KkEvmBuYD9L1Ysm2eB1P+iAp1QRYJ8nrs/OA+tNrKinK7k5/KQN3q3iofDehbPFoDcauuDv1qWfscGkDmPegYwXJNPQreTAFujhkRMd2XO13jAz43Q4FQGv/BetL6z8DCH6DXhUXLDZesMC2D8BLkEnS6wDO+fkpZi0OqYAr8zgTqLDZixM5AlnTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCHCJHnFqRPTNoDFPPS3YeKgCAD1HFBVRYhMF2Uu0EDCN+wN4y1IMKQseasLIYR7B7cbw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAm45LMAUW3zwvTV5oBeI7U1RsuZTMJAKKtFwF9Up0ov9CpVg/zmX/yvcljySgb/N/eToLUw2FlE00Z4UbgOf6KXLWUYlHqHeeBlwiRRnUFGQu5uzDs3nMPnPKQUESwWJtM3dZm2xvt3/H8Z6RXJaJnNwS7gEUbe02ytMvFn7CS3Wr7uMEMo4UIvfr5OZQ/fE1Jap+cu+jwRR9Z+paJWjXOaey+NSWqyphoJkSShtnw4r346da7JNH8F39jnxzTs7NE9IT6tUoKOmrq2p2IUqw97jZYbDPWm1dRn2oTHcNyNskD/IuhLyESvlWud2qsHULUPCqIeKE1X9rMf7ypDp/IDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC+D/osrOcT7qiH26L7nZX5gCBPNwqtaggmwNu3qjLAbSOCflnNuqWpK14jvJlzhufvhA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   amggt:
     user: amggt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAw29gnI5OJMZU2J1IxQUXT5KQ4Z7UZPpFg0PJeo4vp2GuNBguV7Ur1DnqZw3YQI5LEzbU3dSQxyXCMngDWXC+/Jz/z6sklsoC3jOruZXBaJiUpjyp8jnrw4aqbXbS9ZhYyrzzNs7WbZGsf5GJt4igKSv+UA0MdyRDUDDr7O4bDTyWKT47DNAyChKIPZKjmAondKHW41P4IwbKO9g6WBEBSmUzPHzxa12buPhStvzo2zCInoWhd1R2gbPX7TAfawoU0l4sEpp0dcKlJaJ54r+rV9j/F9X0CSNV+f/xxrSi8okWIeZ25gjeDbijr+D1s89xVaLsBAipmCVGqAL+p7F37jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBabHR38D6NqrYpGgbCTXKfgCBkE8s+TRMazqrKK+PyBzJgqmk8CWuKelA2fu2ltTcuRA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAO8fITIfKz/khNDEsgXFdL8MSwz0r1qttX8PdxgofuoU6quzhEwEekR+Fr2PK5OZ3z2Wxr0fHKRpw0+GvLEpXMnIHtnWgjYiVItJ/t7Lm2pcJmo7h0qxGg+EGIltI2a5lhd1MPa3zDsgLrd9SAxrpDr+6ZFxmF4EAA/hUXqEeoOML0pRRShxtXrw0TN+LwK17Lw73jx9cxR+owJTQObofWbsxjSFHKx/38pSfZnsaM+IU5fxlrMCuxfY+1+Ii8oOpMqfvjUGT3QeAt5Or94bVK/7F7ioaI3ujE4F2KHVInTBGc986E8nknIKSX14b0u51b5zQPVQlbiwWwvgza4c1jjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDi+xmQZpXXyMn6SLcIuEPTgCAxVSWuffko89ertiFJRGbDExOoPVuZNh7yjaaWBL2FHA==]
 
@@ -16,7 +16,7 @@ sudo::configs:
     content: |
       deploy.hamburg ALL=(apache) NOPASSWD: ALL
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   amggt:
     servername: test-www-amg-gt-de.pixelpark.net # WAF Domain
     serveraliases:
index 9f4ea672fdb4e647a8aca848430a0af163807e4f..5384ae955b3b39d8e948e2601c4f04b2ca0faac1 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsMsV2Zk56dJRtzw3WSz3UTKuw58bN5YWgyr+irfvQjyX940rZKpn4rkVGJ+HZpQinRJW67ZdCLspepbyBrAClQfgX0E00K8x6e9muYkGvaV6o5USMQqLQzqDfj9dzwgkDPWVXF6b5QOeRQRygomcV2kAMscCy6xmM/xLTvW0hSyBoRPxCoq3r7GOAE/Hm7tJ33YhkWYu6zUSkktT2FH2TA0H1L4/PTchQNq78/VY05xsh/3N7kJw8Z5NWauczPiI6wMsIrlCCnHDptOgf1/PKbadRYgz6h+ZX24M6FlXlHki9KMRBtj+wpMsG0lymZCsZvl4d8lbX1RIsohkki22HTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGG6cDQ6RrAIvl1DhcyHz1gCDzQOA/cZGeMdmvnw28K1Tcs+LY+l/ZjuMnCpFKFzViCg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADkvu1tmIR7qVfEucbe3rE9gRblfnqXoKOcgPnm1AU67fT5fsvbyuJruvOrhUjXUSFbEveUyuFNVT5V8qyBfHmoq9vJ4T5+N8yrCSrJicalCGHC1aNK8xCuopZ7uxldV5h90IxErt7JvbxAWmi6BBAVytTYR4qNu4kN3Q9z49vsZWaw367Ej82dglIe7BekO/vPuzjhitmVDeSa/rLeugXWa487Q0zCvikiJnVcTKSdLTKmGn0aT1e9RSntz8YLtBR+Hg6L0l608AHp0bHTYNAvDFZdUbUjUPlthvUetWkkcXdJOI9RSyaKlSepNWqte/zJgdKf0BySM7VnTaOyEmVTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCBUEFgUlnb12IyPaM3FcwVgCC3OxVDAl4Pz4yhgTerc5pcQChjuXIGvWomKfCFsX5WHg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   amggt:
     user: amggt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUi1abFNntqB00Sa4nmC3cQ5bZdx8u2zJqjjwJYhJ1egLY/KsXqlKDt0S/48Iyabjm1h+tF09AyVX5gQxnp+c+RJdMESP/sa8b3PQLGzssmaf+sAUuS8kvDNv7D74IrKnn0P+E1e7Lme8OmAXRHq/R6BdirVGODwmfcCRXeMGETobGSrLc0drsBnGxOGj5lgwmuAAMAhjqaaehU5hJfEd2TqLD2oKidExnzhgFZKwMwb8vfm0z4exJj8HCPEUINhZCuWsWWMxurY8Je0WgZTVUuXh6yaU8NWaaQYL9IpDldc/f5ZZXC8t2anaE/Knhqpqs6HXDkZXSmTcpCGGo1MYHTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDK4uM2mUwqdY6duKSGIUslgCDBWjDNkWTzERwrzvAVDZlf7PjflMF/oIq8qqOG1SNE4w==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoDjGex6p86PzSaDOzj2cgFTCdexnnkNLm30Wtq0dtnVKCMWluOTtWbJB/jxlITuBSqmywIOHp/wtWobAHJOzkT4VN0UL8LkdTK/8iiyCccr9JPhrodhwIVHQ4A++akubCfhR4rB7PBd8dgZfYT47rHuTbjxqLiUHH6+uJlD9fd0YCGhQY8LJCN+iQHoDUHfoDj2hMhDv2TCD6DEYKYrA4Dr0ysoeSTSM/uALZCSjohj2i8r+gU/JYYF/1CTJ7r99uPSxcxaynhjj2mW9Ze6ZRML0HEw/mUvc5fJk5+jhHbyccEL3XZVR1pv1Y1GzE6Q3a4L6pit2jPmBix5ij+IiUDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBspQLrSrruhGhXQHcBGtJVgCBRAqUJf6JtUfpbdBTTnNdf666+AAwy+96MyeH74L7IeQ==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   amggt:
     servername: www-amg-gt-de.pixelpark.net # WAF Domain
     serveraliases:
index 7b8a10c436f8b3a3291f4e85e1fc1ee2b877782f..97c3fee7fc696d70555e88e3f875e4f6f5205a60 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 accounts::users:
   deploy.hamburg:
index fc33784b0d89bf2306d3cbb16b8701f1ddf0259f..612578f8f8e9d7c7809b9c26128af8879aaad881 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbvjM0DtwWEAYhmEtmCaGDp0iLtuxvek/BN+mzQdtj9cQ97p4pu4pGJObBRWd3WTputndiY9CyPNx9HvZuceL7Ao5hcZd14tmIi9305TIPZTuxt4+aVMxv5IB5edvFME0nqwRHBjK39aHmfY3IF7Q2J7FM1jg4yRYPabPnt4BImYE0efgx/svBswPXS9A0P6mtOH91qAtzGl5W4vrR4VLfeb0lQqpKMJS0RtWHzigJuLjpC1WKA7T8Nt4j1I47xmQYlPMMcRZwWkwpPuO6chz5JBSFlDg0DMj+T4Pn5jm868VCIVJEWoT/4Gu9/vTgL/nn1mb1oIBn6gOEQQsLMgbrzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA11TbEC3y8hUdNp2sfpuCSgCAQALo+Yj08Wf7UEVzsjknnQ26KJ3cPi7/mP/IWZmK1Vg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvIpTkvGAvKQz9d6FKL34IB/LmASIAzp5hr5xeSh/fAG3sT7DCuRLeV8Iw9+q/VAuvxNybE8nrqT7AF10WMsiVo6LqQFLhQwxzuzWDIY7NwaYSUx6ZfAQma1VP1djWfg6r4AEXSlUuDYYf1tB/qWvilSjnsn6Iqg/owKcGf7KZ0EaHKuisDWKBlMnw/2NLM+hOKVsYR3tSxglg3ufjIahgZiJiXQUUcvbkbQdHYXEt6SF94saMkl5Bmi1W4C9bDcbHC7P5cgoAmPc7WrPbZjw97QLy+Z1lrD9hDgrD+yBv78rQSueBRg1DTPKjkZrTpQpVrDsyNqnCEVCOlyyifxAsDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBv7IzYIRflDMGxsx+70KTOgCB4vZlNmBzCY8ZTgKlvwE8kRjtW6UdEIopA0GjC3xFNKQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   amgpt:
     user: amgpt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOYhV2e/DNUa4f0Al1fPcj/aLN58K+ft6KIfld2OiweuB2in4t0+4kACQjviL9dczXuG9ntjMhakiCn4CNGMxh/CvBBC8vlYLNXoXsYrClWLyN412ad6hoXO4DQK/nZc6raYypwDsq7fN11DRALazNH4f+txKQEI1J0DclMvuG5TQ7HduWuxQwnaRMaYRObf95uiuoh09aejhAJMzem3KXamtL97rTDoDDeKc1yz5ypQht0QwjhR5bLoAcrbgncRqmv/ApDG6MQtzYgvz5+64dCn/VdJzpvR0s3RNq1QT9bEWL2i2ui6YoTVMtvStjvfb3xIpnjou0A5d+zH5wDFvGzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBByCXYGFogCvROTy+zSivgSgCD4lak5QJ3dDgjAJ42DKVTdKgxrFSC5LX/ImYvgEUYOXw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXgG7/p1nt2D50vUhdoD/8bO78yGYTHotG+72Gx9FeFEOvR+TO7LUzuBFRJI2Ey3WYDzzJRSZmPSb4R9W5DuEOZ48CE+i/jFzFFDI29fTaAQ1vGdogYwdLpieC7VMmaZ68+tRfB9Ab5Oh9ZQikbCtvMpac6E2Yw3tfE124qj87TgXlhIBgOoDueslnB5Q1g4dkPjus0e/z7wwAY0D6nTcoNFapIIYS7IKkKr9MEXshyyECz2XogTsCXUybmPrHiTCze3eoi9nF3FMv90zEbxhwFOo+tAId45nM2M+hzTBgeYmiOYDBaI5y5nMV5uhfuFRkTach/st62bqCIZYdNdY3jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDzX+fMEreizcry++4vmCl5gBB42trJrzF4TLi857Sz67Tr]
 
@@ -16,7 +16,7 @@ sudo::configs:
     content: |
       deploy.hamburg ALL=(apache) NOPASSWD: ALL
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   amgpt:
     servername: stage-web-amg-pt-de.pixelpark.net
     serveraliases:
index a0e06832fcceecc7841bba0fd6c2dcf89fd83212..dfe30b562d76a4a3e79ce0e72f498453c3a26d74 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJ1KMLm3JnBMACqqsCdT3Psbghg7AVRlGwmmN6ib5zRggnXLecpXD/g2643hKpC/SuP0Yo7mDeDY6Dax4tX/UXOMXnJ5aoMt0nOQFjridXBDVXBLH+ftMBV7IjKrssPWWWHVx24P4UJa4w9a+jld/ryN46F0M0/1PorOUiLQMu+CitUAc8/DqGwDaRRD3n75xAbv8M4qKYkeI9LuS0drCm5TnaO2u8dShwvm0aPZMS+Cm0rcAT2WAbzVF6pjmFfsPV+J9kvXpgZRTtB/50OFwI1+/yJBIUhHudYwNUUMyrQq9gun0NJC6LaUMifAlDPj8XrQSkX98hCRyYEUtNf04+DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC6gG5RrngxyEKJzlIprzyqgCC8uDUn4+Qq84R4JVJr+toFvCnQfYwAv4NA11yPUUUwog==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAce8W2Ng4Yb9dyf5J5ey8kpxUIlevL9zBCspPkIvSGQgXLSTHCO5+j9nXZJURmSAgzlhLiM/AafiL5PaSvE4oKrORT2ovAKEaZUOdCvlL2ecP2xgeQnQvnzVr/l8nluOCQcTd1v5LRakXknU5hTcGY5NmEsasNSdjAp0oQd5/FdGvR2bTECuIkYILWTUnknZtHW1Ko0r1NP20MwwGbeMITrBy8m8ZLcZ0hurDMWOU8JFnd1b4Lw4HzhVumkmd9+5FYsd9SwVGRd/Gd41Z4V4AUQoCZdjXH/s1GlLQYeqap9LUZkjXblZ0NNMxEXTYbj0HaNcolNMJMr4t7sbS40zA7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCs3oiEg/WScXwPDTcXYQIlgCDI0IHMFNwA+OWAThYJeTAk4v32xdELoFIzvSALuBc1kg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   amgpt:
     user: amgpt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoEJBSKfb+EXUIBnRR8YbzDO7zow0FZHNCwlVTW6VkTiNVrsDLkEYYUMjLATBHXbksi0fxuMtcjO8p3aI4gKnXXj/FQkGgKnLxNs80pLYqA0uJpfX26o9HApKgbKgU+wjbuc/fWge3OLk/xyCTF/VaW7lP3qWsyE807rOytbgtp0qEeczq3bWKGbirkA/vOP8wtz6AACwSxARxbtqCjGcBR5WSJGW9xexjBbVc8+xuO6WUZbWxRAgeGqbrBbU38S5isd5gsS/0fKRBJe0LhW7RZU/RphsJCSVaKXomEGNOoM9YA4Lgxran9NleNL4eLejPFwNkRfC/HaCxc7ZAH36qTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC93Vem3LwGZ5iV4I9KQV7/gCDOeUZuw9ts1v2X35DhTfG4v1tF5yVs3lfX0fudVZ3Wrw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATcaUG4i8EpA77VcBEyIPJfKLSyIpEgSvHSdCy6071ZSitiW44SGYzcMR28iz0n4VzuspOpJZxBdziArf3fV+ZJY8lXw7GLIBRCqTPD2P+updZw4kTGfDFCeUijQqQFw10xShU7HagDcC3O+wdq009IqHNt8+BWYXCuwB5fTyvk4U170/hmknjfdFXvK0uXMc/Q78XtjsAtG8bYOKrOLwslsFTQAG+iGEX4nSLJTW87z8dN/ndJ6trGNwpN9RSoFOLJSL3YGtfr+fGnPOrLxsI+mCe3060OOTf9txdqu5hL1iqt/hwLHn/d66vM0FOW93y2zCx6OXvaii7pvIVvoD3zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAQKqiqATlPRSzd+5KfQEPigBD4Hh1nhtt0JyeARjh+RiBv]
 
@@ -16,7 +16,7 @@ sudo::configs:
     content: |
       deploy.hamburg ALL=(apache) NOPASSWD: ALL
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   amgpt:
     servername: web-amg-pt-de.pixelpark.net
     serveraliases:
index 42bac40b163a46e19511d394def876e2eaa297a3..eebdfcbcb6335e9731e01ba41c6c22cdf80cb998 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index f0fa33e9d4144233904691fe430ef99abedbd4c7..427aee706fff34780c6a7d316047a35da0331099 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKyB3Zv0YMmkJlF5mMECCT7XZ/TJQjYOQ+55z0Ytgcih727zsndwbJwd50A5rlolu5KbL2daOpeSqjGEbgDAB/gElRysBpCNog+U3o7EhF9mLqZ4Kns/om+6qKXgo3gk7pFMYNQLJ/3/JByar4oGG6RhJP7lN8MlujbKjosZwgcppCfszQULhjFDkb8erb273PDi2wsD/2BMByuSMfPXjDrLtW5NxPA4DpQyjgDKlgiQ9ICnaM1YT7AdnobPTTpf+wisyLIfZ6wBhKe9mAnjzeDgwL0IFib8WweUNcToGhrg2G393hZoz7qszQcXfdSCCoQILTjMGtG99Z/Fs0qh90jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApPC27O3Mz2peR33Df6jk7gCCxZ7I0CqKx1qsaxczOVAdZsQB2KXriLa1J682e4xNm7A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHWDNSojARlmG0uoqSljXUNhvbUtxVDEci2y1zYSw+LwZOkcuJNdkNfLoJAeIMQX+jPB0WlgLG/ydmBRauJWb3uhU7gVZQU83qrdtZhTryMLc4DulolmlYX1IKLfSztKxsGiGOJncEcvnWCiIq4Yq4/Nc9dZ7Bz2Gtc/s098sJ7988ycaUWvBYU9O2j5rDClq2VxPd3BHlE7JnMwpag79sWIjPzVLyBf6oZ4ZozrMheW9R1oCpFfGeaxye1nt2sKf1i3yBkfKlk4hXPD6zE7dinO4sSj7R0HvFqmBn6lFh1JR6GWNESsUIkxAssyaS/CHdfAYjcY2wdwUocp0oclaqTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCBPrbYeoIkComd9YAol0WegCDmSSPCSfN2Q1K5faM+GzmeysiOGmxThOIRKh1RZpMXCA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   banner:
     user: banner
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAu06k5B75n9OJeJTeKwfkvVVDJmWutt7LQM/WgPJK2hJ3GS80ADI1nE+iaB6N9westhW25yUhLoNUOq1EhUtvLaDd/iemZiBTsHhnCNo/cY9JcbaDrtTrCs0pF7+BAQ6zSuf9j0g0O6LTKCbodburvcWKJDJhIIV/fxzHd4XEspymawpXk0GhLgLTct7M2PnLIA442JMmBRHgcPVf81r1pjUsQRtRSyVwTD8bo1eFBxRfVeS2o5hhhoh/t/yQCHtMj4jyCoCpEN7qZDOwg+9f72FBPPdpsxeq3TxQ1lfto4ldEi/uSnTeG069XuZPABuxCLLCq1nZmIoBKGDlaLNYIjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAPlJqQiA3mRepnlBSYJO6DgCBWi4yuHykBrIy01jmNHLsyOPDa9VL6Jp+UAaCdAYh8Vw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqd2p9dSSrfORtv/Dkw7QqbUcgrq+qIoPIpkIMQr8eQ2bRpCYeksp8HzzLPcFXwIHNcS3Rxg8OwtYlgwm1EjvgUhbfiVoiLetr+9aNOW9X9/elWDZPM5GaVrMWdioQVq3OkbZDcIsCJmiuvIKCcwPrZTnTmUbKroazwKZy+iCm1uhH0pxhEu4w8MXAS1jIwCvtuM9QmU04p+HmncsVnH74NfGqDZiWK5OX3mNO6GVE9wj8Bg9qSgNWCkevczB351qG9MgWSOOF6R0+29YX+w1gNvybjqalHuwEvRtb+dtDwG5zprkRK2lpBAputIc/zA4jeb6PK1sV2hOqF9wlcMzrTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCXhNaHw/IOnoYrdRg4oAZFgCB4gWiclBM/LaVuu4KHivkzIj9976bRckf0Zw/lCWywqw==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   bannershop:
     servername: stage-web-bannershop-mercedes-benz-de.pixelpark.net
     serveraliases:
index 08f13e2fd2811f6da0053becc53024b9e1d73228..53b60bb51563332c3f7f8b40e399a46d7b38ad97 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtanIlT2fFxMNwLvcn9iG6IPgF/5maMupv9y31UmSsGL+reB18VqXOIDqFSzpQVhz0SbBtK8BJJqDXEV6ayqBwm0ukKfrKXNeljbNdWnZZTiP1UE38if5Hagq2z1AewudJ0XbLGPRiu4aNfNSGjzEHWPo+iYnh/3SxNfoGUjX3lXTwIsNcx89G+W2b+bIGPEiMPgKvqn6Yb8yVnIB7wq8t4MtZ1d5wW+7RJR4a7hRjUgqzY9Zm8BrFrjxelTZissUkHFJGBPyg2oFPjQSDB33YO1iUxrXZlwOXcCMSgML4pnBXAUFvvkCpAilmQt3M0pMFeXM33r4ngjCyhft+qfbbTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBn7hsaWXMpLxQ7EQBD48t6gCCDErlwMiV0921dFomd5dHCNxRdntqiO3sULMZSfxfazw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwdL5E7Wa5WJO1VGD2uynbJPVo6vnBiYSeCqlggXN9YF7YAhTN2XyFzEekr4CXu9cMSfHKsc0qjhM/c3lEHs50gyxXKXYCksa3ylWyfN6gbf0T2Suqb9cCpv1tEiZBC2PhDd8SpchT4oT2y3nzbsdMyyXXs4zoSe7dTsJbrHe8xCvFtlSccYw1WV5PX7tkzz2i2k3fQE5svG6BuI0qSts0rXTT2ZToAxpWSpwo8wY1mi9FyNofEqr2qTbXNDRePGA5p5TfFLyyryWIt5w2+KIG7mPCwRwroklW8aDfzVuJAltS8Os56A9KcGhEd43sAUHGQOeWJ289C1prHVPxOxD8DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA4Bu7ONA0DvjdcoCaLrkuCgCAtF1EE/wIw+8LfUBbZ6UHI3OZg0S970JAmwc/vZyVEDA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   banner:
     user: banner
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKfyjTlorhjRdaKZn6wAj0BPl6K/Q+cultf9/+F3guKH5k3HHSkcWjNrtQTYESvLvpbWfcpVzckKmBRoYR/yooAxDEOvtWaMaR/vCglHV2yqT9gNm28zRsSQ6aBzi+ZM4Ex3Y7vJDItFDf5YVgvgtdOpEYIvcFsciMrh+8MDzkIoTkstpAdps1JsnBVcqbsMGmp9V2r8SRZQG1Dd3pCxSV/dz9wQBCWTsTlssKHf9xA51D7xsyTgXInZxlr0lNF/gX/dKyfpFCv0mMlgydlqjtVQm03qU1+bUfuMSV1ko1YwXJ+CrKTy5mksxsqcu50NZ3SU+Ry5ajJAqdRIOZRFTODBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDOBvCBonLk9Nzw+Ci9N2kIgCBxWyX24Y5Q+HPgY6mhAVOl5J+TkJlkabcndEaUNNPtDg==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   bannershop:
     servername: web-bannershop-mercedes-benz-de.pixelpark.net
     serveraliases:
index 332e3da18e75e9c903d3e709f2749f275dd01abb..9883887373e066a48eb9e7e94bdd8c4877211228 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
   - git
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index f5132697c1d69c05b8596cb223234b8aa27ab3b9..3e9f8a7e6c4d1523b4a41540a2326016dbbcfc2b 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsCOAjsCbr17oQtw8KccSAL2DMFdsvyFv6VK8VqgBH/7rH0j8jXNZMhlkYMu04lfgmXu3MdAPFgWzQatqZaTdJWMFHJp0n4hoYeGnzSj6ssvuVb369YMV32KsMPxVs0zDjIqcFiGr/BY5b00klI7mD9P9Y11rAccoMUZXkCxJxjBKMPjrtQoc8acV5FF4r/HUW31m+HDi5VUBfdeIr1OzKlgYHWgV0IiRDAq+kKIoYr2p7iNTRl39AqM47SS5naV0GFiCzgseOokcL/e8+S+6AxcrNMzni2iFmYxD2CQOMrmws3l2HnFkirFMWESmb+CPQ3PiuoSF0mfEeP2WpazPIjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC4cBcJrBxt419zeucfkjVcgCB8Mz+9B6CNE6t7rS8BX9IKD/H5nfi5Z7/qmUdRtBqifg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAMwUzXOD7HR7lUcAxd4zH8QHOQ8iLPDflwAkMeygOOxKR3natqsiqndsTQFJNP8D49WkvqRzq257CmTVDZe4z0dNfE3XP2LU+zuDdiAO4z9zNB7RYKg+E9rqQlcooFWIZNqeazJQNMZNW/rS0bY/s3MBcXWBSafJklp3jN4lFiIibaI9/t/cmhZAZOzlPKOMN5ALU2bShWHg4acseLtLmwSyME96P9uxSaT7+yMQKHXQzjtFojF9Yw0n0Eb01jeF3kAynff7XlL78RYg21sRjHSRmvJsMRB3kGxomIseQOc+3jycT2/DSBwDmtfULjvhyUUWfJDapiuRgD3iQGdqqyDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBJsYgP/Ima87o0PyhREVCwgCAJ+ZvlmN911ZEJt692N5DTEcTAH+wShIXvcES9K17fYQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cdb:
     user: cdb
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAF0WztKk0oUICLT0mVQ0HyaKtQduOZ9302r6JDqrQUBFaU2V/GJ+9/rzFjbFNj0PIsO42OpwYbgb1Q5u8v4m/cwe3aJapjH+ai8dvR+Ro52eD8Yknud5HMReu+Q9qJ4n4hZCKf8R7LzAT1KcLBSLs8NBr5LpxTK0EATAtgMnqleGL6heJP83IAZ9aTYvT+TZoFRd7ryWs2Z2maf/3Z89l1AIYfBVJv92ikkCIBuxlkQAfwCGDKOFLW/9vahynGgszoUEkm6rKa8EpxekhzNSU9bgusbX67JTU5M/ssV7/Ha0fb1Emjp8CdoylRYA3QR3jLk7roPUsjB0Pe/6R/xtAHjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVNeLg8hFj3EDYtt8Ec2uygBCSwYQr1U8lhhESwDmXiwnd]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAOO6VciSgihZ9tvDVZdybyNXg9TasqqP4X4NaDdLY7J/fl4UH3OlpX5hM5L60tuLHRO9m7qf0RwFti2dpc+53V/YwIqlchNJxZENSrXJM2IBrbTnkBxaSqMxUj8LX8NfLxcdl411rU8OuGOZjFj+GyWEKA6Cs0BczSO0gBpwpz/SNNayrjEdgMKr3C1dfbRzTihhsurY6HILrh6h9onzyLKpjWByETBJGYg2VPGBGIFDApAz8LMLvpz9a232WT0R83y8I+v1t3E5XjJOz2msvbroL+tGKLUmWsA4IhokydtEEmxySqqZHdpuCPGqC2qcVoeUljfcL7YitR95ZglNOzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB3qA2fZeP0gtzMh8SKhgUsgBCpu/4Rwl/hU6p2MOwMN3/y]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   cdb:
     servername: stage-web-club-der-besten2-com.pixelpark.net
     serveraliases:
index 33460e032d796f0c3307f4ea914e67d18fb01fe9..3b5381dab56e9ca28702c7b151dcc69f85eec4a5 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeIwCvmEM2wTeLwus1NALuziWdvLOocGZoEpGLcBYgia2G1Ije0Q4mEe5wZye48P2BNt6D+v/v/2pWmUAs1r3K+GgQjMIvsDDW4HGYhVZ/FZrwoBD+IulLlhOIsI2IaODomeUzw12WecrebFV64flSeZTASyCLj6pIw32SXfOiAthcXv5lqKp8TimJNIixAyP74yLytjtL7KtAIwWBJw4/JGGbU4zN3QfhTIB7aA/h9XTgi6kn35LdmWIb8smkIpXp79HyeecO3mKyfGRMXr4YGaCnMSrQkJy78kjODGdkyT4TJy3wR+K2NcJ0CpYuHTz0d7Ajd46zN4b92DYb+zUnTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNW86kNa0OnUkQrOtmIXfOgCAFcETgU7V5vY3RUEyQtaysVAJUDhIuEVWXdhQf+EiwwA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgmwCLQ5Afx4nfFbs0iRvzyIbzurkY6Bce+GHyWFlc+KlnyJc1pJrva1Mbw3mhXmAhxjlXLsnQ+jM9OMlP6A3qmqVe8jPWRDIye+BpEsqUWriSE+QfQHKBEb+859yE+NkSve8JHTf+i6OBy4e2vtvJRpH6I7775mMxsP5mFKYpN8UI978V02b2/cdmNaEx0AcdDfeivIvzVZ7prjJwFcrZToNewFZC+pRpg27EayZ1NYY6L1PWqpA/CFYVlIkNkVOunhmBVNO+BhTPChr6XPitqxrEwCx1eQLQmoFRNM6/kEw1Xwj0+YOu0mXnBIb6LRBbfzFRnxHffCsD8al6bnHhTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApJGL8G5MURU2R/FYJBlfkgCAREV5cYUSrU1YA5FWlYNySlOTLs95X7wyqWKirHS2kUw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cdb:
     user: cdb
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqrGbHKRrxrhTgWM4zTD5uSlLoZJw1NaP0aBbY4gGTdQ89cz3Dt/bNNDhIv4e9YENkIM/6H6951/yQ53EnFsg9qgYX3UeO9EuEnrDsr/+BIqIzr57n5crbjYLgTJoV84pE8/LHUR8qcK9tqYMnZycMHdhTUx+Sz/ZHP3Ti7rbQ5JIvCnBdx8dJT28i+h8bVCpiLgk+5/p8EBMoPOUD7w87rbHVxthWetUiAatCpyIpXNeMid2/mowGBSCuOMb8jXubPrTrnB+5+rUWr9ZHphAJwAQ2mr5WdmIRjwHq24ulmv5OtVfly+Zn6oFXWV+p5WaKfiLz8RA7jAWpxPhe5ZacDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAigb3i1PIp59nM+oZEoDDmgBBdmbj7SsTBIYL7u7bejW/x]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArsW3TMDVS78CNVoJPh/byBZ4EziAqdqVcDEdectqAZTT48sGVqRYxrqHEauIzQI6WlFFF5voynpfQQTEZ8qgr3wquEzYhKZ1aJFqRBFzm0ZWQL9j2hJLU+5R9zYTjml6KsrroWhTBis19mQRBie5CxYAG+b/pnMTeAnXVqz6izR1VAeYI+l2WXGVOFLoVXJgmJcvRcXRRh24ML8gmUa85XJ8C5GPrSjaaSFYwGb3zFsCwMVzDYdTVF2iabOZcVRGg9nZQfsZAjB7S9X6UTVIS3zTRw6tFPumGX99EHn7AC3aBchvK6/+CMMCWgNLOOVrSvQnD1wxjP9IbYQeSFoNTjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCEqReCO5MIH+WGvfEyeVJwgBBzqkKX9Fj2wzboJ8PkMGGO]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   cdb:
     servername: www.club-der-besten.com
     serveraliases:
index 5726702f26348e34aebc6a69af2fe8fa8bd3410f..ab7b25e08e542d429e69ea2c601c5eef66912b9f 100644 (file)
@@ -1,17 +1,17 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::apache_php
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArinO03Q8KKBxcnJce0HDyPRWkm8XbcR7dlatca1ijdoLPAKzKpjo9mjBFjN26VMSf5s46VAHF5kXFGWJrUcnLGW5MT3Z3AI7Y68N4A2apnK7A1GV+094b7GsgCeRTRxobiwQ96Rg+/xHRpqfPy2SfVK4iiJISeShPoT2SgiUFjYOK9hUJJFasUT4rzDznkdDCWhDpZJ37ShznSUBkegfKfPfFefKyq8OGhJdYGx1bOEkER9bC/veoNt5AbZ6IKW2W3Qwn0NzUZ7nz7LA0jo1FJqv9wLSIRZoX4R3iUszQPJ9tveafm73WammiFQDXXF3MNfBOcSC+zxqgyu6fR8mxjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCApmPFz3/3zqHrUP3j7KE4gCApiQZYaSkrLYUCLrZZ6P+w6tOhoDuT1XKr5lgXu0KVxQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWw3p5zamaqFh0VFyTMSLfgpJq3ib+uAjeYmwUkYdYSdhAnYJwg1bchfT0HVBeZIuLVME1ufbN/i80vDrHrI+++0etTrCJjXo0dVbz2r3Oh5DuopJXLzwUCZYBftFxZhxyhCeB98mKQwD26gmefEihGn9SZotg8Cktah1D3Qku2M2J3VfmjkPlopJ5A5XHVoXac4petpIsbA7HRsC7pL+gSli+p6sUhT0gf1Vlu8J7kU3tPuAEieSCwy7qrWsqJLLXafa3FvqvGSEzB0qIXhbNHMq/SSGW5xzOQcvjr8NP9YbjSTpwX5LbP4x0t8CUfmOzyGHhb0QpYRVeDNZnw75yzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBtVjGMNLzAGEDhJKEc+TRsgCDnZJtdabqU7nelnEU7zNKIebiaHcp/nB6wETB0IfQtNw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mercedes_ecard:
     user: mercedes_ecard
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPRfO6ClGW2/tV0jFlSw//K08vXxvoxYV+cOZbcs/zY8VrSa0+VXbNEKuwFuSeaM9Ae1MwdW+OnJevNG8oNWtswOYU6OVd0Jq0LqaF5J2lQ6KFtnWT186QyulnewLOq953JX2QJup+2nfOCJD0/ArvaxYFJFpfssNaRPU/8w1olXa0Gxa64xTo0ef1hQFkTl9vKJ65/yUPYysxHLRy7G4wugg4W28J2s3FKCLfktdS3yeKAgPMtJiY9BTPcFKMnsFclgL7S77p+ZfWn4k7WBKtKqF2cHAtvwhBk8zLdEY233rmUqqYI4Idwelo6MQxcCinBWuqWmtTrOG6hS58J/RbzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD+PfDTa2yU4pG6uU7KCZ8sgCA3wBRxbMV01RTLfxlk8zQlpf2t++oDGsxfZIImL66Gaw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATfeqDHFdDjuRDCtsARPCaQWRiVeRmmYXT2KOSD6ad1s4vs2g+2kDi2hq0jj/AMLY6mCLB3+uRPPIQD4//zwHADNHeBWv6I465Rbvhpr22aFPt2pXjBWypB72uqtwo+Lu1ibBDPtJnozwxO8TYyQmCKmdy2o/Iq73lJLqbCdCHwNzV5q0aoMw6Xr4ogrFDXlQXZvZA9L9HnASmMQVG4yopsW3P/lmM1wUElBHMhjHjHIjKvOEOEp/u4oKboFf+sI6dCm02EV2qV9iBh3cB563fJb3ziFMqMpogUNa2yiDWOWefWkQG2nYTR/unlFSGryArGze2GCxQScfTlqmvJyeZTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAs/bQmwAZZ6rGvmET7++7kgBCfIBV6Lmnu1jM7qScq7hDN]
 
@@ -28,7 +28,7 @@ php::extensions:
   mbstring: {}
   mysqlnd: {}
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   christmas:
     listen_owner: apache
     listen_group: apache
@@ -39,7 +39,7 @@ php::fpm::pools:
 
 apache::default_vhost: false
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   christmas:
     docroot: /var/www/christmas
     servername: christmas-greetings.vans.mercedes-benz.com
index fe472426db9ab7fe4920ae64b888e2a238ff7c43..e2b5211220d1d1101e5b839d5202e6112e494c44 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
 apache::mpm_module: event
 apache::default_vhost: false
index 4e03e13732674c9da94cc3e5296e1013403c95c2..39e42e888e1a4274e18d71bc3d7bc222e516b4ed 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnLa795IEyob2cBFTX56ap8THz15mFrfomr48sb/cNLcDcH++HDqscw0+PfMnIIF7skWpXz2NDuDI4qWoEB+nbNKWwjoQOkS+QVLzw4wNXS2v+USage4hqgusEJMlKq6xTtZR9LyZymUqcoKLTTzz35F2/5hKKYpo0bglUYV1EZWWO1CRZfO+fRAksJBrG1P1yztFk0WFHwoRlN8/um5yUIQo5gZLQeJAiHcL5v0HrgK32J+xDl1+WD/a3Jv2Swl8NXd6h+ym9TNHZnx+nn2O2b7ghPkbtxXSboWFeeIEhkZSEyl7mPr3QSssV0ze73J7N553vx2+bMfJLDT3m4h8dTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6xnVr6ghhc3qmOqk3jxvMgCBRusdmoGOdDPeqdzG3JC4RQe26TaMIH1K/rrBYJekflw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbXrdYBHfq76ED0zOxdkmpxGFzqrASgfGD7Sq63QbEIYfswx/OtmCOxuPjEj8izPJ2hLop4yXz2fJjpepaGeFH89NqSmuCAp/g6bb0D2I55dErggHTSpnqyXVOdSZSdWdYhzdk0u/IaIiq6es4pQyatmTR7ozlAcWks4akTBb8/XIKngK1g2Kv/2YbnYGMvoVu0uRXENPXyp3N4srHqGQ5h2auwEQzgXqz8sPFIDZlwcI31ha6dMF7MlJze799RqIRbGrErljXyxCfkOfhfr5n3kga2V+AtokTXg00neSY+7bpOAGUs3eGo/svmDU0l73ntgYMYrQD0ct07N9/+T+MzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCs9E6qYmLECjZh2ygW3N8WgCCFBYbZwIDSZ7rR0dQqi7s34QZFbddfYsBOQybNJoHE4g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   techno:
     user: techno
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArsV6dKNjfoNYh70pT60w9M2AYzuAO5w/iU/YGYbr+dDbrh/ySxrYWg7KI6y7ki6JyX5lzTG6nwP1kjJYiNntlfnvNDOnWXyAuX9iFh+7dFDEKcTUiNpD4yNYCkFLSiZWSSMxm117FWhsdYp6hiI/8UA2wNnAJhF1U3BJN4DpIT67/xwdy/FhqQvpJayTSTOXu3+bcDz1KfM90sfDCbWx43glmmsk3J/OOo/ZWBQANbxHEVb/4yw6wuKnCk7HuMprDADLIog9wMJ/PBEtjRko9CyNxWe+xUSp7DPap70mvXwHsDP7Uagrw5quJSIFoAxHh65WjqIkUSkC0QAl/GHG8TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDeTLKx8h7UVszmF9VFgQ2vgCBGtDSVXN4pT7Eri6QK7hlumSPbzWiBSEi46c1ccepTUg==]
@@ -10,16 +10,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   techno:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnrMXcwK9/ZjcZkYJoozVMvqals6nI4hAQpN2XzXh3Ar8xvJHAlDDGJyd/N7s56+3Gn9yBQGHawfqVaQIbitQ1OmsQJV1CdfcDQ1PINUE0d/Lrp1IRZB/GE5cLksW3MDXRHv7S1mrE530tA5ut3GvlE/2LB+Nirjxd9pJNBpjV9n4PGtX5TNeK+2Ytwt1YTbegUW0sHEPwNIQMUr3hWd0jUISXFS2NJgAJEcmxDuKl80fJAoJb4lomJKjnpKc2AMLmoJBGP6XwczCS7qMEDyBKVtC7plCOjqUXLU/Iobs6pyeCTgW5Qxntjhgb1I+KB/cCKG6zJDAt0vbXEfLVeDQFDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAozXcxg6HHvkN+DStENiLwgBBBtofyrLMcDBO29t3fMZyp]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   techno:
     docroot: /var/www/techno/web
     servername: stage-web-classicpartner-messe-mercedes-benz-de.pixelpark.net # WAF Domain
index e93864bf337e1853c45ccd5d0eabe402a5e5d28b..e647d0ca94ef38b4d0d5dc7421cd960be0244dc1 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYBclslrSSmRzoyGAR6MMJOTtig2vib+JHoyhQvS8p8O82g42YxKI8+DJE6ZuM6TB5vJzB+4pVx4ZpZF2H2JHJJaB7ByHMfXgELhDNTUr+MIc0r/us6GWU6hAS+Ut4aLKNmyrivBJ1N7/d66NZfnesX9is3MextNBICINpdpLEjvdGZyAMQ6xVy+yotF3zZ9RO8rhqT7abnXrHAIUL8ebqI9E4O9pK31urzd4IWl/pCjjEjFwHQV/bBfV/kgscS/GI8U7p3Z+XVoBn0CRoNqcuCC3V83g86Gk8xcQa/tYZMtoui6ZDTP+PKZ2n0RikCq+RmiQPcVPWlMrSz08DVm2WDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDC7Q1WnmoY8ZNXAUNyNqG5gCBmTfazKkxINinBmGF3ZySlApVGBUKWcyMv4+WYiKNW6g==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtJenRheI4zGM9nWL6Ld/8ZLyynpEr1SLOABCtXt36KDwP1e+O5OC0FCKf6oSrW0S4FlwuqrehhBpuIkO3kSuEHPB+oMqNF3mpocMVMuQxBryEPtq1U3CGUyX0peY2F0aWsLXEmU7R/Yf4q2pNxaXtEBW4fI090yI24QhgEPMYvac51CQlJsjw7j013AA9a7TjBMdQeMMZatVHnKVVRp9dpaSsNuAR5sxNr3erDZcAz2VQz5zjdWFLRv1mG+XsbZIGBM6Z3oLgRaJLSmzIkb9v2SN34KaMw1Ibz6h417hITcOTaCWT88+dSy3LiZ4CWTPxMn4tCHvVFZKNhymrjVisTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAaJEmN3mmUdFs0gElOFRSGgCCZegPGTyuyE6r0rdnMNPU0Cb8iaGhrbGIW0ByexNWJgw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   techno:
     user: techno
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfRrXqgb3/ejriTtqL21kYkEW8ziTIxVwg5MwJk+C2mg4j2AczHFuu9L4ogjbaeOrDfd7RCEPcHP/zUaFNRL/pqX4MSCwamNDul+MsdMB2DSyvnqC1L7irXzALJdEM9/E1UH+cw9QI0LIgc9ix2AtavK/v6WZgCju6Fxg5Kf7QaAfwWE53iXKkzMQHic4JlqRTv1U1h3ay6gVwjx4aU+NYJdpuIy99S1uiMs+bvn5co2hCZ4rNhaQeRrnf5jlN6oJQxnQT+ipgMe8N7PzfVrkp/9bIed3In5xCNNhXW91763Jsygxs6zgJWYZzkOCpD4qcmnQBO222db+a04iF2eMrzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAa0vxh9PLOj2Isau+1r/wdgCC5m5/VWZoV5wel4hxiergRyrCmJPYXI7nBKyuT/G/iUA==]
@@ -10,16 +10,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   techno:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVdWyYmPYwsj3BSIgHfgN9zQqbjMuFSdNUuG9MC9eo0Z/59cI3jRs9lcmeH2vM4zDCSXUVgQVMvC/d0RH+pHfXOIyDtSVHX3TpE/FXFy/GcNLjcVk9lDi4rQxc0o01luSiOHbakxPKJnHx/DhgOI8x2Ybbof6lwugurOYnyA+PG/Far5Oi+HguICLX3AAkL34gIeV1QRzMoJxELJMQLvwTGr48qwOjXKX5fAJM74Ig61w26exYChNZnBK4MpOqT1BIO5VrIfO3pX8p6XH9WkcE6n7xZCnuv/L04cdiR5qX5i/yVGDsRpGUbfKcCb96GUGBYEcwirhtD3RmOcVoKSiqzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBJr9DGEu3Gyj6TMfgaZh84gBCYXFKgO3VkZqDYD/XDthIj]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   techno:
     docroot: /var/www/techno/web
     servername: web-classicpartner-messe-mercedes-benz-de.pixelpark.net # WAF Domain
index 8561fa28ede3b62a88f215a5b54608fe290bf144..b9fec60f79eed2600413eba83baef3c1b5bc3fed 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index fec74e0f179d4e70b21d088f71dd5d61ac80a6e1..ce7c53916c473f583b718df6a951cc41caeb3ea3 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXPivTqq8IHS+4tRA0gUFIw8o4zmXkea3DSpSpH5BzPKAwoj6soJwSafIR9Jds5R/xqh8BtalRtkpCujp0+4ogrwgl3CymEhgfmv7x2PhjsWRWa+yif+IwkjhziPjV6w5LbAZmrG0PABmoUUVhNVEbThnrmFKzlemehFOQLi1O0o8Axe2LU7IkdKSFz/ew0NMOPLYfGVAmkADnBZ+qxWqYM+fqAju8J3dOmTxrDr7AT8DEfnBQb77yPtym+I1469GjgI7MqX4wnj+qVDqryrFKabgomgUd9+GxgbOqe+cvHgYJHA+W53GQZmTyWJc1z034z8uvVZNurymJmozc3kvhzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDjERdHlf6Ud/D+SM6m7KF0gCDXgl9LVtxh8QjYzK/zdySHnkSKIFU0D7imUFrZkIayzA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAu97sdUYC2qhqZr6oCPvl/xA4Y8BvdwO5zltl82pxCybmu/DZ+qL30eoDVvDgbemhH96z5eKQXgEbArG+iwl6oNHehgMXlQcIK7ObzZXVKT9SfejG3rgdTPw0ZtX/Qr7w0/g143JRnP9yAQF5vr2HxclHGStyB2ihAhLExZcLAy+sNBMFJpy3aOBHtwpZos1yFrsEnZw5zx7GodTn69DqRL36x3oNWtOCfLZOwie764igIO8B5/o8cPpRAC89Hof8Z2v0Ap44Z2JsA68BPF7kAe9ZneBMy2WBgErkCYa/T53kxRMI/n8nTeYHMFqVB6Y6yjcLRBZunYtjPfCHAMZ+VzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBF4Wq6wCnPMbUSLXSTsWLogCBeyGJv/0+RO29mw7aLuiz65PEj6rGwLIzHwLj9NUEuxw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   eklasse:
     user: eklasse
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADUbBkKEN67t9sUvNWvq51rHfuIoGsuhpaNo3TRMdemINblOnRLzqk7MiMUQ3mNj7D6rGaM0ABBhTp3nl5VtobHBYSp2cZNJ/MdcaWKZrJCvFV+gqqnaXfuZ085WhKSRsqrCJr/hAeplyxQnKdESz2zAbNcDQscPfVP/xCkYQObXg7POyeCtiwPS2keFMQW8KRkMxUGpn9v+6YQ0B+NLBAEumqxzaF43SxHtVo7mQGAgYGF2+01u0bMaWLBeexGT5A8bYLZoRHKanz3SvzV8FrjDZZDLDliPGzFDpr0tE58AhrL/6PPjTtLaCLzeLZ/gBZ57gOQ/tZODAMiCZbMnODjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCHUYcXaO8QbIu1NMr3ALcmgCCBDCxUP0keNAzSoeLfY9HYAu2yIE4+U7QWuSsZaO4Ktg==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAP4O+gBgAjfiYjYRmG1rV8bZcKdWVDp/ar0HZ81ytoe3SclzDSTN9rXopiDKXNFrNWnagIPhJjR3wGVeZ9sFtTkWlkasnTSwUtxDS44JThZnyIvBa86dnhzjpuKROO5CQwpX9JIRqwzoAT/ztUJbD4em5BWY9Uy0Jk0gjHksxl60ryRPVjfYRcCPrnoXIlWU07xsagdiH5/wWZ4wEg6UK9vslxZ5yC0CQnXwVHdPgaMIAuq4ClrjLNx8/rscZX+D0O59F+4N3JSGKRbpuY3dtp6NxXxR+WGqyOTx+q7XK1CTpZ7vxRW3tAgMAeuIvwGrHobSengaXAUD8QB5+dGjCJjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDD1GqXn0ZTYucjZ1n6ONDJgBDXA6SeQYDVU5ICrXXIDqZY]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   eklasse:
     servername: stage-web-e-klasse-amazon-mercedes-benz-de.pixelpark.net
     serveraliases:
index 4f7e931a2d840803aa2734a94c5953d5e9ed53e6..ad09d7fffc6b3244e70b059fa2de0e58dfcfb1b7 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcsn7oa53cyi4d1AcFJIN+IEW01gK0aSiEAkR1rzkRL1WpO1sAzVojVDcL2Orw/5ZD5fopNP6BVmiPiBoUlYN7U0YBaWG8sPzjnPLq8ZUN4g/AKX8OvhS2zK5C5n0sUQgFXzyGFmF+Ml8VSn1X9HTaqjvl7RcJ7wwkSHtyFh7zXMup6qQoWO4GeFdzfu14XTqDtraGgcaj4o4MIwjj7HEUhm53CYuuG3sMOu8hlcQuQ4GWLCr1kRgdG0T9PDTWauUZZOJRT36swKci/gMS1hoAR+ODxfRpe2seeFX2XUXXav3T5Q+yrbYqdfKTAnDTZ7F1Ye97bQG4D1oUZgDYAtQpjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBZISsnFHZS7/t7AK+Tzpp2gCCWmhbnLXKF9wNW2I2mQOyDb4XeOeo0CwVy+eElqTkO5A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAv/aOCtMXsJe5ed957S7fInPjuw3xkiTB9Ruy73rxNKmgI0HXK+GDYAt8H34O40gIdLlRvs61J7bVBeBlqyBizsPy21uKRNRgdU7hpE5/9genKQ3eLo9SpcCxRNqtHkqRkuDnMMkgekMYdFO4kn1wVqjX/nRRDXkgrWed3mEsf9oD7dlYBho6nkOTxweWFyIhWvLDF0zakleTotodZ/LLtrxKPulBd0N+NOPt/8Wt/Waso5ZwBrBPvB30HF+Qs85LhjsrfBtNfmgPWHPLZEt29CNK5CFfAbhAokDB16xivum8YOVoROgq7p4IrpaL5q+ESFb6I6C9enXaGqUc1gnNxDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDhoD02FcBBJXNn8v3RzZcZgCBkXXfEYTHoObnwejd4asCt7UHijXXFZExPc0MSOGDxYw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   eklasse:
     user: eklasse
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvcjG0PhjPoHbbZoEyrDXwn3RA1l32gyLshmPb1Vea55ngZs11ktqxIifvS8PT+bzAXLn5l5v3fgiZ1DhB27KNvzx2Ng5t49rUko+S894z2Nr5e4CsnKS8gyh4FIMKSVNBM0zDUf4AQC/Ar2cZ5MjIq5CuTjPPWcU5QBmpkQuJVANlQDSjDcw7uBr2pzfYOZBAIZEan7+Y6Ed6jmDHpWe8sZjXmZeWq4BAIqc4sd/AiA43/G2XeDNL9AZ6GQMbYs6Z8i7++2heiCsUq1uRTa/IFVCVEu8JOVRZUp0I9VwPas+gO/vcCm2WsbezUQ/4zgTH00qRzX9ctsQjagpnXo5sjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDUttiW96RZX2V5zvx3+HzzgCAUc8Yj9YIRd/SWBElpbqK5kdg4HSUZy9+IPt8AU8irWA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmiU7O9XIBXrfMY2LdgWWRT47Rz15MW2eWjhscoHN8LP8IbogsMgLp9IGYu5W6/ElWLMNPN2925+cpGIYXqeu9KYzBKTSjfB8Xsj5mJqi6UD31QaoLi9PzcmoxMs3jmIVh//09bb361UDbFnmFuAC7bFR7ClXzoVSgxY2xFuJj9+8+Lbw1aYGVPifyco3uHcHaITismyx8GMMtHjlbphU4H8gEUKhVUDxoczAtkUP9lE7VoeombXaEokAZ0eOfaSUCilrj1BAR1EIPZGuL19apbHVq1H6MJ609C1LIWU1qrEwKH6DvV3EUbMf26iwZOwqopHQxyc/dgihxiCI7z0p9TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBnaplRZmEsZlcf3mL3NeSegBBeqgP6bJR8XFjSK0Ml9Ufx]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   eklasse:
     servername: web-e-klasse-amazon-mercedes-benz-de.pixelpark.net
     serveraliases:
index b4afc81ca6059dc54d52568cbb090a536520f3b1..297754ee9e80b547b543091546d2a5d8caadabf4 100644 (file)
@@ -1,21 +1,21 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACjs0IfeN7/0tVaw634/5jLBIUwAKaQtKmVUrmpRTSoX4b0/Ncbq0aS+5R9N7JZ2hMMBcvMo1aeIDHdJvCoIIgaTOYr/ms8+oWLZOUFxVxc2uYmgpHyyYc9PSsaa8vbyRUvpXSdvnuLmeQvYAr0BBoKn4rbTw2L6Si2/3EpSP4ujDYkoekudAXzAOrvpwhh3Yy4Ox2vPNgFv1+Z6kowz17CkJsjfJx2mlgVsINOVAEFAv5vT0S3nQtjfiSHKDuITivFFypClstD64LiMtLTyRBa3xanP75UJkQX/A6iM71j4HGAzO/9I8TzBiRbuX/7Ug0CI+oTXPsDiKSra54b0yczBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAWpY59DYR3jspqpccvauY3gCCix7+FI+gSZtU8UNxoeUhzAuTR6+ioSXx8ENSnItmkaw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbg0Wo4xbIcERMLimgs619JPS1WouJAQBm928dQKkZldpSZduQ/ZM2ECUu4eFT3E6w7yl7QIIRxcnxMy3G5wnLb+RaufrXPMehxL+h7uF0JU2uJ8XDvtUvr7Ir1Zdd8Y9APYmomhICPD+2yrjXVd6/7U3bGhGIE185ls0biWLxR/vdlF39Lzhy/pNx/60E3jhkp+kPyjPvDhtdzuEQVX/aVzVwOoktb9o0vAHy0ZfuwId0/eYpQgWwAgKENrXHCltVveX5/t4xR61pCJlHsh/I9WUANxBxTswOZF2AR0WymKpnLuYntX1VggRxnvJcRWqImHkkmUjoFtmp0NUFlrSLzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8hsDRF818UAfyrWrCz57+gCAyGjS02gaMkyEVOE70L1YqDNxctkupCgtjkWaAIA7ySA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   pickup:
     user: pickup
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvZNS3k3/RWGiMDz05az2G/FQa+coIjqUdVrvKJK1GZu0S7AEYJDSHLJ9EGgVrFbF1r1YRk0L8ZypUBKnb+0NQpUl1H9mG2k9hc4wgkzeZzkBtwNDEkk5YwPvKfzCSazVXPIcnrqukEnxbp+zrnD8vzPLqeSqqggoz5OD2TfVMV/+T18VgW2lklJkO6mIn64mbGEL/4PB8ZWDcJ/12wmm+OnbQJrW7uAIIHR3PNjG9LLqR/HCI1ciC9XVVL3vjBZt3H5F7sJ9lywlc8v+FkKTKmdoSnyWrQRs9OCJoXkX8/JdGhS1dc5+AChB30g16j5/QaDJm51gwuszPc4UPYEBnDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDHMPjExJK2RNVcrAbOfayKgCB599XS8yR+Ee8B70szl0Bize9aLLP/UiK6xSTg/1Dd3g==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAksBmO1RZivD4W9zGEh7o+e9IubGr6ZSCTN/6kKaoibPzo/fNqqL7O8XJ/Oh8R9gE/OMDC0xcu+xTICEAo00Cy7EToB+Kdza91e2C3iDJLE8GgEvg/7Ex1m1d/vmEcLhp0Rm1Bad4+2LNjlwbhzxV4kcmWH9QHa8pIYdVoYXb0UpCLzIVtsK2uAJJyoDEeonkuCvOlgRZgNyuSbc7iWl5XVB1p1TxeNBgLAomQxJSIMaK4dytCsQCtuDfuzUbS1Ph570dSDdOG1uHZildmxaEeXiPSfLIrGdkq7bh2YyHRnZbT10hMF3PJOf6vFcyj5FPFqk/Rnmau6Zhuiq6SRbPLjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBADhZ5JuNurOT8tmEZtLNVBgCCZC7bBoGeXFQeeN1virKbdSoB1gsa5yFnoZ0Ihwsp70A==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   pickup:
     servername: pickup-dialog.mercedes-benz.com # WAF Domain
     serveraliases:
index 98c6ee490dce27c6a1daaeec2af3b98a76897716..23f65e1260b8aa246b9b16388c3df1ea964ef2cd 100644 (file)
@@ -1,21 +1,21 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeNVNpYKLIOf+LxLFqINA9eJiTtINCUR+ToQCk0GxdSyOwmVLUcKg+HrXhhsTJ9CzY0Jl6dRVtjlbxigLaCHDP5QH0qYL7ThpmeQvudasUt0LPxYPIalIw2NvOmcXMIfdfxBXzRXpLc4vfF+wcJ0O7jxxuZDGZFuO80Is71+RA8+9HARnBWp0Md/0+n0HflkVNitRmnZKXuFbxBu/azlj46qm5mVvUotBh3WF9kIYuhkERVovCIOv6GPNKROIeb7xAcGRgX9obWUFihDQgYWNX+Rw4/PeFlqLLxpl5FGwVrPdy1hEg61/DdozDkXYScsWtcoqqHuUZUchHEWVb1AkdjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA2ehRJU2M7hgoGMW+9i5GJgCBJVPc+NEU6baWuAWsNQR2SqnAJQx4HSBsVtGIytxMkKA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVlZvM5y+urQSWbQkL+e5hJDZX9/WHgW552sbhMhMqBR4eNrhBLvSFkU9LLtnkyhewhWisQxF255/ytiWbQTUzfJd2LVCsPPJAf6TDlbxW617ez4sIdIZzsWk3WUnwJqeWAo4/vTXNIkucvHKk4wek6WMmxLVYaVRgy8UpTO29/q2uuuZe6Lxs+qPpAKG0R6nIv1JiGTrMGnhPBPgvzmWvUBctYW/2a0IM0MMc7kV9NV48BjHv3efE8Q5+Ukb2ZetlO5c1fW42rJ1u/U31t1c550+6eK3cSi7KJOkmRB4ka4p9KVr2IjcKoTesZPIDsAXvZdVokyVw3Al7qBDe3U2njBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6e5F72xpjzFPaCjDGHeptgCBhLZYfLt/WUpvKVP1U3eXQKcq51x2KuuPeASYX2RiDdQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   pickup:
     user: pickup
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHI9jtb1cXAFdxC7LQugIs/tm9cJTTYutvzq290sHYylcgZZEx5cwVEovOxUXos7aA8g9wC8lTWhllLHeEr2NQ+jiMnElD77BUmb5aLbU85L6Gcnq93/rlM9Xo3JCKszLUnNza8l1B/RbHbkrlB514CJzqro2J+drthvaiaymuSXTrYFuQHf0kBCFBN0GCvdkvAwAGrgYo+ag8YZxU8OFn1mgrAcWnA6klI6wj3H8rDTdkC2juleNIJh75X+PlUVwRUc/IxYXwJAdKf3nTRDv2q8h0ub1wkvkcQz9Jp2lZtofhe60Zy0o+5d/jdZ9OqLXcdIldk9GPcLmOogEJ2Uv8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDVdpD3QbTkYJQWOOOfWlBfgCDuRr6YHG035jQRShvjs06DhhyytuZG9+N9E06x6KTv4w==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeUNHHCWD4UXhpxeERnrjHxNR5BAYLbC85DRSz4GK82x3RHYIjTAU2oSxWst51TvSw3OM0ErirZTOClKmzSW54E5A5WHJjhA23OeHBpBlp0cGwjWDqYSm9gQQiVZlYnghpxIz3Qe/8CJjUZ8D0Tg2J/CG0ap3M1oQqLGhx8BausLOz4oqS8PPrBoZQ/NvgbHY7iSEfKM4br9kjmPrb86s7OMkLc7ah7CD5lJ809dSaWdM6V9OpT4aUhsnix9vGFuBKCYnoYYtsLH2oDGQgR+UK0jU+Ot7Gp0aVjNGXCYB/gq3g52t53Lxzq4V5yA3G+o00zOClFYbXLYab934lSSQEDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwuEczHVbzQVttrK8QDnVwgCBMPhwYbFqc2f0IP3t2gpObx0CZMTwNp6g1SmFAlPHvqw==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   pickup:
     servername: test-dialog-mercedes-benz-com-pickup.pixelpark.net # WAF Domain
     serveraliases:
index 470a1f8c5791e7b8dc37bd4bd130b336b2d12beb..04b133a504691db5c3a30becc6aefe2d370b02b5 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
   - apache::mod::headers
 
 accounts::users:
index 358a599fd53f63d6d1b36d3aa52578036603f983..f1e097ec8d8b269353d4b8966affb66984c8083c 100644 (file)
@@ -1,18 +1,18 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAffpYo6RxvVZh1eJoKb/Ii+075N088OGF7KGpPgLiWV0q5GqByBahze/eIMig/lE8fO/rG7k5qs2YZOJh4VdFQAdxjhidjUV2es77tlERlDZXgTV32vSqzJN5VmYdLwGYNPS+URhQvTyPBulVJJT9HolHmq8od2BzViSsuszIP/QiuF1zvxuemU1NIUjQsTpNxgYxfjSJ7h/MEc2GVs4SqmHurNQoy4u2ZBqXldmoGGRZfU5tQTn6S6vrwAMrLYWMQnUC3ooRHdWxSmzuDUsoy7qQYHp5sv6c3AKWFIymk9rRhg9UIQuAhN2kjAAaMuzA2AkjYCBgq0eQouEh+Fw2JjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA/Rg4xFCnE1v+LLDUTDRlxgCCEJRnSIlCSPD/w+BbCpgpC0+z7EHeQDaHZZcaMzyUZrg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABimBS5skfnhJD4yCkqrjp4Xv02KpJZ4HYw3ceKQ9KiEASllLt9tvE9VJBFztEdELyAwoaJQd+jGlt17qyRp0ZnTUPge62cJar6pwB4Ff5DkFWedO9mGqzGyM6X//QtMQRo2aLJc7yQcPFX/OZN99FVQCcSCLEhXB7wIQCYh12aM+PSnFBBdarMXJaFC8K/Ioq1GRA/EdBkf5hL962ovGOzMyp4tXObqzLNbrj5REcVAmJOAKGfSeOYEBasxI638w8n6ZvXcThtniN3IO0DsO3LVnRuM0tk3+VA1tfEqWEi1qathZFWeWa3b2eADZ9kH3n2NgF/6zKBjWqhP+xzsXnjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB1OzuuMIMpE0msNXf4uv5XgCDOR9ibm+hyFQ3ujO3+L442XuDH+eC7MPhDRQo7B/yp2g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   fashionweek:
     user: fashionweek
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApAbV5Knf2nDTaxiSYVuQ1zjlKcyk1RkJgN6BvdUtouXK+I6XgluDn5yj9NOz3TbLTe2a2bFk5r4qbzol2vSLdhiIyjeOg1qInmH01Ui3u9E+vu69sn1D0UEoZ8WVhWYdr3DxkE07LhQDEeVXAWqTTf3xb/m9N8gpPKSS4ywUAF8fmQnhju6ReloEiajkPyQ/UOg96ic29GcIxOCLsr4SFh0bRr3ojFDaH32A//5V+tZuvPFW2yx6i8sM2owfj1NmsyaG+rOSaiv9fgnykQTVJklF4UfkPZnEQWA7qMt3NG1rM0lx503mItNgScfY/4rQeUy75r4STnsFIFQJBnrvMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBABB3yxLhjOpJ7UbjCsB+kPgCAlzOOhLACJc1Nv/EZ4cAz3TnRA/loZL62RHSkQVifgdQ==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXG9dJFBZzqHNdqY/H1ThvPH//7oWR2djl5Pmq7PkPL+jTun30CXkxZ6i+a/vstTYokKULTp7M4ADPxFaJ2VloDQtjanfyYq8UoGbhYrcNeqgqV/NDlnEv2d2X3OZqyX/L2WqUOeRuuH4D/X9Sieoerm+g9FPYrR+7h/sblh34pYe6Z86XUSog1IVKkGu3GsMHZjzUYKyQX0wXAHH6SZl8CM0WvdBWKhGgfdmIrHiwmPz+dyJGJxCoyK9NK+8gZVZR/FIfTKzpvXdNloWvzyNJ4ib85N5v+atj+yMQeg9HEPsaGv+7GddoKW1DrICR22Kg8rPZOZrKLGruzT2tuJXwjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCLPw3tkPbR4Uwd9yBtV60+gBDARMtFIfKIqZuN7iJjytXZ]
   server2:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkuLS3cqiiwCPx35IGZOaa5aetPWXlXaDslCOv/G8aUNeevIQolNysf6m1Tc1E6R5NQPskLpJQUcHdHhddZFgGi/cSlGZvbFJLWF/cz7AzB4Fke+mUxme+bvaSObnGMHpTC6coenXmYYk+E/J+DSVDrvlCaoUFLwNxWjqEyLLs2fWUz//AIwfIIq0+MbIwDPA8iEoOfw/7vNpc6ClutR2L7UsQp3GSF5VdtnyVTCFv6ihdgaXLFcfj1w5FwfInEh5mp/oR2BJGhh+NPopt2/PRyB10x+uoVz2TflXkqxEqqCix6UKb5Klmbbaohqhhji/81Lbwt0+JMSrhSx5H004HTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAvaDmMf3IExsF/BkOOUXZfgBDO5eGcHcq98apbBVB88AXK]
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   mb-fashionweek:
     docroot: '/var/www/mb-fashionweek'
     servername: stage-web-fashionweek-mercedes-benz-de.pixelpark.net
index 31e95e926452365cb7026898f07341dd193d1251..4ca3663a4ac5230f37f7b2ab9c957797de344208 100644 (file)
@@ -1,18 +1,18 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABAD8LNpQgCDQO6j5ZWGNDDZQAE+nBKmIRZfIu5Cgi0gVmJL0tVTd2xt41bBtxxr24AT5AdmhBUXoINC2VpT7sjGwggmm9WkKG0Y96Kv0gH39oTNV2wbvFNE+JYsNXiokx8pET3UQq4R9KpTsUh6Pg9FqTjdCSY50C1hmwoHtEcJJM23X3VIz5IUZQQLbdS9qdbfxZROthaolDNZ6tpYKM4r8BNh2W1/KMadd9cpEPE4DtykEw7LBs5b53yFU8Cuo7XTrVGaM5Ki6LHkMMr1gRu9me6bSqMfhAgs+Y6gcg+7cMpB2wJOt1p1p6hpgpKPnnN2cS7qh4/lpW+Fq+QlKQjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBnIbMoZU7x5zZa2ZqYd7V4gCCbSZI7q63vJVgmZS98jhckAzWcSWvUsoArp6Wi8KDnqA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmQocN5avUPhbb95H9ifH1QSxJ26XBXxYRa4621I8QAfLvtsOUfTf9T+t5A6vDZ1N53fvy4HMiGSrhE47FWZa5bhBi2o+XvpJst3P3oTqBuqqyJYNHS8Xtmyw5xCJ4sTgu+Xf0hwg0iRbAy4m01+EdboHq7VW15hcYVtsMoqhrpppjHN77/0rhR5P6otM1zel8zERu9jsazenEITI7LBmgoj73QURsNjaAd4nPUI2j7eeKGecu4b7Ozw9E4GVOksyqauPUMEzcUbaiIJX5pXE+JB4A14KnbOraVfAYl+sjpQNdf9r+9B5LwG4pWEJVFFz1+dnifmbFrEvYHIawdPQyjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBt4NUyJkPRHDyjef3zztbYgCDbSX/BHyyqJS6cxppyyiaZ7KRyZ0yZfAmD/FV7u/ZoqQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   fashionweek:
     user: fashionweek
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAR6Lm3HhhEm7fKfwERFpLSXKwB3mSArRmSOMRt/ODPxzmLuZTpX4gWcQU0p0EbZEva4MUjCBYVx+zjSIMkf0JigxTgS+d6DQ0iLtJqgWND/32OXLjwXckVmMhCLZTLD/WixlOCHm0DfObX1SefCFMIcO2xkC9nOSOiT8EP5GDeTMIdTfk4Hcz3CD9oQt97F3einb2noslzpcmevwatmqG9tJHruHdqk7ZFGpv/I+cO5a/84wqklP3lZRrSlFqgqmZlIrpqUdcv41//CPR/3rbcaOnrUc8F8yH3ATLCY7cywonBoxgaMMCrAascWHQM1XFd95MzVu26pIUhHqZX9wbqTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAOP+cE5+S5k+8vkaCVMPagCAmaqYkJwSafomxbFwZtH5LgFfm5B7pAuPp6I9iT948eg==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAn3hjt5GvRk2feVbJVs19lyGqR8KiGb4JDmmQ4Uv3n8M1K5E7Bl5WqWjzHrFNEI6PR04/FZTQLB498lULFV0ZTrIYwNlmFsg2EUDBYbnwchUyBi1rUHofayITJoNFz0XYiW7QoEuVhkzS1qlqrbIi4gHssFWTXZauOeVRMfCuiD8Lgst1u07HK5+kUUxBMvkKzty/p0UbdGLslIwDF70O3LjHPywyMC7ciS7S+aXvCMkG6Fq6OjAMBFqKn9F3zRx8T5Eh1WUygtnakmCTcyzxLXUX2ZqsjtNVSgXNqNG4vrY1sn3zkG0SsZ0c3VF05//id5NO8Mr6Pw/Izc4URkSjajA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDSbi1P5Ztnq/MDgHKDLNdbgBC+1DP3zTG3Dmpyhxi7X420]
   server2:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZRA3q8nSVQCmspc4YlOugDGNL5MkJpwXCVKifPdhw64kngba6vw78hqABaUue02JJFWcVxpaz7fv38ayoKCo7Q2G0tI0cTovlEQQvf4fsz4JdvlpDvbu6U0+hVJr5qCvs5QUNPuXqkn2OQUeQ4QlwDk2occqBazX4RZiNhf0Tqc1UL92LlKhWgGKFBzbkmq4ejFetTpLCPx0oSCoVlsUuTVuRQUWsZ4MoMeoBj5IlnL0wOoGRDMQ1BeKVu8Ut/WwDSdUIZFMFZqW+oBF+3LrAhbliuPE1qp0lLpr+QPbVdWl87MD+2Pvtl1F1n5p/ZLUFFn5ZiKMO81RHQ3ho5xrFTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCbkCnYtNNfqXjmNNurFdHfgBBMe5h8FvlJYjPo/CgjcthW]
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   mb-fashionweek:
     docroot: '/var/www/mb-fashionweek'
     servername: web-fashionweek-mercedes-benz-de.pixelpark.net
index 856aa2d252fd16adc6f198b6116faddb79df0509..3201bbf5582cab0d379fff5c90ef0f7310682e7c 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
   - git
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index 6efccc5af4ac6464f5c9409e40e7059576b8689f..a329842e2a92e7c14cec0bb0970369303c55ffc1 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAF79BwVc7Vbd0AGXAmxVvE1L3eK61LbQkb9PYhhrr+FgEA75IxpJWsSF+9y4NSX26fRd5gu+eWgevuKWl5201I4Y/3LmDakmDNmBHGlfp0SQ3yayuiRyk5jYGiYa87rFchhqubR/qm0IhvwAkXRMo8678AKy9fevTM+1ovvf9Eb1LLZd+jpbSHfQYEV1BFxS+M2GSJeUM00qAVyW9o2V3Cm89/joZVRybNC66Qm1fd3qrnwSm+hX8whsjXZE+r02id9EiyvlDpc9kVblbdO24LYp2cH3hHAshD8NqlE+kJiBG/V6rMG78jAntkbjJ1TIyX/cex3wG396IaW7E0UMDJjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDoaY9ODg89ogWRYdQhHpetgCBBJap1SnCyFsfNnLlUashu1xIy/3T1lWtbryFyR7ckSQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApS0JubGLj+bjv8UZIj73VSzyzSssHAGI0xaqBrhGhzH3Y3h/NWEp3COJmm+aatoLhQSkvBh33JFcE9hDdNrM1IegtNhUbd4TNZ99AttBcAE1wNHEDOOnLCjsFH8tUOYU9C010THzB6hnrt3HeUzf7J2sKkZDEUHY8QsbHi6F8cxX/C6nlj/om8vIS67AfU6h0KrJAVE22dMnbAHhpDGKknnqVlLgbqtiFHWZqlWF2OGraE400tpAIsk+KMLvkcutJelquCnWCPYNzduOqhePrIutAFX1nLeFoMrp44hV/aa40aKgWMZTCFkYmGsgEsbJz4+VrIyCtSIcK5q1IdwO/jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCsY5lsNHbqKISKNr3KutmwgCAkl7FCWiIUaq3Bu0UdVJhkwMQl2zY3lHZqloYifjWx1g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   faststart:
     user: faststart
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAg41VbvGQCp60Ti/KkvJwI0GZR0vfq/LaxdOLi7dfsWZ3hJQIrcAKnzlH5tJIv3qx8dfxQ8yW2pqhxPODydfIQu/qgqjwbv7bol62e2wYYnIJdOtD/KyhGTdJeUDR/YUZ55TxXXbWMsVN9HY4v4VAGqBjbs0Nqem1nnMZQIW7A34FxD7KZYfuBiQPyHsdULqFz4Tt/yGUgHmUaAiux2JrNC0RQuhJB+3oidX6Y7W8qXypw687wijC9mmNFPz/C82su/Neopx71YyuYbrXo53fVBRbCVau4S5B1d71AvZJUm5LnWXEpMl9Cwkkx+abyRveM1bzW2McmlFYYkTeqWX1NTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKANs4CoNaRgSmw+NWVlAugCB3mYstbGneKtwR0i04EeaMW2+shGUVec/0w1S2DDXy1Q==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATJ+5FollMyElaZtMaAYK9kNUUEnwBMDk3K9IIH1jcsmWC0ZEIBFFBDo+FZeESM/M9RdvuGKzyWPt5iAzbNv4WyhLNQPgBz8wyg8FYdm05uEu3l6sxwxxAGgWHMZXlKdvr+hdX32SHCSpfN1PjBTrEJm6sneA7h0KJXhsomvj/Uyg2+sfwL8atGYa1rInC9sU4ALrrPsTrYeKT2Mwm7epKRrWKlQ+p1OUNsj8o3hZMHLLYTYfVZnQPKLGMb0LGx8DlwNqaRt3+7cbxHl7sGFIjW7Ysi9U4DJNKv4MuWfTJY5g3tQ2ZdPUkZRe+cOKNwm55K7GyDtZOIEIF04sDNtsMjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDd4x9rsQ/PLtNqLmGp68OJgBApCeWI9P4NUrRTxmdKIcYE]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   faststart:
     servername: faststart-mercedes-benz-com.pixelpark.net
     serveraliases:
index a45d90e852a35409c890a272033d53c6b0c4c20b..43850ac9a2957b149c7a8b06773346e4c55996e4 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACbcGiAaOwKTZMyhHw+XXuJDw4C53AURW8l8EErZi6g8DMJg1FIv9JZ8/tMJdkGsYoElUcKZMuhtYYsPRUzT+VywIuEpFURrJjBqh214WePQqX33z9fSYABgc/wW0PcyWg2Dale5xvpJMVcHCD3zHYSMbfnEKKh8J35yeSNoJ0qCvK3vsLOD1w1HEuV3bXZtXGj2oE2BvxGimV6lsiRgtMm2GLf17rf6/2yC0xWUMsPt9MZTpQaSy3Un2afGKC2iPwrY0JmaOIOF1dz1jKMT0CmOlZ4/ajIFL4xdyWR0Tqp3XMDuzNCu4ZLYNJbhatlNr27m9/ZMzuViRrMgK59aMMzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCUJ6zS98SAiT+hw4ate8utgCBhnXaCgTWt5oRJbt6mJLe1yx0BRpXlvHmLNHHUM63srw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAaHYiuEUhu8eJNXNU72U4nifBy8hOl/dKQxh8Q11tuSdP4zKnInuwESzwUyxlYeg6mCODJ2bOHR+ILw4LnztVf2YD62aZZvOaT61YMN7EOJAlRH1+atSPpvDW2SEvTSYpzl2KG8BgfumPqC8quKwIqAXeZcfiyDpt5vmNQyg+1F00ooplP/TZTA5HuNBtHz8bLLnWUKrQ8NOD7ZOH6pNEsRWOJl3ldUeO9Wd0Qye8f+V1QAYg2ag+JIroWmp14cmaSpkCxZDYP0H5feFd0PeD2xG7iAr1cL95X7IEtdlRkX5CWlGaxBcTJ9pABiX/UvkN7k4zTi6nNh5C5qzWlIUopDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNnxY0irS6hjEYPwuBQA+6gCDMxT5+fw7ym2LR+jc/CUIU1XUM+wtj/foq8V1g01UGYw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   faststart:
     user: faststart
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmKdGbBTn+imMZiYtOQolhuTWBJ+Wnv2GN4XhTa/PVtJfvwzIX+SDk0iDEGrFiG1DlDGvC6b6MDeCNAi/FLyoBb7UgH5dHEkj8cVS3v+68YJ7Lb/G+qSjuTJ+W5JXESi9DJEMAg1/JwDM2f0L8KmTg76WGRvWRYJFVGFOG5reU4L6Fe9PGWGTsp5S4ltT8LPbHESvp8k4t6G8M7ajCSZUVv5scGRUk8CnjZJxuR+oR7x8oRdGsNTE0X/BCye9cN1xrT5mUFTjUaheAvmrX+S0myGfsA2LOSdyq1f9xpBYe6iKtQTv7YQXAjBiWpQ9HqeWfTt6sL3Afq1r1SS7ev5h1zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAPE0KX7U1tONNs5gFTk4nggCDhnsAUgJERNBVae1WkrvnYTEZn02SY3Gz8YnHG1XSOqw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWtr8p9JH6w7bL4Sbh/dLjyBrt+0nHya8hGs/k+y9vzeA8JHD/tnicHfM8687BQKFfXEctSXsoiJ3Pu9pVa9tgjAV+LoS3+guPdFrfUZdveOKwsgZB7MUO5rqdxjGtFiGnxjIjK6+dMtP4NfhukqL5jU2SPhYKpn+W82DjySQD/tsJq5YvghEpxv/INP9E6ifbjgygAMrmpsADWdAeCOI+mhXBnhYxmhc/VpIMwK0/6Hd7g0HsJwOJFj1ahgTekz1WkAVTzpJ8YKnEX1ylK8IkwFTxpPL2mrVu5BStDv2k9W8UhfNa3tsYIneTuRtgq9gUNp2CBfDaZUgz1a9i/mwHzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBClVNtNGMf9oe78/6o+yhaWgBAhgjsYIgjLXiDo685nfMWY]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   faststart:
     servername: stage-faststart-mercedes-benz-com.pixelpark.net
     serveraliases:
index b5beea7b613e5def17bc06a5cba619ed86a5e862..9240e468436ab424b26a678909462c5848a751e2 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
   - git
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index 4583ad5ea5012cf684f727e33b5ba49e6f75d5e1..3b8119e285a7f736d9b55cf899b016d08f3e3105 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAedQu0HCr55T0xPGe/akPJmM025+sPRXhat4Ucj7T7oPFtRyJQ8/KKZOPMAdW3C3nWBUoG+q2VeJsM4WMmvdHYpg9DAXzyWL62yn37V5rIQJg12/O+ajPcsXA6B1a6ycrZf3cg9LU1viJGIBEDCqigx4eIucJis5MeD+sIBZRdipt+Y8fik27eomfBglTLDYei4xo6v6W/sTju67ZwSkbtpVBHsx4iBqUSmXmzNAMKqJjcFYieiOOrCprqxeQd2y0NRkfGwK0jgJWeITKaznPt+AWlBvjU2MsLSE52OCGq6R2kjB8++B/teYinsYX33FC3JZYAUjs5hGUC59OP39yQzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB/uOXJjOmI+T51CYW8i0QagCBYi4kc9vLrixOHc2BEyuiCbE1u6TGkQ+lKN3w/F+ETpg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZf7dtSqh/ssKhidLVmUQtithFW7oQky6asoku31+0LP7BEKMrwHDoLQwyZRZpTtjqXAphoLJkMl+HAkdHPygDqkQdJx4LRC5EinZ6pdgxiTb5YRypZc1KmlZaTdSfOjMRQiYZWv3epMnmVi9TvUQb2jNzLBL9I/j3JyLYE/fNclbMT0p30NJJsTTyGLeZoXvxpmosTdWa838XBkv8vF86XIFaFfL8nSx9A/bKpqZjyQxHbIEf2Fkw+qzEfRdW1iLj9OnFgl+VM3FKux8HEAZZuKbD3FvpyquifgMDq1CVcBmMHhJo0hySKBZhTBJdXNfwqoOrmNweAD4z6nM/rLqijBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAklMPVU4wtEmg/QEnGIOA2gCDHJ47uoNDwa0ie8Q3NPwxwLftkMSdOaTTFe0rseFMrLQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   growup:
     user: growup
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeVLzFA7rW5rapcEU21naW6bUZ/wodoZpxKvNsO3y9A4FYUFZ39rGQb1MYb5nkMDbx1i5vsRihE7cUhjoID3ZsAQaa1sOH/T1LXz9jH5unxPzXkW4DHMMWX4SaBg7iHSUk/j++xbaytfJA1TZQA6c6jlXva+bb0/pXuM4h/xt/M8T8qL5m38ORvRm8+f4yyLA9/+nx6KItFTaJmEx99vWjd/Q8x8rIZAuXI4JcUyLtmVxTX8mJpR7ZvAFJA+20EZODZWGV1vWO+mw/lnTNBGyKE5mX+mfxGaPSZ7pbBB/Z7zrYdKSHDv1SiqO89f20C5ztTGnP5g2ZSoiozf5cGiZAzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDI5ucTyHcfwYq3ZM1snZBlgCDrFrMHrBkDXRx+N5h/+5E1rtNrodGUiFnlRG1mcXVCxg==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATlR3LD2UPTkktjgX2ssYu8xzUb06eJTAtMTSoBVYp1EBkdQEXnZLya6LO8Ql+h1/3Fo/i2z5XFTf5Tqjq9VxS044OtfBMz3vJP4vXe8nmFQvmix9xTTOp3AQsMVRVqBMqNHYQUe4dpA7ZazVDRYhvY19PJ2iGp76trlpZcFBCMvogze00NUCDBm9MXlMvUvpZjnoL+818ZO4PI/uySL0pwVrwhhsRNWXkk/tpfJ6E4uzVc1XUDGEsgcR1n/lOCD/TcvvswVvHSDT4KgCqsQ4a6jWeEjw4Ng0GfYVZUB0dR25F7/XfPLUB4EjN8QSV95RtpmOjUgEXOJJwuvl/I0k/TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAhxtvUjg3wo1X9Sa1lT3zVgBBOh3+rblAHCJPP+nrIT8ac]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   growup:
     servername: stage-web-cc-growup-dialog.pixelpark.net
     serveraliases:
index 0d0f787f3d188e0872bb4a13f01d985384240b84..d02deeb64980f132f76cdd25b8c4d2121b64eae9 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANGa4ioc2r+6fvJJHLX3Ed7Nn07Bqziqbs1+H6fwzx+bkqhG/1u8SlXzsUcA8rXXe5SwDpCp4iMd5qAkTCo5ZqFtE7ag6ijtk0xLflnJw/FmwPW+NMyyAe44xA5S+6CxlJ76UFNF9kNk74kGUHR0b4xx2vdYWF1TZX/A4UZfQNO7Q/caSMmzx53WMHoCTz5FBEyB5kwsye4KNCg1yZH5S1klJvWjcU3nEIZC1ThBLOS9jCpYe92q9/DEzXd5Sd5IvKqK7+Wq+EYQLVG7rgzbOe1bVDCswufQwfFmoHmi1Lz3sTrKaXugbM8E/nSTSQsIFMGwOahw4/XkD6QCSH06xvDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDjKd0O1G7DnVfctgxMvm4BgCAMu1WUsfyqBe9hZFnLRGhx76GJapF+bEJ7s/l13of9Fg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADEv9eTZ5MmfnSm2MRE+JTFed2zwZkbNzS2EHS5vlGK35+x7gD7sr40kuRRzp8wVEtgaQ6abkn+LX11x3utlJUj6iPU+3zfuKwfhpzYd4UzYVH3eJWW2BeBXablJVF0l7l+NT686JMpj9rId8kP68X+xk1hTmy8tPfWRm6cKXhgvmeHzZAn7sLZwIvaA0iumUogfRjl/ocO7I7MK0sgJIbPhn78p4y2ZdXnbYFrz1L17Rk2+ziJ0IwogPmBEbyN78c+udFWiDpiY3/4D9YHJOyeqJgUsMmNhspezVe1CTiZviVsCqE2aFZK0f4MQZHWN5Vb1UExPu1vdSR4AqA94LTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDL1aJTRIQyGqHqZqrPYAIAgCAf3chWsX2ag1Gwda7ZGq538Yv7vTok1qwn4lAwDzOgRQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   growup:
     user: growup
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHrvZI9JmuJXLm3QlbOdPLnMcyyNyE91mAzGJH/4yeS+w0DPeGl+eWvEWM9hDvr3/T/hkSaiECtMMBa7Tk1hMfv6COEPPP+CO+b5fdtGI+KEudo3uUUwEmCGqFay6NGIPdO0QEoJ61sLwisAUdbl4r6Str37QiRx7gM5pUEod2U6/aBAdsc0MZ7Pu697abnFIAcuVBXoGFP8vk6J2QUFGugvM8RTFaNkn/U3BwEwAGaJjImwf3CSX1IQK3A0EXwAvuYZTNv6wWs5SpvleFF7vHE30ES0xP2Y+tGBx9xO4PH5ROEYXBb1JS0JX54LEf2X0OndhKExPp2RdeUapn2AXKTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAMzCPB+Tj/VTfImWCqAuWjgCDSin6ind37oHL4AagKxPkwx8drs6jGNodHAtWUHVfQTw==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGG80NR2P3hwBeQMhzoqYvquVb04AEWBG7mEeq9gh5pTgsrYVv9tba2/lci6f7sGeiFxeAt1ii9UtmpFuiDXc/HWdegQVeQy24wamxbIf4I0TvDkzJTRpVuZRCMnhj1OkUNmtpeN3c96DfZDiH/69Rh7eo/D6Kf/iHjanTah7AYFC2V0g3/+zed3ubo7xhEoJ4g+PuCMaJp/tNQXQICEz4dRgVm3JrkEvyVXAZUFJP9PZDLuQ2shFV1d2A53Z8tB3yxxcnvBIG9hxzSP/XI9sqYtzsuRhA8Gvq9kbEuKS5KKL+pyc4qKEfh5bGrs2HQREL649MVdACNbH6HYJetnQczA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBRONCavCFy8OqF6grxH2wsgBA9IUuAe9AB2Sc088M8qbWs]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   growup:
     servername: web-cc-growup-dialog.pixelpark.net
     serveraliases:
index 159c482594349fa64f70587b2f129245d77fd9f8..9ad108d7b195380b5d013b2abe0767a8183dd196 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
   - nodejs
 
 accounts::users:
index baa6785669baa0450a8c3500054a1ebd78889a07..1ed5ee5f703d134fbd3b22206b791ac8f5125c58 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiMhPdM6kg7q2P0/GD5AI9gEqNmKDc4J8BDiwfYCCq2HVnxLyhOMz9dtNQjQMPnMygkkgKc3FMwBdPxf/b4ud57bXAFOhKLalCuLzEeyOtGBaddw8GZ6mjv5xrKw1tKAjH5ZNebT9TPn4XBqMchebZ/s4vYInhlEqEYgmt55B7KEe8vMdCnJe4/zU127FsyruK+ZRFQW05r3ka7dA+ZQbQ/W/zgug2t32oShf23C/tF70IcEYXcrq23e2E1YAzAXJb5GeC7mbcSLRK1ARdKOSxL7cGEi2aPVg+ArjeJrGHgKQKL98aDqGBAC5S2JSlGg1klB6a6SQkJNodkbWiO7GnDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBADCmLJi7lWTsZJehjf3Pr7gCAOGpMJz3Vh9MDAAyrSCjLTmsc8XLRoEPwxqZXqy/OYCw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAh6ufUQ9Yw90FzaEV0xQmZkUsJCqrd3Zmq49Uh9r6/wY5y/bmLFXW63dNMbWJbngW5eVx5EBc+R/J8LgRCfAr+DHZCq2Rqk3fVz0WM1hhe5asFz/gz8tefsi+wGEdNAUx34UUwFrmlZlkduPV0P2vv9bKsKbF2U9SZBNSq0Yons1hx+S98fMdve+8jKMnQi/fjHIpAndBVYC0ZcHHeScCC3Jxvh1gK9hH95nWparqQcyMr92SdJZLCeb0OjWuxe8bSH6Z5n/JRPbT3fOd9GAqn3g994lWQEroij3SGno8L6QfuPWCSfQkzIbusCW9LqYLroRNYyWLP4kepvFXQiUXRzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxqMFkKpEut/Ld5Uob2tREgCD64o+E60OdRkbyQu0T/HGNHILnjLMovPrw67yd+cIp/g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   ngcc:
     user: ngcc
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABwNFjVq0fwwF1Og//LWHkWl+5s41VT3IkJvpEuLzpKDkkPgzHwaS16KBQ7IqfPqH7I8T0LRwzV9wPRGTYwUD8K6Hxevpd6bYXAspJFLyH+3wBBZg6OOVzCpyzq0hzVKjHCjnzqT/U167rzBUUElkeTvt87vF+lFy7hD7lvFYC4do8VkeG6NOfUlkchQ1JC0f8SA2Hq2GtIsZeeKQIcvhEmdtd+coChA85gfpsy4Wc2vgfwXZv2eafYv0BPrP5ledrwkHOzk1nijUbDZu+jMtn/HTQnLttrL4atsaZSq06SD76Cx1Vihk6P3OJiHaso1j72ROVbGYpkhCh+th5vDjDzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCR9g2Hh1jBJeAsNdkYDzUMgCAusWmRQb3WTxOmMs+LhMNdKX3JQMOKj/q0BtnQwbnkqw==]
@@ -21,11 +21,11 @@ site::profile::mysql_server::databases:
     user: marketUK
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAMIR6c59n417F5bw9XTgICxdWXEoMoVoRM1O49rPEEiMiY0JgwnRLnekePyAwJgjNUBisJdx458YV/uAUsJQdKTS69lsczacjg7d7/k4frKZt0txT388yBIBscfoHyXuHApWc7qIHyoY7DxP8fXKqqtp1f4L316YUF2TTXtpL0yEMFfZBlARyflAFTt6RInUkQFzSyeRlPHkN7QYhRmNH97N33XeXxApK8JvAt5gT8i4G7M1uSB26DLIjsE1yVBAEZ3V7wkgTJjDczYFEAIxrSD9Xkinik96EDATtCJi/+z7Geei/JenlEXwLD23Hv5ERaOIhJiLzmt25FGgPPKSs2jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCBpX8dYzZmCcArjxy1dgUfgBB7hQzbk/+4KSzdqJzHfYOM]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVKu2rO9r5THGZxSRep6IKup6ABPxOec07+x4ofJE3MTYhNxaIn9mzDSxz64kh3xREp4elyPYN8VG8sh26+bCnMXMey0FtmpORWMOKwBL1tH+aZ8NVesQT0uv6tro53LEOCWHAjoO9J9gr6b8n8KYcXdJ0F/LJhhJRt0DTKa146G1RQNDOK1MnkYLkUbfquJxOUMlFa5ZJ7cE4T6/zzFljIBI7177DAw0EsgwW5w8e05bp8UPaJuhGf3k539kjv6uKCN/uDEYKhoD1qSOkrwcPHTpR6C0r05w2wngwjJdSWo+l0TdAWE4K5/sPEi5EEYi2c3YtomEV4v+/c1aJB821zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDb8AaHOa1EL4CNwyRGw6zPgBCN/7CnqZxE/HJEiWs6gTd6]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   ngcc-web01:
     docroot: '/var/www/ngcc/express-proxy/frontend/dist/static'
     ip: 192.168.170.35
@@ -76,7 +76,7 @@ site::profile::apache::pp_vhosts:
         require:
           - local
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   ngcc-cms01:
     ip: 192.168.170.36
     site_path: '/var/www/ngcc/drupal-composer/web'
index 0b224e690104654ba3bf528cfb75640d529f0400..0712471593d755aecb204b787b84689e1fbe1709 100644 (file)
@@ -7,9 +7,9 @@ accounts::users:
     apply: true
     sudo: true
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
   - apache::mod::remoteip
@@ -17,7 +17,7 @@ site::additional_classes:
 apache::mod:proxy:
   proxy_via: 'Off'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   cms:
     setenvif:
       - 'HTTPS on HTTPS=on'
index fb4d8e5a34ce3a6aa37db67bcdd0b1dc80401ad0..57043ebacd4d05f067d8d8b7aa48d4e5c7ddedb0 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
+  - infra::profile::mongodb_server
   - mongodb::globals
 
-site::profile::pg_server::version: '9.6'
+infra::profile::pg_server::version: '9.6'
 postgresql::server::contrib::package_ensure: true
 postgresql::server::locale: 'de_DE.UTF-8'
 postgresql::server::ipv4acls:
@@ -18,8 +18,8 @@ postgresql::server::ipv4acls:
   - 'host opencms opencms 217.66.50.0/24 md5'
 postgresql::repo::baseurl: 'http://repo.pixelpark.com/Linux/yum/pgsql/9.6/redhat/rhel-$releasever-$basearch'
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkFafa2YcmiQDm4Ke++iIWS5cxwg3MGeVhiFZkrz4o7mwk05R2wXDIQdsP+2qQQgKJje2PTZqyICXNIhv8fraJYvRBkpNY730jdlFzaUIJjwBgdJTHxsqiU+IDReC+DMuqEyl9otu8NUkYVErWHPOR1dWYjBGF7BcyaYXOb4fCZD+tw4Y9EfkGJ2ZIQVIRDAp4mGFYAG9AHNJods2WIOnskTvzD/beXj2BxnN6nXTnJobFymw/L/HttaDza3qW8d1yeVdYqGXhjWrlqK1d/3nxuyfJNSfBe6Cbl40c7UaGeH73/E3WuzTNcv7H5o7tyberOC6jI2AbOzQ1kFz+r27IzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBqEuxyHaOpRI67UG1wBtE6gCCV8Kzjc0vmC/ax42U9rBQow5KGBDwN1qiO1m+4iMJJUQ==]
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkFafa2YcmiQDm4Ke++iIWS5cxwg3MGeVhiFZkrz4o7mwk05R2wXDIQdsP+2qQQgKJje2PTZqyICXNIhv8fraJYvRBkpNY730jdlFzaUIJjwBgdJTHxsqiU+IDReC+DMuqEyl9otu8NUkYVErWHPOR1dWYjBGF7BcyaYXOb4fCZD+tw4Y9EfkGJ2ZIQVIRDAp4mGFYAG9AHNJods2WIOnskTvzD/beXj2BxnN6nXTnJobFymw/L/HttaDza3qW8d1yeVdYqGXhjWrlqK1d/3nxuyfJNSfBe6Cbl40c7UaGeH73/E3WuzTNcv7H5o7tyberOC6jI2AbOzQ1kFz+r27IzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBqEuxyHaOpRI67UG1wBtE6gCCV8Kzjc0vmC/ax42U9rBQow5KGBDwN1qiO1m+4iMJJUQ==]
+infra::profile::pg_server::dbs:
   openemm:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvgkJk7wo+DG6Puq0sSKwhwoTd30li58A02PPlUZVyCr9Fz/JeS5saOm96xQghX6eKm0fJaMoGQ5zuCrS/LFkg3om8VdJW+XRhOjCvV7/8dY/97zbwO/rrPTWri9QBNYbGsSbT+EtycFcrnImSswDR7iETMPoKTHySQMQj3cFw8cWWQW3VVLeEdAZsJDfEw0/MiCiS/kUPxuVQd2OSds2936kixzvQO42PQcNdVuyI6ONW+XLUEr/ohIZbbanuSdy5XlAdVGyruxyuMPrPq8DPKQyvkKye5zmqvtkylzXh6FTQKBZQ0D2OxP7yD5xHWIS5VC4d3ZPMz92OUHylhmUBTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDvY0eqm5BAAeBL+SbHsVTEgCB2FGo3AaYLc12Sr4zsapG6Hsu8U/BKt5QwlXBB7OFjVQ==]
     network: 93.188.107.234/32
@@ -27,7 +27,7 @@ site::profile::pg_server::dbs:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhQxoLns+J9htI/xcLtghq/7W1bz8w3wpsrN8+RzS243i26hKZZW2E76U7O2xf2AVFqnfQd6gH26BPJshP60tF4TNQAN8qtmMePF9zvTPcNSu24020AoLGVSLx7FtTLHbtiKRb303m8eqG0MsXK6cDViOtri9+3NkOgyryRP5yLl9iDNeRFUa1/SAua+HgjNOJhAIfA98mjX70yE7OE3Lbpd+rFgIuFdPopEDkUs9eOp/GYF/+y/s+RN+2eCvF9bP7S7GfFSBe4+B8tAA9Emf8MJ7Qg8Ip+GBtyWpUQ0kF90G8DB4o/YfXvqPGCoVHCOVblxHU9oq3NJv813svd9RjzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBTS8lseKDKjjEZzjB1r3h1gCBVX6FopYnme/Uf4lQ6TMrolFrHKBb6yl4P43yNx18xQQ==]
     network: 93.188.107.235/32
 
-site::profile::pg_server::configs:
+infra::profile::pg_server::configs:
   shared_buffers:
     value: '4096MB'
   max_connections:
@@ -39,9 +39,9 @@ site::profile::pg_server::configs:
   shared_preload_libraries:
     value: 'pg_stat_statements'
 
-site::profile::pg_server::backup::weeks_to_keep: 0
-site::profile::pg_server::backup::days_to_keep: 2
-site::profile::pg_server::backup::enable_plain_backups: false
+infra::profile::pg_server::backup::weeks_to_keep: 0
+infra::profile::pg_server::backup::days_to_keep: 2
+infra::profile::pg_server::backup::enable_plain_backups: false
 
 mongodb::globals::manage_package_repo: true
 mongodb::globals::version: 3.4.2-1.el7
@@ -51,11 +51,11 @@ mongodb::server::auth: true
 mongodb::server::store_creds: true
 mongodb::server::admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiFcpTTp72lGwYCc0F/0dqWJ6n17xcqps1qC+1vocsT6F25x7slaUtXtADUeMc3P0e/2OesoPs6Dsteh1Y6UH7NnM7GslRKzC0kk5uwXEdB510keh8Es8KO3SJolNgxEuoUZHf1hq/7gw3mOLnDss5HyromwbQpIBlTRm+Y/gGBwFmHRMWir3AyW581uCyFo+49K6f+t1eoYnDUA1O6a+XSj43mL1pEhHwIkiPYV8SjxXkmyOzQU3wkM2+8T7VzcLPrhTdhmf/N0HZmPgvfIzBnWruubYjzMNGhB/cY3ikiSli9rlakIF3E9pzIzIGPktqT6obB4cgqIcW4+F/u1+MDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmyxSZoxhMi6dqNlrcJB66gCCCOp5DdCQb7JraF6XE5idozpc9dL4b0XqY1I1M8vWm5w==]
 
-site::profile::mongodb_server::databases:
+infra::profile::mongodb_server::databases:
   handraising:
     user: handraising-mongo
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN45CF/iUYbbd6ymBvfw+wlqmlEKwCw0rhbNuf1ux0r5Tkstg44G7vOEcSVcL9400mYwimsyZcXhS6Mshbgm7rnm3RN5qCccsxGGfB9/Pn09rpCd/Glxk6wwUjBH/VyE2r3ErCJVWTTM3PaoXlgVzzJdCAmMlvVSvHqtERSoqwAtubdDR2+zF1CEbwLk/HiSZxa+IWbK1pOHmwK+gGwec7UCXKB6qpH4Xn2NyLGpMJ4YDSWRqWmfnd2iptDPNQTHHPVQ5dWAc/8tJu45MOJXy2R9D9TOFN/KMTAr5xo4HatkygiBOn8zmJEmy7bGWw4MzZN+9uxy20wlDClaWwq8a0zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCWx2dGaqu9zlWNxHn3QsVQgCBO0qfcsxrVK6Ee24nxOFjCGXTRxRPwm5WCCJwZ7Awb2A==]
     roles:
       - dbOwner
-site::profile::mongodb_server::backup::db_username: 'backup'
-site::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEsJU5NmDJYaC2oIM1nIp5U4bwgTzg9B1TkR81lnfxLZ7/2MAaGUV6+v/mKOvMNfSck2OTWKvWKte0mYoAWFHPpe8sYXwXWGffhbUbr4jt3eLqMvoesNyqyXzGWTIypStsnTmIJTzUSEKWH1W27dUqv7zyi2CnN2b++j3DWiOruGyM+1f5B599W2qeAJsNLRsAhdlHcwWAMZyLyrMokm1oDXLydIT15V0xsHhYEUV/wLUqgcpxb+L937MFDclJYf6eu27IDSF7/VE7V8B+UeBp4a3kOauPFWEmzMSMbzkGMjmvwmHQxGdaprnvt6UCS1NTl8dfzlzqGZPTdMEVAcbEDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCNO1IDgu/4wd1PvPYyWMnQgCDxW2G2kbe+Rbmz4IJ7EsMTVqWLaK3g/ZRXIU/Vz6vlfw==]
+infra::profile::mongodb_server::backup::db_username: 'backup'
+infra::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEsJU5NmDJYaC2oIM1nIp5U4bwgTzg9B1TkR81lnfxLZ7/2MAaGUV6+v/mKOvMNfSck2OTWKvWKte0mYoAWFHPpe8sYXwXWGffhbUbr4jt3eLqMvoesNyqyXzGWTIypStsnTmIJTzUSEKWH1W27dUqv7zyi2CnN2b++j3DWiOruGyM+1f5B599W2qeAJsNLRsAhdlHcwWAMZyLyrMokm1oDXLydIT15V0xsHhYEUV/wLUqgcpxb+L937MFDclJYf6eu27IDSF7/VE7V8B+UeBp4a3kOauPFWEmzMSMbzkGMjmvwmHQxGdaprnvt6UCS1NTl8dfzlzqGZPTdMEVAcbEDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCNO1IDgu/4wd1PvPYyWMnQgCDxW2G2kbe+Rbmz4IJ7EsMTVqWLaK3g/ZRXIU/Vz6vlfw==]
index 5a466737bdb8f6fe10671e4ff55c7a2d5bba9e13..2418c7658af40d064ff9067c26c731a4f03229ee 100644 (file)
@@ -1,20 +1,20 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
+  - infra::profile::apache
   - apache::mod::proxy_ajp
 
-site::profile::pg_server::version: '9.6'
+infra::profile::pg_server::version: '9.6'
 postgresql::server::contrib::package_ensure: true
 postgresql::repo::baseurl: 'http://repo.pixelpark.com/Linux/yum/pgsql/9.6/redhat/rhel-$releasever-$basearch'
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkugNwUWX4P8vxOp89U+URzSgghBbbyopCiHdprHb68x8eRDn7ubDvOn2f9pkJ2Sf5kndGep/hBWS3kcxzFjvBjAN1hRR77F7yVDcOkr5argryxPBwIgokE1e1DQev2NeJ3I/hwrNZXQJeMwByJPL3wDJUh8FBIvCNmlg364uRrGNlVlOdDnd0KVA9D3RNq5ktllGRrmQVNvWFQHAkSP2DGBmLMgZDzO5Xu9bLbBmZ1zJjyXPXKHVU2UAMdNMG68ttIiD/e2FuXCmetTJKW34ryhi1eYek5Qa2biNW5Mr0pDoSFm4FH+6Hx5FZUUOPai++hxXJKYdm67ImiyP2onwUTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDcskAPEhYhdqSsEaOarS6BgCAVeAxlgbuL8jeKINtiYpoE0DTbAyUPSlGJmD+wfTe+1Q==]
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkugNwUWX4P8vxOp89U+URzSgghBbbyopCiHdprHb68x8eRDn7ubDvOn2f9pkJ2Sf5kndGep/hBWS3kcxzFjvBjAN1hRR77F7yVDcOkr5argryxPBwIgokE1e1DQev2NeJ3I/hwrNZXQJeMwByJPL3wDJUh8FBIvCNmlg364uRrGNlVlOdDnd0KVA9D3RNq5ktllGRrmQVNvWFQHAkSP2DGBmLMgZDzO5Xu9bLbBmZ1zJjyXPXKHVU2UAMdNMG68ttIiD/e2FuXCmetTJKW34ryhi1eYek5Qa2biNW5Mr0pDoSFm4FH+6Hx5FZUUOPai++hxXJKYdm67ImiyP2onwUTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDcskAPEhYhdqSsEaOarS6BgCAVeAxlgbuL8jeKINtiYpoE0DTbAyUPSlGJmD+wfTe+1Q==]
+infra::profile::pg_server::dbs:
   opencms:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmiefQfvo9hVrftXx6bUWXdL+gcRYKunG/Wyk+AkZql+F219DMsCf1E1ftLkYxzpO7pwgFo+/cb9QLoJNXDxx++jiB3ErVTaeVrGoylku7Y01F+6QXZtX+fnCtnNZTMryFMFpY05bHfQG1H3TYEyG6nbTBc6LTNAVy4mNNg/SvAzBuZ1Kn5Qd9710Xw4HQRGNAaIp0AdoO1dSHvos1uekIVMbOylmb0wSXMaNc80d8u4OswhcFCpcaGf4jxbBBsFwyy67ZVxoOxPm8aUpHWugiq1VpUT5dIe/cDtUaDzwys8Rqd3iBviPcxwJTsrZu+OaiIvSmNeEUqxhXjyrgRujbjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAq+jer/nOkZDNp8u1/Tj3DgCDMskyzKbTZhU5sLFejK5+7D7rnB91j1u0XSdHqNVIsOg==]
 
-site::profile::pg_server::configs:
+infra::profile::pg_server::configs:
   shared_buffers:
     value: '1024MB'
   max_connections:
@@ -26,11 +26,11 @@ site::profile::pg_server::configs:
   shared_preload_libraries:
     value: 'pg_stat_statements'
 
-site::profile::pg_server::backup::weeks_to_keep: 0
-site::profile::pg_server::backup::days_to_keep: 2
-site::profile::pg_server::backup::enable_plain_backups: false
+infra::profile::pg_server::backup::weeks_to_keep: 0
+infra::profile::pg_server::backup::days_to_keep: 2
+infra::profile::pg_server::backup::enable_plain_backups: false
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   dev-cms:
     docroot: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT'
     docroot_owner: tomcat
index 55b38dcc659ec02c63f7855540dc6d9f5f690798..8480ce9537d65f1cd1a61c33fe9bd4aa12e5ab94 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
+  - infra::profile::apache
   - apache::mod::proxy_ajp
 
 sudo::configs:
@@ -11,7 +11,7 @@ sudo::configs:
     content: |
       %pixel ALL=(openemm) NOPASSWD: ALL
 
-site::profile::pg_server::version: '9.6'
+infra::profile::pg_server::version: '9.6'
 postgresql::server::locale: 'de_DE.UTF-8'
 postgresql::server::ipv4acls:
   - 'host openemm openemm 217.66.51.0/24 md5'
@@ -21,12 +21,12 @@ postgresql::repo::baseurl: 'http://repo.pixelpark.com/Linux/yum/pgsql/9.6/redhat
 
 postgresql::server::config_entry:
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZQoHfKAzxvzHW4cYR1VBfTIw4HKzCQMBmaAkToHo9kJuht/dP0FAKArNRSok3IL7WO6gyyE00VY04gt4s3OtqOLkPd1cQ1b+SUWGvgSYUpggYz6D/0eLQSUQ2uBouBR9jS0B9yWjoN2Qru4JCynjG5mShBYwB1Tz6ESXuTJOIkrsJx0KJf+rJ28sWysLYkJTvUHJ46kYyd8JV62/ncnNxikcAQoZpxraDFk+xt+Rq4LVIKkzdzfFX00Gpb87uEAyfQNCuStPvRv16501azo0ojdsdjFPY9xnPiWnbuhyl+hY9unNIa7aupd8b4EAUrl/Os/1ikJrVIGyWwnql6+GATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD77URKcuc8FkVIn/WQA6F9gCAQRm6uUSeMDdeQSle4f/LEmffAxJF3eQWgwdMgBq6hUw==]
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZQoHfKAzxvzHW4cYR1VBfTIw4HKzCQMBmaAkToHo9kJuht/dP0FAKArNRSok3IL7WO6gyyE00VY04gt4s3OtqOLkPd1cQ1b+SUWGvgSYUpggYz6D/0eLQSUQ2uBouBR9jS0B9yWjoN2Qru4JCynjG5mShBYwB1Tz6ESXuTJOIkrsJx0KJf+rJ28sWysLYkJTvUHJ46kYyd8JV62/ncnNxikcAQoZpxraDFk+xt+Rq4LVIKkzdzfFX00Gpb87uEAyfQNCuStPvRv16501azo0ojdsdjFPY9xnPiWnbuhyl+hY9unNIa7aupd8b4EAUrl/Os/1ikJrVIGyWwnql6+GATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD77URKcuc8FkVIn/WQA6F9gCAQRm6uUSeMDdeQSle4f/LEmffAxJF3eQWgwdMgBq6hUw==]
+infra::profile::pg_server::dbs:
   openemm:
     password: TC1WW7a2ALY6flC7
 
-site::profile::pg_server::configs:
+infra::profile::pg_server::configs:
   shared_buffers:
     value: '1024MB'
   max_connections:
@@ -38,11 +38,11 @@ site::profile::pg_server::configs:
   shared_preload_libraries:
     value: 'pg_stat_statements'
 
-site::profile::pg_server::backup::weeks_to_keep: 0
-site::profile::pg_server::backup::days_to_keep: 2
-site::profile::pg_server::backup::enable_plain_backups: false
+infra::profile::pg_server::backup::weeks_to_keep: 0
+infra::profile::pg_server::backup::days_to_keep: 2
+infra::profile::pg_server::backup::enable_plain_backups: false
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   dev-odt:
     docroot: '/var/www'
     servername: dev-odt-daimler-com.pixelpark.net
index e99e00762d08f81b55cc4fdf56a19d2fed23b3bb..499c2b5b0d59664f11a8a2cf2daf369eeaa9b217 100644 (file)
@@ -7,9 +7,9 @@ accounts::users:
     apply: true
     sudo: true
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
   - apache::mod::remoteip
@@ -17,7 +17,7 @@ site::additional_classes:
 apache::mod:proxy:
   proxy_via: 'Off'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   int-cms:
     docroot: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT'
     docroot_owner: tomcat
index 9aab69edd3d3881877dc043bda6269f47654219a..84c683bb78c77c93e3786be09d86d86b9fb1d135 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
+  - infra::profile::mongodb_server
   - mongodb::globals
 
-site::profile::pg_server::version: '9.6'
+infra::profile::pg_server::version: '9.6'
 postgresql::server::contrib::package_ensure: true
 postgresql::server::locale: 'de_DE.UTF-8'
 postgresql::server::ipv4acls:
@@ -16,8 +16,8 @@ postgresql::server::ipv4acls:
   - 'host openemm_cms openemm 93.188.107.233/32 md5'
 postgresql::repo::baseurl: 'http://repo.pixelpark.com/Linux/yum/pgsql/9.6/redhat/rhel-$releasever-$basearch'
 
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQgpDTDusJsmMYdACOwKPfEhZbLU+Tynjnm7fBDH+KTS9cPCoCQ4E9TZgHEwy3wNv+nMbUsoSZY/xFHoF/JgPlV0cZLtsJ2WLJZC5SLIoL0JEvOlUIMgbSnxwKJ72zKUf6qJnuCDz0rJ7LavwQvf3D/lmBo2rXP5wuQfyxeSr0aO7JsO7f58VUMRigLZ/JvOAmvMycbtVaSd3n+TYoKCRlomzdFeZkC6DTVMWIiuVuhRG05XL5rkSdO+EUMi0ohZ2LKKBqJHL5tATDK9QRSllKSoix5Y3jhye1LFHDZJm1w2BRX7n107v1sjsI9lax5gDsiMIfbsNv0aBGxMUcht7uzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBFb2Q2Qy9+9O4bZAQTb1OzgCDAwTXbSFnPfdRaWlI3R734TM0APzt2EvIExutplW942Q==]
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQgpDTDusJsmMYdACOwKPfEhZbLU+Tynjnm7fBDH+KTS9cPCoCQ4E9TZgHEwy3wNv+nMbUsoSZY/xFHoF/JgPlV0cZLtsJ2WLJZC5SLIoL0JEvOlUIMgbSnxwKJ72zKUf6qJnuCDz0rJ7LavwQvf3D/lmBo2rXP5wuQfyxeSr0aO7JsO7f58VUMRigLZ/JvOAmvMycbtVaSd3n+TYoKCRlomzdFeZkC6DTVMWIiuVuhRG05XL5rkSdO+EUMi0ohZ2LKKBqJHL5tATDK9QRSllKSoix5Y3jhye1LFHDZJm1w2BRX7n107v1sjsI9lax5gDsiMIfbsNv0aBGxMUcht7uzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBFb2Q2Qy9+9O4bZAQTb1OzgCDAwTXbSFnPfdRaWlI3R734TM0APzt2EvIExutplW942Q==]
+infra::profile::pg_server::dbs:
   openemm:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADPSXLVuM9nmMpbRt/etFFeeLfDPUq1fzPiytEDkr/A6rrROWorN+sAKcjWkkfX0ho7iu3k6AZ9ZBJtniypjPIs67Y95VGH3bn/eqPwb25NyxDDKv7XnRe37+m7G6tXj87pGMeDKyYwjkUdhXkCV1JkQ/Xz4RdY3ZSJxIxIuUxViyuV7DkqKfXg8EFkyY90JqgevyXg0dIsGZPwqyxiOHORyITggEJPxQHMHHcl8kgnAPjAXaSZfHwcyIP77Xry2a/6T3jJ303OvSyP6DBxsLdo/mdswo2yVU2cjNKH5h8uRpHl6+LfrCzl4+B6ascnez4SQYn0HZEpG+sUsDHbWvTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDVXVAkvpjUk2nEDb3zzhhfgCAO4KYsx3netoqYJF1rntp/3FBPA2VYYoIClaBfWO3Spg==]
     network: 93.188.107.233/32
@@ -25,7 +25,7 @@ site::profile::pg_server::dbs:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAopzonTmN8Z6furB9Llot9Xa7dGzwicFZkAQUsdWMgi4x0nagchN8beQch+EkZovU1CcIGPtS4erYgrX/KRQIDgMQH2WzMVd15AU1C3qziwJLxWpONvKswoKPcQmhFIFbMYLc3/WoSehtgB4TtSrsA2gNsZbgLHL3qdbjBvSxcMAPQYONXUo76hQRUTI/KPp3kqolrw3uRLPdhtTQQSDLRq7vsY4znCB8ZSdImCINfi2dN0Qqd7OM3NOSXW2qH72C31PXR2Hv3PeAuzCBzfWYzFPzHaChHM1+vQblnZPOf71yjTPDgkFA1jjBORbgEboy53oRA+PZS4d4qHj6FU3kDTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCvqVqsimbzgkRQFMq4OcvegCCvFhmDxWNr4hxzSkYOoGWtvuoYOc7zriuV97QGhHN0QQ==]
     network: 93.188.107.232/32
 
-site::profile::pg_server::configs:
+infra::profile::pg_server::configs:
   shared_buffers:
     value: '4096MB'
   max_connections:
@@ -37,9 +37,9 @@ site::profile::pg_server::configs:
   shared_preload_libraries:
     value: 'pg_stat_statements'
 
-site::profile::pg_server::backup::weeks_to_keep: 0
-site::profile::pg_server::backup::days_to_keep: 2
-site::profile::pg_server::backup::enable_plain_backups: false
+infra::profile::pg_server::backup::weeks_to_keep: 0
+infra::profile::pg_server::backup::days_to_keep: 2
+infra::profile::pg_server::backup::enable_plain_backups: false
 
 mongodb::globals::manage_package_repo: true
 mongodb::globals::version: 3.0.6-1.el7
@@ -49,11 +49,11 @@ mongodb::server::auth: true
 mongodb::server::store_creds: true
 mongodb::server::admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApFHBPhrgFFa/jrl/7TpNZQ1eeEFaO7OEiHtndCpgiKP7hBjMooQrJUK/LgSv09MQ4mHwgIH8xo6/1sc9pykhe4EKmD59G4lbPWpmLOLdj6lQG9IGDoyNXxVjHAYCLUDbAX63O6YNShPdfQghfVrk0m0kaoVFSdbYs8Xq9O0Qylg/LP847fZFOGWab79N2/QHWY+DOWxpjl5ZmWLBFF6R5MFKoxcoNvAhYOf1XgBj93nK3sCxqGlvVt5ctwMj/RbxUKtfoyBroeWE1qOryWbv4jlKpZWfBmDBnhbwhkbzGWdP3vGIWmsXqkGV0ICUNMfn1TfOmz2WfL3MbmSH5BJvZDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC2tVEcFTVCocnq0QyUZd1mgCCDA+MILv46tBd6vh//saT2HSnVK7WqaBAcFDcvAV1iTw==]
 
-site::profile::mongodb_server::databases:
+infra::profile::mongodb_server::databases:
   handraising:
     user: handraising-mongo
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVilK6i4a6G1yZd8PinDrhgHzrn3VBN62907pwfPIKUZY6SdOdkbNZe2HyNNKckANSEzfSHtOCviOkuWlnJiiQULU9JqAb2Cz1QMo1qnFsxnE9IhGklNTcDvw7uhpUvXc7u9giJgViRqJLxgvuwdvr7YnI5wEW+Wgm6dvruTzaH7jh7tVOXuD01yxe/9ER6zcFZK0vfOU87Q9ecqaLXVIl5uajh0HhnT8sNBu2jpACIZorZPTxXfppyp4Fv6Lru1zY6Izc44mAG6sZgI/j++jFgpqmVF0mm1b4imTtGc7iLssPWdARMe9f1rLUqGYutWYwdC5APsS8fkgaVulFJciOzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAlbBAooxS7OkTe/p9IIzMngCDz1WbEoig3vKQHMWY8LHQ1R25nMlgvhFl4DLzeBf+U7A==]
     roles:
       - dbOwner
-site::profile::mongodb_server::backup::db_username: 'backup'
-site::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANnUupXmoJupuOXb4NZYNVlebd63QUoq8Wgj9CY5N4/7V/fP2EWxvljpkzEEK52LR/1s/qMi1TDZnYa5mfQ9px5fLHelhZPepVGwq2Nw+EbAFnvkY3md+i4DfKrE/MNkvohfpDlYNv27n1XVB8SiWTGBFKNw4v7gvDZIzYIGBbbTSZyoHk9GMrUlb/cTasT5n+lqocZeseBbH4kAiJYhhGGGMXuORw0C76br2oVmxcF/QT7BtM7hSKitt1M9Z4jdYFB/P8aoXXB2BZlajeJ5kkFP6jBVZey2tbSdRiX5qA6m1AOKNGLfhw+8NylZd7qoDN9wk5b5Kogk5siEtkKa6nzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAC4K36vtkPpvtWzOdsHOTgCDPhkt3nuDYUFr5bhnPvALotq0A6coqWK8R3zfyJt3/DA==]
+infra::profile::mongodb_server::backup::db_username: 'backup'
+infra::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANnUupXmoJupuOXb4NZYNVlebd63QUoq8Wgj9CY5N4/7V/fP2EWxvljpkzEEK52LR/1s/qMi1TDZnYa5mfQ9px5fLHelhZPepVGwq2Nw+EbAFnvkY3md+i4DfKrE/MNkvohfpDlYNv27n1XVB8SiWTGBFKNw4v7gvDZIzYIGBbbTSZyoHk9GMrUlb/cTasT5n+lqocZeseBbH4kAiJYhhGGGMXuORw0C76br2oVmxcF/QT7BtM7hSKitt1M9Z4jdYFB/P8aoXXB2BZlajeJ5kkFP6jBVZey2tbSdRiX5qA6m1AOKNGLfhw+8NylZd7qoDN9wk5b5Kogk5siEtkKa6nzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAC4K36vtkPpvtWzOdsHOTgCDPhkt3nuDYUFr5bhnPvALotq0A6coqWK8R3zfyJt3/DA==]
index 0bd66d057ed4c9988ea3e9da1a171cab5d2d7790..ccc75bee6b07d347e64f83367194e30596d966db 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::remoteip
   - apache::mod::headers
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   odt:
     docroot: '/var/www'
     servername: int-odt-daimler-com.pixelpark.net
index ab0c24dd2b95679b37e433c828ae5f9d161751d4..56e425101ebc4800cc1e61907ebb2543d33a5ea4 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::remoteip
   - apache::mod::headers
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   odt:
     docroot: '/var/www'
     servername: odt-daimler-com.pixelpark.net
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 26bb51b7ff345b6f1135e14790448765bd94efda..c689268800e4752e87bf3288ca0b316ec75593ed 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   proxy:
     docroot: /var/www/html
     ssl: false
index 5c9af6e250ebd87b149eba5101fc5b5e114440e1..6dc593fafb471d00b356d2db622fecf3c4ea2603 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 repo::remi_php56: true
 php::extensions:
   gd: {}
index 8097cb881a59ed02b0a0eacdc558d1b3788536b0..1426d14cabe76b859d8ae26d4c5789a8ea65ae7d 100644 (file)
@@ -5,10 +5,10 @@ accounts::users:
     apply: true
     group: "apache"
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkxI978PCfKJojTZPYRoIlnXcsbFuhaj4lqDzVfODpQrcm4dm+mJGfvzKuLIUsnYc7gbdN6aNdof8XmlTM+EByWuGnNd3rjHpNiKHL0vfo3+z4wvDcvN7mdQq00kVMVpTXWG3hZBl526xi8tpZ7y7a7YVMTRMfmq7YzzuCM2+fT6r3V5P8pgZVa9UUQLpycvYSc4Ose55Sl/d8pU1+ot57Yl4Zh1fCtuDQYEV3vs2on2LusuH3SM7pVKRArIL7n25Gbr1SJBjP+sGzx6Pwp8pqhvGNNeHs3bBV1NPE595jibtFQTSUlKtV11hgJAHjmp4ys8lYxRsVPG938e6SF9OgTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDKudf8qKSiiqqyOUWiwt2WgBBZe/Z5wj9W1MkSiy9xCGV8]
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mbvd-quiz-onlinestore:
     docroot: /var/www/mbvd-quiz-onlinestore
     docroot_owner: apache
index 855345fbb8564d41c3bbc76b3eb2c85b47da6fb0..b6a77ecc0c7d92cf49fb07746d007af26102df7d 100644 (file)
@@ -3,11 +3,11 @@ accounts::users:
   peter.kreinz:
     apply: true
     group: "apache"
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAj8+nrSwS8JrmgM6sIK+21c81XtjWRlenHlyVUj/R/oGW4lxCPWNapkSRaQKng00bZSB39noVKAtQKJtbK2y1SLLxNMWpiAKUZHu2I8MN3yZea5q3vo06UNDo5QaHAuAif+2+75XKccmoAM9M2WLebc6760RcXAIR/3mDCZyE1ToKH2JiEKN2QOCKeazVjuQd8RqIHt7OlMF+Cik7dvfvZT3oAXzZ2gz0DYJbCnZ91oZnoDQon1o++NuK7D5AiptgGpOjN0a8r5UuKF1prO2XeyqqxP8CUGbkfsfd1F+UZI4w/cSMYmalOYVxsp7dCC+yupJzOxLVuDVJUJnWixjI3zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAzn/eS6abKikhbPQnIVmhwgBBUWoSfMnAqGDuJTpA+SI4n]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mbvd-quiz-onlinestore:
     docroot: /var/www/mbvd-quiz-onlinestore
     docroot_owner: apache
index a2ca5a7014844e599b8ab196df9fec9219184abd..1bc1c128d58470aea2d8f997e502cb5a2990b8cd 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
 apache::mpm_module: event
 apache::default_vhost: false
index 6b8722d15ae9acdebeb5eb759d05666136cc3fd1..cc5e8f15fcce8f1a7318cff28a9ea49ac7dd6157 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOl4qn6kID+//OXWiMUM5mcYrwP3TNlFuYAr2308+zDqnfC+rDyWkzK+cEDIngY1Yxt1clWR4c4Mk2rGhZoCjbEv21mhBa0P71CKMG9u7oxp4WQtN9V3Q6n5w3ey0JQLQVSmYQEWlSVjeVROwvBQgW28cvzlJMpTZ2UmWndfmuz8MhT78D7xkIfS6P/uBzcmdzIpoMyYHjP2yV0WNeAjql431H7gvIXNMNfZB4mXUujwDEHrg4tsCVSbIMCc0MvrHKXo1zU5/qPyn6KhiOfun5l2dcA0k8tCE6Kv4RBBWKBcSX/bhE9t1RbDO7xj1cKvr3tVR/sj3aIn13tmLqQlSeTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBPsURtXnRVE0I/umgTCRW/gCCbaGOS0iJRRXZK5Y5WTRhi59Ug2bZdTwm+ToTatatZUA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAW0f9gfloWIQ+nDEO23HZvf+MyXuaIxD0t6LHIu600eJZdbRsqi5ZV5AkHdKgu/3Y1LLZ3YR4IVhzA9USVKplpGyyMnB4a68Or0oo+COAWtmkaahxYr7dgjtgigEwmIzRKsyheNSGsx9++mH0QsizKRbKF3lJA6GbjMYQ8uGvvunVew2vIfhAr5X6uAGEAaiVbvFJG4bPy0eYZz1GWzyYHpbvg45/H61+YrAsGuwg5AZl3jhtc8DjOrl1wbG7O1r/6y/9Oc6eTex2ZwAKIGRzo3/hqS9cCT4KzXlIEORlpY9l76ls1udXuh5SNsdEO9BUASMIWevEHZ73UvyZ/kMzijBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBM3QPImXWYjyB0n8NBrbw3gCCAEK73UsfvnJq65kWb8b0lP1c7ovcPMherJFgXr2796g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mbvan:
     user: mbvan
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtEFQrvynJi2EfVo+2mO+NBKQ81F2l+qoHJ1RxGkC6MBrDkIVT7aWb66VFcPQ2sGTRVInl4va6SR24ckxiPKRo0WWe+no2anjVgPSRFKCGLiZ8FRRowKc+BJ4vJ9Vb4OoUR6PtlEhM+IEOkbyRsIlkqEjF7Dd0c6UgZDRPJpnYlE2R3QX/2ownmcOFWXfZTytHf4OP2xCQO9nXr3ueIcaP9lp8p7usQMWJBW7apYIXtRDh6craLr4LRIW4Uq2ALbOTE+Q3gqBEKxX8VHkgXUkQiHAFFSTo33UJLkK47YHbrXeJCbE0EuT7JlewmnN9a0IuWrsfMr1F7JWEx8oyrgE/jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAX77o5DsgsGhZVTMbZPTsJgCCU5rT7F4Xy1SCimXGHAtddsIXumJ5xT8rtGlbiFNJMnA==]
@@ -10,16 +10,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mbvan:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAdXopyTzWdYUFXWbPSxVliPPPdHLAHNAL5jR/yrJfxRJKel34r3cUhhZOywnr3CP/dN3y4a0waB5EaOSnCqsxEfCDTOLxFlJ+Fmd1Tv/QcJ7gzq499623/cTkBFqhRk7TV6ccU+gVb1gTD6FYQL5L7nBsMXn2Q4/kL9gz+estAZL5Yq26EM8FkVRlrQi0eUF9BefYTxWZE6p0Cd17sRJADMfdTm2he6Fyz+V/RyivEeyEScPlLH1zxZaAdtlEe7LwBSH5XoJtyBPY/gF8h2WjDz5x0p31HGMzBwtAeq2KZOC4VjqIrMsiUqBBPmtaXziA8Yr2KXy/LciTTePL0hE5BTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGt5CeNGSkOAm1k5ffM8z7gBAD+O+4BamFKG1TX9g2E8cI]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mbvan:
     docroot: /var/www/mbvan/web
     servername: stage-v-klasse-rallye.mercedes-benz.de # WAF Domain
index e38a08e127bcd0f6798767f5484b82f293b18387..d8674bda7a7ca291431aada95eab13c0141ae6b2 100644 (file)
@@ -1,7 +1,7 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZ72ijU7Sp3rSQOKDGZWfNwwGcqDLztFCCTR0ipylFHDNjbvick7DHCcqt3kLC1l+oITI8TTlIwzZsUpGrRBZnvIDTFhsGrw4/fhIsS2XPOzGJj3ZqldWYwmTVYPZcXHS/ORnnrNa9BhfJtuAKnSoXRXTKv2XwdioEDDmC8ZFElyh+3Ya61lNYeAvKX9KbWp7snCGUG1jDniiSZAw6Ao1SDzoZcDjjei76FSmcqkcWA1sZ4uZDokzegI308FiHZmEmdH6Jr8eo6piFf5HwoKCsxvR+VY4P7jYOt3RGvSKLZC21hOpLzDsgppWORhZnabl9TwuVcq8m641xmm0oh7DDjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDOJoMboVqoasYHmA3e+Gx1gCC1JmdmR6YaY7PyR0Z2YfA4g53d6KY4arUCWq2hlSH10A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWvPTOiJlPEHIR81yaEb/FRms91Kr8wMIauBOYzfCDkKAIxNIbmr8sqFeV4BbtuaQe79vncrXn38yguVk6tugRcub5L2dDDE/EvsJncz6teJRAuyAyEwMDSjhnnXPgK8AVGanBT6pMl8osk4NUXZijuEm83oFML0GDuKfgBIybAUcbne7uZ/lceS41VgH30UM0XpvrJR2aJ6LgOot3z2NMV7PUKpQiNNYAJ5+MSRT99a/WFOuJG13FUXgKRJNiBLvSP3/GRvm6wA2aJBOpbOi1IytpIJNk8lwBOMPmmLRXxcHUcwXAfR1LgEB4Kvol7baQbWGICYriNKGNHUN7fClrjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCz4Ey9bmaRw6IK8HS/Kk44gCAIF8j9NbPWgusIroWE6vnDmjY2j/hpZ9EmqFCOy5lg1A==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mbvan:
     user: mbvan
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKGGv1ThsE690YSoJLHK8PJMg/jILTatT2UJsXcWQ/yeoPCXi/6YwLHkWzKs8TczFfBOcr5wO+Hl4TWnRT5t47E/+6Lv/3NgID5gua/dq1gGHmRyg4qZllPewFoj/EbAM6spWkMi3yuaFhj0wjyviJFzvKM6+BCu6veRvZrWD0GKB2xmXuZtBV4oNZ8tsBUzAeF4fDEBcE6LJq6zNPWFxh341j2dKzUd96Fl6eVJckf80e0yzu0RraL2dIFSEppKVrAdahnmnGEbCKp95lFQqUtwsWLf3yYuIdlV8pAkyWG9yy4qJYBJVM3vmv1/1uJ93E5vs5SO8+3pcgdLLOdisjDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBJg1mwgYmFac2coBvnWTpCgCBfMT6UrGzQPl2R3Zgj21WfNumUyff+m7Y5YLl08PHgLg==]
@@ -10,16 +10,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mbvan:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEbdBgz89hccAefAUPrjn2p0Bccx2bw0afv1pzfraVFomn5Rb5ujq99IR3XsolxJQ/PLy3qKI7gQw4QMdAxqpVcSJV0wSdYpTsRTVFEYWUW57RJqYu87XyXbiPOz7ZmN3fUlTb7BMwKoQ+d/gPZMq+HBCIhXrK2FUHfPvyoq5U21wWcgWrqBUf0T4E6N8+GRFx+cMxJRur1YPSvoF4Uo/36i13LULbfc7oiDnsnZ553opjwtI++Z5WX13UGcSaagkwAjKACIZ3ynjHQ+42sfkfZTVAKgpw3y265SLtV0YkU/BIjDoajWpCC+KRxG28yfC+pSWHB/NSete/R9QcLcaNzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjikUjudaVH0I3cJkGDkbBgBD3kCW7unkvGn2qZ5XlgGv9]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mbvan:
     docroot: /var/www/mbvan/web
     servername: v-klasse-rallye.mercedes-benz.de # WAF Domain
index 43ce440b8292583e673414fd8ab1e6f3d1a07585..304ff5975de84be138e06dae07c729dba475ae1a 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
 
 
 apache::default_vhost: false
index 621531b39562f559b61b22bae41bdf302da9c8c4..d6ae10cc0f4c0ac42bb2754a0f37852ae34400c1 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApRXwQAcehi2MNN4V+RT/PWu2D5n3/PorAijDmEKy4fxWFkbosd/C2WZfwQhwaRRUcLpgzBl1/+13lmnY7NU35Aiy+TPAYsb/Uys5YBktPMfAerxk0zq9qn9t2grb7gf5OAhM0VH1m6xA9lXmcmCCm8tfnMdP7MxKGtvbsfH+R/ysXlnt7MTchZ+PH6gHQ9Gd9BzaUyh5weu5yqQONeQMwiFcH3K4g0Y7+2XXb90YVQuz7xtX5h8PcIk1lcRgonW5puFj858yadvbpMEH9/bhK7N4ck6RijuhboUiErF8xr5jCig1F1nKC3iERAUY+SqAax7Zl9v6cqQH8hcrJlECETBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAN8+g+Av97TCa6/lEmhDEkgCDTYun82S9m+8o8N1D0PJTZ2E22EgxyZL1N7C59DGNFFQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANAPK8Xr9E70tFs2hwsplqIZzEc2v/GpEqTv8I/vk8elDzDfOX4e+P5efSB4lH35SHh17/aOhYGKxG4DVLqjDNsvnqrj1DuVWNGhlx64Zh7ApHqCdDDgMNdLi7kNJEsH03EBpvWaxrhUtHDEt53OnTCgvNuxrJGHxpYPU5wt/7afvhHz6s3djkE6VPSOj9zCGSNczVWUDKhla7u2hqMK+pxHCILXzxAZZGrzYDWu2Laf8bMw5+XIeR/pladLAU79nhnApKUR5DJfKrWu+5W9w9ETxW3y+BoAA0sX2vmGhRSyCXQbHJUy3tV15W7nTyeZT37n5TQs+g+vChIm061SCyjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBzqxB1q8RX7mQKHaiuR/KKgCC9cgxhWLjcL9M+xqGA1gK5qaKRXuvy0KU1vB3O6tp88g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   serviceandsmile:
     user: serviceandsmile
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjdgobMbBiOH4P4YEi+qne+SlS0yaPxeXIhqazW34+xewHNG7e4M9MNP3eg2a4GxwOHfZ/edauQOErohf21x4nxI5xp66cU9sMs/77vUPfiD200RFdizLR0QJGOV8KGz7Kmmnqs7ZSgBJ3cMZqICX3Gtk8YWMD/ItC4HkG4FhcW9pDk4+ueheGFROu5UItJUhc4STYMxpodbSqF482SuJuCF3M0AUorzTB+tQPymxqZUEAx2AWEtbpT5WXpaZFabpdRrPQRPYNKQWwaOMLE8Un1ekpdnK0R91nwDJD0clOowFE/JupmSqpoRbkQ/fJA6+S/bzA/2qNJMDmsHHw1yiTjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDtDCPrDf0ScworixPAUPOdgCDkGCamH4FYcwqZ7oPSY/Hne2BiK1ECliPc62uUfx45Tg==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   service-and-smile:
     ip: 192.168.170.27
     site_path: /srv/www/www-service-and-smile-de-mbvd.pixelpark.net
index bde7f4fedd88ca37d7339b907a7954c7726d7485..11787b7a57c780ce102b8dc626d2301943fa3390 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtYv458IzaMSV6VnkfprqM8v4E9WorUVYL9ZKF9pWx5wdHbVxlxTFYn/ehX695yhSoPglEj77ZaH6bjebn4oXZJvUXEFEKjvqrEkF2/dFWVTljRZqtCMGXr/jHdOGZw9u368FeExzsmM76j4avXOzZcjZyWw85O3oKD0NxExD8+GD/10Fcf6GwfBh/iqiJLSDMmwpO3R5OC0iqcIvJZay/VTVxbWWWOr1EmzZjvd30ENo8t+dTDc58AxShlu+0Wedep7aEAnaJBOac4tLgftwW+ki9GkCb77M1o+H7SydPPZzByIAJnY7tz94PuBdeSM0Ms2Qlk1GbAdXglzUltzYWTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD9rNa651ucXgvnaPKWbsc2gBAZ+Htv72bZ1iba4dTknLZr]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoM3B79o9XAcfwgZrLAS1rzZoJorn4lG2dNXajvm7jdgQm3jI067dTj1G9xkiugfad1ZWMi3WblvloeFeZrWiTaPqVJL2Iyo4F/qFnieu6edfcOsMo4Lkd8RTkeEPTKJgIUNTMMwZihDZ4pCRHrAhHTNLCsRAF6yqcdEknmQ/YS18p5+0ALpvfEVqfIxM/F/OVOBhHMIZA7W0ieqP+CHYO83TMP3lhz/0LmKJcT3mKs7OjJ59tZbB+P/rorWOgrkImth4tKNnJbkXTqoxw8xf9WTAt2z9pAN77/Ehuv7BJuw9NB2PayoeK1K94jbhEqG+66so4msjL7r8I2YvPW/n8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAt89HinEhQOPzgr2oZ7ND5gCA9kaHKuBIsyeqvb89M7qzHNl/0ZSAi3Rl02zZfnPcg5Q==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   serviceandsmile:
     user: serviceandsmile
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEARZdHRWILPj8DSNr1O9muAKK+Odj6qNHNDrxNLwHjJhgOMPMIYomp2JKyDavCWpggUv9uz/JBzTnyRNt/DvG3HbL6FbrCipt6eoP9HRKlrad4FgH5hfXuK6hBwcLPQWzVQ1nAWeaAcMf+NX6C/fX5rvv1UjShDJ4FVrNwW0Jlv5C6/3vaiBKqRPNRk+XlVAykaEwTZChIsjzGlmA0Zi2YUCb6byEoXmTrOt58nrR/WxVXaGjc+KjiBeZU3cplaq1NvJ+KGclQG8UBDw90ZDNzaHeQA673kxKWoUQKJpAqjIpVQBb7In0u2wpLFFzTWyIjLG7Piok/AdpmMcC++YiRrDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB0QD6821R4Jiu80PNiQ+nfgCCMhYnrEHCEwnnEHAh4IoumanPHnS42RZhTnrZgd2AbKw==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   service-and-smile:
     ip: 192.168.170.26
     site_path: /srv/www/www-service-and-smile-de-mbvd.pixelpark.net
index fab7081b194d836195967e0d08112bda4e711ab2..f192d10aa2aded3421cd60e526ecc999d23d595d 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAehBtLPU1m2Y8JxoTfhpC0oVhbawH1B626ypItXQA6rh1GM7WBJ3vBJ+r/VvZGJoDUWe0MCWAQ0Q2Q4mZ6B0mCCvy7wysTBzjRJFd31NJJPotGh4ub72KaaCuGxqnffOzgjL8v6rBFVglnxxfZ2LfyTXsydR9fxKrrUQu4vaPtjthssbHkOGCd2kEFLJ12skWsOcT3I1anBwPUTy0jtEfvbEbYSZgcxQONcb5+c3SyyHoXg/XEYRTJSlMPwMJHpgzY0LzUkEC9kKWicJQXCv3V0kTPy3tZ6nLnHcJOl+4hgOdEXu4oymLrCQcdNdXbqFkmjq/d6PWopQDAl5rmJxP8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBACdm3cOCNAt29J87awDhxxgCDQvaIfAHsopvyfzIn26fW9vWiob/jxVUvQlXVS/IVD3Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAq+mOxO5qDCppE85dpcahq5fhDL530EwK3g5b3qFFsf2KlZH1QcGsJVairddabtBdF6tG3RYgF8gEYOgC1Td0GmfJ5t9l66oSKa9gKUH2tsBizspXACsxkR+pXvGC/UNNflyk6IxyPeRlwTKLJjw5uJA1gxgrU/tx5CPAOemTh9g/PI7MzHeSe5+zkPiX0bRDog6p034ztPNVyEMqlaQj5mdNYjAIxnQSgO+SVP1gBMNqEJQiGk8MMZEJKPE+pJLPeLDPbKNMG9E+mxWNIBM8VokmxAVKSsvGIUu/jlv8zRljvj6bLpH5TSxeQg9SytCRUYe0kGU676NzU4Q8UPl0DTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxI10ImDb7e5K0dueyuIoVgCCKJMmOY1v1zFr7kK5WPvnhMeV9Pe828oz65TwF77u1gw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   serviceandsmile:
     user: serviceandsmile
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACiAhLUbjCAHJ9441OrAwlvbSwmHCvBuVGDAZlb985eWpFy2xK3aRFrcrpiEqPCkrDi1qkwVlbCqVltnwzsZnv/7Ib6+WmssyRAM3a4qiZaygS8RxJ7xfFQrNdE2PtxT2962RzCFKfNKrP6Ytfl8D0tVMBHJaPwvQCVhJk7Q3ku2xAKa3TxjcEbhpGQhWdV5Y+Qc5Obbk0cq71U4HDcgqmIfSTzA76vcD8FUCUujCDwNOGNbqgG6tHeUWD5eg8l6TVfQBIUHYSlTBL6inNiH9uV7uKQMUHd6io17L5DJ8V7RcOZEESnjJme7kDDpN3l2kRKcr9pZOt/9wISFYC/XvbTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApMdEEsOWdVSfC7AAcNIsVgCAaq1Bou1F/NHOPFpgbg3N2m6ib7Vofnlt8rRmTaVu+/A==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   service-and-smile:
     ip: 192.168.170.25
     site_path: /srv/www/www-service-and-smile-de-mbvd.pixelpark.net
index 0c71cd2ea3894a37b26492dcbc41a847451fee83..fcd22d025fe2fb280a1477f321130cfce889000b 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index a4bddecbef95c7cbc3de192bf351ce732c51d497..f8ef4d3da858a1e458c5cf79301305625db07c9c 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApC+6wgBWKSYZxEuFtCexjUaVlBtQKANgQviiDy9HBg3X6irGgTeEoSG2FG04UDsY6EZCBYpeUToW+B0SmpaP95SpEp3ohv1Xtk1m+FNLnShUMtfxZ5fQcN32HvnjyCF76lVB6mtGO2K7XhOa0Lu705r1e7QM5jcSLFJlTBfh91i9HkI3AUtjyNY+PPBGMod8kQQ2cL3xaVpmNSEaEpfacJzQHKE2EWYGQFX+/lcTUhP0WUVqslfnO44kHPUxI21EKv2vvarFWA2AnIq+8zAh6ACFlqN28kcmlaLfk7CluU6AJ64bUQbAzwQ5yii+VoAptt5ejuYs2mRDCxZD/2LevTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA/SNPpkS02NyZXnDgRFpI/gCDMI5nlXXfu/1wCp8ZUM+QJrOWWV075PbWeKHHIN2KDIA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJSYl1/2o0kA++OGYH5JtsBhH9GztzBulDyINhHLVHnv6B/sAwWEek8PrHupSgk9TAMOz8dm9wk+4pOc+6X3FdOEUe3RlfJfxiWeHomhZeEC8IkVIAu8iBhWNL6szjsF3y6lQjuuh9DdtUcdGIX1twPUdaluJ9rNL7xFVkt/6zG9cHfI72GXEJguUp9WvNNoEjq1zePVGmAOA7zSbBq7aTrcapy5RacFn29+XIgUBViHDcOh1KDM0Ni/qPhb+0Apzzgw5SWxdsfEfl7I8RJB9Gs4p75EXbFTYnuXZXtSfoMpBWmMZFC3z/B/xP1Vx4yo60qhPbO7uIVQvPJJakjuAlzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBFheb0aVrcYBE82AZTHO8pgCA8aFDJJPVdfSdIV5pWK5htBnX2SMC+TZ9nNPLtLWcffQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mbvdserv:
     user: mbvdserv
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAS3r1cmxwXwiujX2SASOKrThBuy8OqKoxFRJRC0I9iSaIslc66sndeIwdVQPExWNdniUTDcVy3eDEMH3zBJYoQmx0N57RY8btEafMXTvHkmvxzZkpTijPBjlm7bVu8QdJ5RTn+ksuy25z7dNT53xiAdffGOP60GVPNxhrrb+5QDkDPK175O5L+gbven+BoYHVCRYdQeosK6tPmpyYhI00+C5DXafim1+kSUPb+07SqFB5yc+3sCSc3fyFFvfYxZjwHzC2Ed+lN2jZDTINfu+ZkB0Z6dQtBGuPkC+UDstk1Q7U+1BYnz/LSRSVBAuUU47DrCEK+LfELort8tSiDYYyxTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCtDAwmRfyfFJyvZRKD/yO7gCAvqNN6GEWzvKdSNHaVgnRURQDpaX2h4HCyH3IYYHIomQ==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtmtydKY0+X+bgMcVQDsSaIvXwWGPPs5urDl886mBmUAgNB9E2ZBqlPFnlRkYwwpGl51e/CMs1RcVaRA73mQtcgJJXmlTrSryjMbJAishEBk3qCMbaY5JsT6eTh5rBxCJzPqRscW2rP/FEhq0y7vS43WG0ZTqJkSPTWhJBWXRx9PHD01Eouv98+l8cn7qAVFIU4dV4HoCjCmn61Tot+xcD/gpv20YzeIBZx06agaxSICS9zFQgEk6O8Fbr7/AowjW3vWjqMl9dlWF1oc4fjMyOVrMafLvd9+YUd9TA7IjxP/gliWqQyg3EuEr7U994WtS8DQQR65YnRVX3iXOQs0X8zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBByVFL3OOwD3JWF2SvllieGgCDCcb+Nqwfu1HTkfVLwM7TOhqdjT3EJ7oL79PGKzz1hhA==]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   mbvdserv:
     servername: stage-www-mbvd-service-de.pixelpark.net
     serveraliases:
index adcb76909b0f9829d86082e594e11a3fc88719d2..b4821bd1804375ce4fadb1f1fec7b1344b70198e 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiMlZGVngKN2MjMrOsGWMT2UM65WL9pVVQykj4zXdjlw0YskELH4n+zMGmTr52zvmtks5NwX2jTM7hhpQoweOQSH3zn1T7mXE/yGM8mn7espyvZfzLxnh/lXoA5c5NRrSwPgHujRRXCUvgA8iOYLSBFQ6PNtibDQq/uHo+y3bCgkVbPYgjnHlGQxkoGA/nn+ffmtZXVXxoCrd9OyhjE0xdpT7hFfKlkzNMKeP4Z3/dsQUwWgKEmGUIQg5GyOvrPop/17B784509PuJq7U+3l77/4ZtksqzuvBuCCtA0XO8RSMVEBtp6F31gmCjCeN8BDIJvYu2pPKJvcn3bbf8yJWajBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBUmLw9uJcgBPwFKj1xU7mlgCA5j/Q4Xg3p8VEvlhjHxXEFANbiDIISn1lnzoG5urYqyg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJSYl1/2o0kA++OGYH5JtsBhH9GztzBulDyINhHLVHnv6B/sAwWEek8PrHupSgk9TAMOz8dm9wk+4pOc+6X3FdOEUe3RlfJfxiWeHomhZeEC8IkVIAu8iBhWNL6szjsF3y6lQjuuh9DdtUcdGIX1twPUdaluJ9rNL7xFVkt/6zG9cHfI72GXEJguUp9WvNNoEjq1zePVGmAOA7zSbBq7aTrcapy5RacFn29+XIgUBViHDcOh1KDM0Ni/qPhb+0Apzzgw5SWxdsfEfl7I8RJB9Gs4p75EXbFTYnuXZXtSfoMpBWmMZFC3z/B/xP1Vx4yo60qhPbO7uIVQvPJJakjuAlzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBFheb0aVrcYBE82AZTHO8pgCA8aFDJJPVdfSdIV5pWK5htBnX2SMC+TZ9nNPLtLWcffQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mbvdserv:
     user: mbvdserv
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfqm8tH2l85zeIB0x8wx1SkYKGpG+lLyoqGKT96eAjdXawGShJEZeuzxl0LG2L0pC53/DWGfMTP0BdRu2Fh2qLufPWlWQLoFGw+xeoL/SIxm8EjqUy04g1TgER/YJGee9FPWJ8kp8hGjMxklorCQaE021z/+6xA4gER6XWOb6QrL44JaZ9IS9h/4BIbRtPvdEHm4c+pEwGat/RUWp+ycjqmOvGqaK2TYZ/4VD5U+vJWusHTxM8iGbUQTqZoKYyZRZhy5FBr4LGJH0BrcGAXBg5jEkq0rWlpWvng10WR15OXVKK/0N5kDj7Rk7HCkxTcoPpBfxjuG2616GwewDHovlSzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCG+1TZHGPIqif1/19gMEbxgBDurYqeuHpExW6Vcy8BMWxb]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAa2gj+nAmyQsRYSmIOIL5/ktJFOFUbgFNz24EM9iDVICbavGkXLO6hJMG+fGfzpf5D6wABsrP1QPqw+QMkI/SN+wIPCoJWxESH5885nzcHvwGfAMPYKD+TVPLWG1NuJZ6wWJo9U8Obw8Cw12Z++IB//BL9fHQjzpU+Zt4KabzsiyGq9zdjBtgxy+LFtwFRZ9KBeoM9m8nCgwT+pZBGXRv9DCLfZB8HZyXUyoM7vNcOlwUdnkSf7Sx0Z4w2VpWPqhPnZx3cDl6IkDAvmELbEDgCBSyjNGAbvM3rEibQkoHMkxtIOEPuKw3HgvsdbHERVG7rVlAD+30c7b2tEFIujla0jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAduZnKhY9/tARp3Z6K4HzJgBBWOyYNm+cYWTk6h+kA8XNo]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   mbvdserv:
     servername: www-mbvd-service-de.pixelpark.net
     serveraliases:
index 4f421ec93a44996c586b8f9aff77bcac42e2fa6a..aa7f930881d92d39294e527f749dfb972c195451 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 accounts::users:
   deploy.hamburg:
index 93203e1de744a8d8400f413393dd890de0ce1fe8..4a651bffa5c4f6e4cdeb5a800aada05c53ea594c 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAaPHtlH4lwDKi7cQQB15HrNCb9/44z7FLAulFulJvxX2xn7Bi4dwPRirXMTu1JWMopauFV41D1nN4ZA+kwMJtwMJnfE3zfUHybKYDTa11AqL2CXdfyVEpxwoCU8eFj4/RA0GY+nXUHFM+JCK/JLERaAlvvLE5U4c1vlsNQxm3gttBw1UAGqB1uZkRwNCz2ypBaip4z0Kwqro8+Js6/6IP0YikiuL2G1G1D7Ehgao8+zmR/u0QlNaRjo4CVElH4/XLZFQci4PizlTyCwJ/REJ7JMF3eKGLVwxeHnwZOW5OFC8jYLbckGpZv609z+qY3jqL4KEYEDIxJrmRA2pjY2BH6zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD4F0PfFUuQ5SZON3KMuqMNgCA6DfnT8APsu9ggR+wwHcKH0+p+iUyZxXX9B5TiMKS91A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAA9jkR9gpqRddt65tcK7PgofxJhi1izMjYCWWHKNDVkt0mDv8w1O1oHmDs7Ds+zpAzGlScFElTwyulU2BTjF7xBhcaOjMQBhCz12oW1pPs4MJJq9YfJ0/lRmiDpGhjvskUEBvsxYy8Z20rXg518kJExkS8u0m5EWSVYGCcqRgz7QzrFt5aMasTNnTrtikeK4usl8NPEJORGj+Bp+xBjx3g0mizO1Jx3b0KRKrKozJX4at7FTih9eS5ErVq811yLSZyMMZk+Y8QFZRzrxh0Mz6KGlK35aloyodDF2jfon8KexRwyaTvdhpFFzYR8KznzFkUYBxUqMAZ3HHmICYGf2OcTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6+GaKbFZWL88pzILhFjq8gCDrS/ttQObXaH+AyA7613G3j2lgJAaG1FDr3XKnFqm2qg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   shes:
     user: shes
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsmZRI2omJoGX09yn0XhLXqRGoXeQBQqS2RK/8j+wcrTaNuvWWl5DZa71/PscazN1D2xkIex8RT6IT/8uA8r2/uAeYDx8e+2Lr+zX8fk4VPLF9AI8YtyCvdQ/fLetE8XLU4WcvXtdALF9oMpu35dYibKfkEHIL+2Efqnk506Q9uWcM5JcwdS7goXfm5dieOorH30Q2fVtakE21zRPFCyNQkEL4ZzS6xW7LnOa/OBREv6wdzR5siX9BrFeZCBX3y9BZqNncEz/lNPhhx2v7ORvCYcq1bsYWGw23dGy34nSGWxqzMXwyWAxV9jYd0Jof5UywD/soyDOPlzmTtUBrawY2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDToWNTDMeKGzXSanSfSwifgCB0bBBxG4HFOOnGr89XtovTeiQ1UInA6zANCHtwbct3nQ==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXFxPe9ik0Pk0OAkkPGPRJ46YyadMc/JPGTTRhHEqXGj/M2hYEM3UOX5saPFemDfWpHuCn5J9sLbM/G4RHMMiNSvGl6QM2M+el4sRrts4FXiAH3NNE5MRNd4YsWMU4xmoe7OIXZCjLWZQ3hqzheTPFY7X+nVlaQ2H+ob0pbq4cLTrDcTRu3iG1P94Y0VC0Y/Q4Br7HcWa3AeZOA0pARnBy1zXzA/DqQ1i9UllHW4kg7AmzaXgI1Pa75qM4rgwMNr4+/F7VcCcgHh8QHodNDPhrLKwEy2/k5JeWCXaCHVpxjfWbJXzfXQHaX0JYfvl7miieZeKtM5gR2eyi3PQi/M2czA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCp09XiZ+mRbXMXdK8IDFdGgBCztUmcER+3w7TMBG9ARbeL]
 
@@ -16,7 +16,7 @@ sudo::configs:
     content: |
       deploy.hamburg ALL=(apache) NOPASSWD: ALL
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   shes:
     servername: stage-shes-mercedes-event-de.pixelpark.net # WAF Domain
     serveraliases:
index ab2d2bbcba10112eb8aa49c0483a7bb5d5fba7fc..4dc1dedc27f02ede4d3908cf044920ec5d046b2f 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKW6MMHMpHXjtkcnF+uPJ9DcwniFURUddkVOnGO99x/41LWrGwkl7mMEuvzsiuXoLm+6It1xbnzp0VIN2LaWNZD2jVaIj6P4WmqWb1HRd3VU0stSa+rnMO27U22j5jL0nCJOlZPaOcuf7hRhE4c5/Y+dW+cweTIpxDxFsYEnky1MTHC6XUw5jEoQsn8mc/vQQv7Ax94N3estMJnrJWzFu8fp1rLjC3KZYh7xUDVvu1z+gyf2R5oGxHMgaaz8qqCBOafLvQkzMIRqxJ+pAFJYiRDcGu8DYmjlognQm1EuIQJk2tnIXFnVVlABQRT68Ro8tehF0dXbnBVTqVpz3Qo0wDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCiVh3Z812b642v+4xHGdg4gCCYp5Jp/qhXKge5SO/+iZQ2jbhClYLgTvSLtsJPBG7vng==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAi+UXR+GTiKPtVnUMSgeQhPy1MYu5TXlmv5rj2EcXiUrHxkK9Oj/yXrhxNPsJGZGTApoGpwGnHTfhCLCmRltLPDSWeuyRVofabHiCzRehmrIzYqVUL6Ipmn4bwSiHWx0LJT9l/YK7VmX4xBd6aGv/FxM5/Y81/GeiMjuK+/8wT/aQ3ozKld33txCAcqkE3pmC+qT67Ef7LO0Ftl3NDee/A7G1k7xm4vFUTvTYh7c+V45jTNIY+1KrAhcsX4fixbaDWfizJGIyDONr6RB6sXqWSguMcPo0BI24fUqxqpVTBpi7QGWK4agbCPwXAjbJMw3v9uuRkZ7cryzTT986qpSvwzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB39rTk/7Og+u55jzjT2oxIgCATYQ+A02LLjJ30Rge1+4jhjvGLwGcqYoESMNZPrnvg5Q==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   shes:
     user: shes
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApZ5Eral1rXW4L2mdnsHTjtemmIu2KYwUchdWd2fB7L11bvkgKiLKTPKxQ0Vo0Qgs6qC8I732H7Yg7Yb+57LnseT3KaaKcFfKgzIcfBOiepni3NMhgeX8H2e7w1LgW7YZ/CVmAy40kLmJiw2EUubzAuWE/NV0enYF0Kqf3+BC6j1GaJ6MlHTCuQr+wzUGL0bj2ytL6zMLWWRDqWyKB7gsAVa4FOywYoET3gRhTF5eHKbV1Nkn4KtmVjuYZRlZQNNalUGfjUXuJJdujW8j7MVG037zTb6DlFeDRzfuoSCsvY+RfuynrribYS/AtBRb/WtQvexCEwziZPzd2hQlS24XwTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6T77WhBelEwImDIp4WWFpgCABaon3xXwfx34sCfs+U7pJsQbe03msGnz2FwZMo3XQpA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcKle762bWbDU4ZYba499KQGhqFWN4tdA1kYbhy1eY3+APuVFteBk3K6m2DgvbSs2Lqd6j/d25TGTxIs+UX5swUr/p+fBKzGak7z4xQjqMeCbky+/WUpaJEFJ/5JGSU8jKQW+w3ZimehhpxIrQr6ssmCEYeDagUcRWafJiWypZPqzYDBe2cTRxPgQr2suNR+Mc5iSjYiem/5+/KfK1DN9+zque/YZJA/sAtiRCjp0dOCWtr/APXLHgLfrgnPI7sgzitT8UH3tMEfuaU2ZLO8lJ9FoXNM5j/N1WL/tK3Dk5YjTVoJZmjM+EdXpJLYEr6g27FyPxKHGdHY/siUiqNtd+jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDGCgKkIlQdd8ljiuh3GuU0gBDoY8qoP4VjGpwsW78GYaV+]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   shes:
     servername: shes-mercedes-event-de.pixelpark.net # WAF Domain
     serveraliases:
index dc2efead5066e3bd0000a317a1a482d23041ecfd..79aee6be18a29cf2ae00b180107251db14db0fe9 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 apache::mpm_module: event
 apache::default_vhost: false
@@ -31,7 +31,7 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   specials-mb-de:
     servername: web-specials-mercedes-benz-de.pixelpark.net
     serveraliases:
index 3bf4a36e4d0a38059a700501465a9dee6db258ce..ee691df87649376ab489d95a1c0eb5e5903d1593 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
   - apache::mod::headers
   - git
 
@@ -31,11 +31,11 @@ php::fpm::pools:
     request_slowlog_timeout: '10s'
     catch_workers_output: 'yes'
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGjFPmIe9AQjwx9+PG9PT+s/urbKzYjeTjfbKsoZOalI9k9vdLP65RmLtkViJ1PDpRw7OFriX40r0fLvcoRGzLiVrfUzFNBFSYLjqGRzyRovoAq/99lnwVuAht38MxUUIq2j2Y10Pg//gwR6tWasRbaC+yRGGMZ2TqZNHxUiodyJMfpxvXgYkJOnOdeW4GvztPiVO85jVMWOtWAm+6sqFWt8a92fiKawAl5HquJH/sBhDT9gE5d67YUNgbcfW9BAfhn32O+Xxm9GWfR8YXuS6c6cNzLcl55yRobGNKNqfR2GzBBAMmjzuMDEDUIQf92BPy5tYkVKZuzxq+1G8SOU+qzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBtARxFQdg63UM23gBQhiS2gBB6YGY9YBmv16Tq/N/A9580]
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   mercedes-benz-versicherung:
     servername: www.mercedes-benz-versicherung.de
     serveraliases:
index 4aee0800f6828828944e795441ff7ea6c32b81e6..3b3e9fc9e78c4d0fae8523ae8c9f320ded8aec4a 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
-site::additional_packages:
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
+infra::additional_packages:
   composer: {}
 
 accounts::users:
index 4bffd99da69daefce2e27997283e267a023b13cc..4245b4bae7eb3d41ca301da258f0931b490dfae7 100644 (file)
@@ -1,15 +1,15 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoouOa6YYiNSLj1BO3As31eABvwVmQ+1KKRu0TTZ5Kmvelg5AlUB8Z+S7BYUmAUdb5nGp+DsroCOrsZll+puzxm5et4taXcImpk4cy2E3lxmN2fnmWYRJT1FUmPGuAlZUU9roA92XPN7ZoALQOd84j0g3bKuj8bvlLfaUHpWSrj7BKg1jpozp7ryGYAxUa5epd4XDhZesqcDkVhJeavCVtniFFAD4aK9Sz80QCs0XVApMsbxAycT8kUIXTEPY3/OA3Jz4E+z9Wt1xWqh6KNbr1q1V6RTiOuY6kgB5z5WgDMq4pij9WCiG7z+/gu+yuCPw9JWbR9HXS8GieWVBJ7BL2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBg85udmy2/Ranch/g3x99sgCB+4iTp11g8qQTXB9mIeiBd5BlEFUmFjuufFjQreifuXg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAD/IxW1HeEYVq4lOOfUYyA8k2qsWth9XTVRrR2rl7VyzIcr3Tqp+osiA/7VTsMIyy5TEq0cBmG6afnMjLsqVRm7sfAaNmCckWoPBD7xKh9wlcQ91ajYpvm34rMZnhzM0lXxUXN9Cnd9VJK0wVKpd3ozWaxD83pO1e2CxxAYYIu5cfZ21BwBDmqGvPmubiAZ35iTsQixihEvj2NXymP7xrfFyDshxfqOXZPNRc43rgJOls2e6aNH1grerYONVDdqm0UoExcELff+/T811b5wW/MCa8QAX36VzY8hJJyol/5bJl2iB0vAklFnAlh1iqks+l/hjR+L6PvAMnOsok2SP+/DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDJ+qpB5g+bB7h36kmazW3vgCAGu5hAxn+44jLX5CqRHVP7IbfPo+4giWEFqgnGk2o6GQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   sternenlicht:
     user: sternenlicht
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABbfMQEz6eE/k4oaTFDD5gpogjYNnkackikgIp5AwE1MKE2799AKOFqgF3znAIeIpTE+vzVBBsiNQjymCaOMz8EizpCPfcexqSL4u9WlkvgN7rO6BZMjvBxthbQckk8MFcbKIvWw4zTHtqmR19GWVeOv3JwL8pQvc72c/77E/Fdp8uZDL6KWxHvOmZM0ZTTyKaJwWT5Wb9mkfhS7DNQhHG/9uCzoBU8WTKjlS6Ws8fs/ohmLSHwBLDB7kX1hO0LJkKMgPPaPmEuYlO7KJ8BD3f//1Z7LMWXCnDduzx6EhnOIF9EOlQM8ndIc2lxwRnOOL4d9x1ZMVOWW3qyeHLnO5EzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB+YH7Gt2hQuJq0sI6f6W/3gCBjIY6LDtd9LI39W1cGTUBJ/I54KQKT+kTeYQbMT/f+gA==]
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqxxJ0t7BuZPFTpWUMOghSpxayK6UEGfitwtMEBxPVxivAvb9cNiKvkCyDDPHbTS0OUK+2rkyolGKzaJxklqSLrQn1YJeux6Fir5/9I4DFWQxMJhp6Lrpeexs9cSst0OTNKN28Ssbj6C0q1kyMkb9QcQVxYOu/KOPIdBPmzc2E8Q0CLYPWQ7bF/eAdXp5her1q12IKWpZtRSJTP8tp30JCm0eS2ee72fjchYUBdgH2ur9sxMftpqFrJwPSUFRinH7KX4jDDOVTB6KTRN1pe8f+OH+JqTZR7Mi2l0C/GhED+FfkHrTNwgHGQOypG49AgewOlMQia4p4codKcNPy0D3jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqZtql2k2vwOaNnef83Bm2gCB1FXeYmmGzPANI0CJPOK3r9UoLqFMBEntrtx3Sqx8WYA==]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   sternenlichtbotschaften:
     port: 80
     manage_docroot: false
index bfe1a7caefacd73fed7e74995fbd2dbd7fd2baea..30718fb030e634db913cc9878c04dff441937e90 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbWZCakCf3p1MuOuKxYDjdyiAQDkt3TG5noIGaNPABv9zmNUIA2RCbYwgXXk5ZbOtdr68w2usLhKnnMkNT05fwdF72gMTeLRDdccttjEos3xC1o5lR/WU5C+JBHoSlltowsJbIvIrkbdPJ4gWAVE7bd2PqmbsM4qfBYWME542jOoOxVQLjBvdgqxobZ9Wds/5yWWPpUsl4E4kqrKI8hRdMeFOckXCe4L1355t9t0BJgqcjkL4XBOhm8p20tSK51Wp0ok4WCqOtSvfdM68Mb9rwE/7eR0n9GvpIjnzk+Xpg0OZiNpI38ybyWDileqC0T/8hPtYMSbl+A7eOVSY7ncixzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBiY6ztcxgzKoWgJ2MSXUC1gCA+cUlqseuJiciMmKfguyZEyLb/S3mTikU6YeOfaZEXEg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAFd4Im45LZ/sx4Zqc0nmjpaJS682KRUmCONsNCxro02fV7mvypWerQepQ5EZu+3nJN1aOjS1ByS8O9JgpSHcxOOY0LTUJP+ctqawdmgxhJRHUrlwsDWb+zEfFsGiASD+Oec6knJDdTCtmMFv8jkuxOIuBsGsVNQdkyxkQ85SsTelS83//Qe9Mwq1u0HG5FEq148Ef306IhjRjYtIMDYG4A7rG8xxOebjyIPK8UBdRkfFRGZbNS3e05PDgUvz+tcboF+8tvRxgZhseou+u1hyM1LVA/HD3G/1595cNZ2/jRutiwxjKRx2a2JCPnAE3AQ4D7iFWbBAALZy/y2RFkm85vzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwtWM65Ww0TWTOGvneTPlHgCA8qc9wePpMe0j3SN9ZDVS9kTb6CtbdihZol6vhu6C2Qw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   sternenlicht:
     user: sternenlicht
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXGHXUH/kzQf0s1XV7LaBs5GB1jWopuU2GsxTw5Ay/Uwz/tcW/u/3Ph79uhSVZNoSIDOiY/r7uxPmsN9+sBiDnCg2hDKULDtJFmnt/flCUOpQJlJvIEkxOkeKhNoFMzOlO4q2g1wVDyfF2I8QMNqq83p8SQstPN2R6lPJqyQ3CFkoSDKKNMYMM60NxT9Yp39rlam1sABlW2/3NMJPdnsDHni0qjQufcQGkc+AArpcysoV2GxUubGD2EGdB7PUFHzQSv1pSwN5W6HNqiho72JjHucVTcW9KWytKsuV5xRYcoRnZJwnOecvxRELtkmMY/xPLYkMOmWfd3V7VTWVPWmszjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBfRVjyi7qz6KhcyouSxJfIgCA6j15pxPVYHpD9Bc4K/TYHOvkwXZypbzQRff2SJkWi2w==]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   sternenlichtbotschaften:
     manage_docroot: false
     docroot: /srv/www/sternenlichtbotschaften/public
index b1b94e4fd17ba310ae0612dc8c48cad821973c4f..2d82589ecdbb218261d868971fce8cd4e529a033 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
 #  - apache::mod::headers
-#  - site::profile::ruby_passenger
-#  - site::profile::mysql_server
+#  - infra::profile::ruby_passenger
+#  - infra::profile::mysql_server
   - git
 
 accounts::users:
index 277b02894da5b096320fc423b8a2ff854f4f302c..8c5b452870dddf13e75667884d0599321c3bbb65 100644 (file)
@@ -1,16 +1,16 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiMlZGVngKN2MjMrOsGWMT2UM65WL9pVVQykj4zXdjlw0YskELH4n+zMGmTr52zvmtks5NwX2jTM7hhpQoweOQSH3zn1T7mXE/yGM8mn7espyvZfzLxnh/lXoA5c5NRrSwPgHujRRXCUvgA8iOYLSBFQ6PNtibDQq/uHo+y3bCgkVbPYgjnHlGQxkoGA/nn+ffmtZXVXxoCrd9OyhjE0xdpT7hFfKlkzNMKeP4Z3/dsQUwWgKEmGUIQg5GyOvrPop/17B784509PuJq7U+3l77/4ZtksqzuvBuCCtA0XO8RSMVEBtp6F31gmCjCeN8BDIJvYu2pPKJvcn3bbf8yJWajBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBUmLw9uJcgBPwFKj1xU7mlgCA5j/Q4Xg3p8VEvlhjHxXEFANbiDIISn1lnzoG5urYqyg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJSYl1/2o0kA++OGYH5JtsBhH9GztzBulDyINhHLVHnv6B/sAwWEek8PrHupSgk9TAMOz8dm9wk+4pOc+6X3FdOEUe3RlfJfxiWeHomhZeEC8IkVIAu8iBhWNL6szjsF3y6lQjuuh9DdtUcdGIX1twPUdaluJ9rNL7xFVkt/6zG9cHfI72GXEJguUp9WvNNoEjq1zePVGmAOA7zSbBq7aTrcapy5RacFn29+XIgUBViHDcOh1KDM0Ni/qPhb+0Apzzgw5SWxdsfEfl7I8RJB9Gs4p75EXbFTYnuXZXtSfoMpBWmMZFC3z/B/xP1Vx4yo60qhPbO7uIVQvPJJakjuAlzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBFheb0aVrcYBE82AZTHO8pgCA8aFDJJPVdfSdIV5pWK5htBnX2SMC+TZ9nNPLtLWcffQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   topdeal:
     user: topdeal
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfqm8tH2l85zeIB0x8wx1SkYKGpG+lLyoqGKT96eAjdXawGShJEZeuzxl0LG2L0pC53/DWGfMTP0BdRu2Fh2qLufPWlWQLoFGw+xeoL/SIxm8EjqUy04g1TgER/YJGee9FPWJ8kp8hGjMxklorCQaE021z/+6xA4gER6XWOb6QrL44JaZ9IS9h/4BIbRtPvdEHm4c+pEwGat/RUWp+ycjqmOvGqaK2TYZ/4VD5U+vJWusHTxM8iGbUQTqZoKYyZRZhy5FBr4LGJH0BrcGAXBg5jEkq0rWlpWvng10WR15OXVKK/0N5kDj7Rk7HCkxTcoPpBfxjuG2616GwewDHovlSzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCG+1TZHGPIqif1/19gMEbxgBDurYqeuHpExW6Vcy8BMWxb]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAa2gj+nAmyQsRYSmIOIL5/ktJFOFUbgFNz24EM9iDVICbavGkXLO6hJMG+fGfzpf5D6wABsrP1QPqw+QMkI/SN+wIPCoJWxESH5885nzcHvwGfAMPYKD+TVPLWG1NuJZ6wWJo9U8Obw8Cw12Z++IB//BL9fHQjzpU+Zt4KabzsiyGq9zdjBtgxy+LFtwFRZ9KBeoM9m8nCgwT+pZBGXRv9DCLfZB8HZyXUyoM7vNcOlwUdnkSf7Sx0Z4w2VpWPqhPnZx3cDl6IkDAvmELbEDgCBSyjNGAbvM3rEibQkoHMkxtIOEPuKw3HgvsdbHERVG7rVlAD+30c7b2tEFIujla0jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAduZnKhY9/tARp3Z6K4HzJgBBWOyYNm+cYWTk6h+kA8XNo]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   transporter-topdeal:
     servername: test-www-mbvd-transporter-topdeal-de.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
index 17330662f3593fadbe8d4b35d68011cfa389bc50..55fd49b26ad2e38d4a6304f39cc917f2b903c416 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASuebqt93VhjOA/WuErIfFhnjLN3MLrI2tfiQ6hH7RZi94hOnvLJ1US9XYgO8f5rjASymc6h+NSJcfxY5m+EtFDnqqLkSxbL1Hy/+7CkceTBp5dIYGzACh/IQotFN8CHxUHJAaOCZuzf5C3NBbD/QkaNddAR11d2cQwlD+eG1wFn96jE21z1vTrBfphXB+rnPrahg6OldQ05F17VJ+FBX2JiW54j1U/4k/GHHEYE6vZQIUU86EeAKzqbYrfhQOT1pWVTMp0RJ+YEd293iNDb4YuR10RrE915KXT/SCNTh696oanQSbEKlus0YX9SsX/YpFhRcP77T5NK8q6U4SaqNCjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATmddgd6P5pxwywfXCc1/fgCD6MmNEDr80XLRRYQgsiOrox2Gx6vmH1AfQExB/J1Rfkg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQPfjLD7Nvenk5U3Keyom5uTujPKa/vRp4iJXpAwb+brue/el50rMCVHDuaqoxTdYK5xgBV0ECbjNlFpgic+AoL8pM3OcL13ZINSpf7LVvkcw3OxcOzzFeR+HyFDpt6alm+r28MKeUtiNqC+D4pqolT/OiGf859PheTnqn7O+gVbGQTOzbIyl/9bKSF8NUSoo3suHIZyFeWblEOdVdae993fIDkJsMR2Jm8R0MOQW+rs6iUPzGbYBVKTctXk9r7mA07l4mINOSEl+fbt2johh6pC7t+AzVQnwZ1MaFU8iQWbvmJkuwCTNmekN4j/cOT5GGdr06M544kIra/GA03fc5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCL9Esp+YbyU3VIoAToCCN2gCALvB5/umtkO7HmeBks4YgUr27CK4urKip1fDkyRmdyww==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   topdeal:
     user: topdeal
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApqj47Jnk25LgIMf4wAH4gBH6Jki77AuU/75W4v38SJGHjaC6YcIiVrh+7xvfOO6HK+OKePitnS7cv3+fVGwcnNv5tW3rcz57J1uN3FrB/aRavBrbMdWPNxOZOvNe38rS0gNADQHlCorRonziVCDHscMnWoqz+Y81DyEXKY3gFSnwacSdeOcNajRsxTBEnOtilUUx9N1u8DehnGOAB53q6SPqT4oLwq1eySpMhpIYyvvMAeMyfRy/8NX4yPnskilayFGuORD9ked8AF2qZ5JRjMfF2HDIV1PQ7i6jJEG0RyIh2oZRPJz2IfAWBVeG9SKeRjT/Cmv9NUvtD3E7Wy20QTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD99WeFNnEt8Zx9/zhrRI4PgBC7eJ6VViOQl543vpVmZuQ6]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   transporter-topdeal:
     servername: www.transporter-topdeal.de
     serveraliases:
index d23404be484dd408f5851bd514bc183d7d8368cf..009e2ad6126a5c187426b5f86e492d8d8d0c3f64 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
+infra::role: base
+infra::additional_classes:
+  - infra::profile::ruby_passenger
   - git
 
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
 
 accounts::users:
index 1253245db89faa869bc870ea0250a62f84529c19..a2b82688ffbe0833e44d947e57bf6aeff88d433c 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArGYK0LRrz3nqOooYUmu3cLc5+rgCduM1sNTZBcysjD9jMTAHHpbJApjgS5TOO472jXF2pgsfnwCimVgkuFwyKuxcdoy1Rs+7YPDMi+iBFTspO3TyGxhp8n3RdNS7p/K32lzCS3qqrliJ1q8mnfKIikMZuMkIGC+tD2wLUoNpVAGd4n4e4/ndWR8X0ZuMbiHy+uAwSaVvZTovuN8HJ/lcww9kxQhnrtl7KsGaFMyErCD7p5wa990L+pXbCkwlgRgmJ7NowqHGNPvvB7Eeq8w7DDHfptGauQJT8dduN6B8kDZ3szCvnaglS5w9hxwNZbypqm0+vP5oms/2ux2P5Ig+rDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAnMAhvf4tZTqApU18ZoUzmgBBquHrD/HyptYbHok0s8jmJ]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   tratop:
     servername: stage-web-transporter-topleasing-de.pixelpark.net
     serveraliases:
index 3d8ef86fa17d847f0efea6885625a567211f83df..5e504f576e49bae25b9b52dc2e2decf65a5271ee 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtKY1KaXrdgMCvGc8cXHOJceQ4U0faYp5WV74AVUzMdEPm5O9HapFCya5/uYZsQuruEoCmM1PFuJidw6redDy2qztiHJBmchFMVJxii7pgGcmbeSR2S42r0k0mOKkcEHeqc2TFSFJnWSQuXeya+rx7AWj8Yyu3TBXvM09PkuE4t19ZDqlMeaf/GeglP4TXRc6ersv3remPD/hZj4oIytQlJXgrJ3c8srZKGhd9hoLeJ6+ehIXCxN9LUI2Cil+ApAgARNTL/8v89CYUNIkQ4nkfzxLLbdu0LMSzRB9QYABBXiu76gJqHibjuZaWyC3cl1Axw5BIt6gk3HKNceR40NqjTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDepFSpd+OyzWkiNZQDT2yigBB9IosPliKZt2I7ayZSqfS7]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   tratop:
     servername: web-transporter-topleasing-de.pixelpark.net
     serveraliases:
index e422f54c63d89e1525e1aaaf2413279e2fae8b8c..0d19378f9b5e7ae343b1b8fccf824eb7627ee9c3 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
 
 
 apache::default_vhost: false
index cd0bfd92fc3b0adf4b36035ee1420c830b7ae736..bd1e3e91485a9d72ec530aad5e2a16cd928868e8 100644 (file)
@@ -1,15 +1,15 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtffiAkyq7c4rNXfDeSO1UQI9SfiIyhkQn4N/R8PR4ttqnLdSgDHISAjA0LpcBuNU94aU40SmcI9DZ5En5ik1kgnxRkbVJo5a1hXdfcYAPnFae9QcoU6v85m4YVoLBCD/LxKE/Jri9AMvAbf/hJ+Akjzd5vr+LLLwdalUBHj9kR2vWiQG0U7y5dgfHBzqgLb6RoS/SXm4tL6UnSspEBHSfvV++ANzwmcXgR2a1NjP2349v29BvkIkZlT/FA675NFv/pbQJ2v9wvUXKepeW1VoUuMuprz859YQrkH/J0U3OlxDaDHd+FlvwYYLeJvotN1QHYZi5BR4W2I5nmOSGxsb+DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDVFrwqVCERMxYmjk4XM32YgCBAMqss1Tqk9RHpBbkVd1qzk2DsG2R0G8p9f37Ql0ENJA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmu/pT/A0mCTwhw4tJex2Jh+sQX65dojzrk2vYlDz2UYGkUqBCm+VkSs1LwDYu8uPflQp6WRwO0pFGZ9xxqgw0hLM2jBUu6KQnarTTo7jdYcN8XQh99zy2C6Xk0rqrsyE9GX88HQyd1lOzTtkkKpNwKgmm8TqAUXWhn1gelLndYPjCnTDLpfav1hTOMexRl+POOhSTeAeEckP5OtLxykODbGLArTpC9F8Q9NXqnyoowBke848COabW1imA08K6R8x/qHk6bOYfpWLA3ky0VLanIZW8FMFGRnVqWBotc3q6xStNRBkJmU+Y95AHY2pFLwhzePLbUhIzTdNeeOzbZSotTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD+2glx8qcfcigQl4Dpy8p/gCCIpzHErwtUT5S83GwZwauPcCPTq5K2D20SteeiVc1zTQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   training:
     user: training
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmi7S89ARBnUATFaIeGzCgLf5joB1iCW9BRFfuWM5AYIs69kWEoakEAjfYaQ+TE4/3Ncw+6op1QrZosSPcc/FF6AaWNSZ12Dk1syJSjikwyXlLWO+79pazM8TsYlm0fJXmIY71OgfeyanbDtgNxCpOu6CoT59mKcAiSa+Zeu3658aryulerfoPOChrYyrXRIQZVGMHDAnLMZnPyN8D0sLkgEYILwhELeX8ntNWbVKJ7tYkSBjTb+s+yhjDX3LR0LhZ5iLHoK0FEoPBw0PNHdha2cMDFJRYRStZqjqavBiXfvs0Htk+9Whbz4MxIysjLvuj+PsuUqJyA6ZkTwd4uTCejBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB497SpXjhnJ36aLinvRDyhgCBQIA5G0uwYr1VxIiUaj3dZvMkBQ3rfQ+naCGz3UaSlCQ==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhy14bHQP0sq5UYWclA58lhWhtGGrGup3L0SFkESSh41NEs26pDMAv9/i1vcSezMsS0OR9Bd7TbtzjP2WqwltUAZ0tLnHRYGA4RiL83IIW4sNTc1S0U6RSYcZ6DEEAX/5eF46iru+y+K17uCvi7GALPIlJQw3ngte0S5t4e2jFQFrPuBqpEvUY8Q6t2B41QBbBF9Jw1ZP7rdsKmqxR52jb6rP4eoDFHQxg+cCTLiuflP5GhFHa5OIsUYMx9jJxBUy8sk1gm6ZMov2mu8656Ko2i9fQfob74bZ/Gdxcu10dLZd0lW3CT1xDg2HUMpEDN9ZDFShPhpGG704xhApHfZqyTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDCAlqLbAA0Wy6NNPE9aNhtgBB/hJ+Vif8ON+oPFiNBsf/v]
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   transporter-training:
     ip: 77.74.234.81
     site_path: '/var/www/transporter-training'
index f885e1dd745bc13c710c1854062efb883c2a9437..83eb69a0e2bcfb101dc76a96884c9cbb8cb9602e 100644 (file)
@@ -1,12 +1,12 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmxKW7R4/cya6wrYMU4nJh3ihUX6QCp2Eng+P3Rr1kA4Uv5yvn4q/KUGgsfrhvtOyv8LMnrTYOgHM1tY3JAlWWiQcNMjd6qH9/qhjInDdMt14aRT9xyTH9d9I0LiO0YGMto1JdnAe9To3SYoY8p48zOUKU/3JWvSbJ09xqL+d/zqnm1eJ/xzbvWBWcl6Oh4bODcye18hMd22a8x37ETZBO7puSpYsOJ35g4Uz4BuUSTQjumnTHFE2U79AdZlqVjcuCOtnoijnc0mo2XITlpyF64rhAVcHLHJHGqzZwJiHZ1o1bGqqjSLMTXvmIB3bUAcxO3yLxakxTmPFPpFyFbxVoDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBk/7UicEDyMxrWpziXNYTRgCCU4hhg2RFWwWmdvb9MFNA+4q7myPGN7vd75e9An988Mw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZMPM6UdKliEIMFHIjOE4cvwUYeNL/+izGVOVzvZI5c8w/1G69CBh7UEIDq988fmGlzLPZD+WiVWennHEYQl7tLbpccJHEypiQNImsXkvDrOclKjnBREMWLQEcQC7Vg4iKXoIgJhfAfI5GjQdrhAYOjEseOTyyEQBtTcOqp7hnC41chSOOESdUwgI0CzQhFcierQr0plwOnlDJLyuuyySQQNhgNSo9aYkB766oEKfT1HSlCCQGQZ/7ziEEp6WK4suRGrXuH4PtnZL91XO3wubKQgEct3K4nkZo+wQv8VVCyMjSuUP5J6owZf/JVA2nnhpt/I1wwVnyAEwxxcByk87nDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDRTsqofJImpY1GXnhhMxUGgCD2EkFD+kceQns49VUouy4h4QMwKi8xg/n/wMeeyxGt9g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   training:
     user: training
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiOTRskD2KE0FL9HGCBkwVIAcurvzYsMR//tepp3/+MQkhcjRZeoTlD9f9vG+06+zUb17vS+d9//FaOGj4QUxYcWt0i+Td5Vl9tij/4lBTcXkCAeQqeYOcnsi1UmrXXp5nzPisl1J1lRgAbBM5/nVSe82wOr5XZtMXOh5Dr7zTdJZ8+MxPMAVcmLlX3mZrNy7vRWYljS3civXkC8s10CpYLLNDnwozWEKeRRVRpdn022EYB8mjw826RzxPtFjoH8iwmi7iz22q4Btt4noRuDy3uZoqsx0RvmKNcaRi/fzNy+ceeAzB12jChJSiU6QAKe6qetqY6gpjXcvhKWy8Q4MyTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDjc+7cCzSllZ98tKmHgMzngCBf4AfX+yuMzkBFi3RdGIakS8k7sLl4bNcpko+LpqFBnw==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   transporter-training:
     ip: 77.74.234.76
     site_path: '/var/www/transporter-training'
index d67319b3aa55c2c888bbac2bb987527eb1e99752..42be028cff8a8da69b887ea706bdee63e6c9347c 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 repo::remi_php70: true
 apache::mpm_module: event
index 809937d4efb0fefb33e0310817652fec1924b9eb..7314271faeb41bd7269dc2940ef326990db839ea 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   andreas.pinto-koehler:
@@ -7,23 +7,23 @@ accounts::users:
     sudo: true
     group: "apache"
 
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::mysql_server
   - apache::mod::headers
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlXwfJ+/QRfIqb4qnvoZ+e+aAhjynrFS9UPfd6RKn8XFA8ykoQ3PGPlg71OK2RZ60cY7NKUt6OaD0kdOnoLN3YwaDkKpIRgOZQD7a7yvjkl+E+jPYLbqLna036rY4sEWseBjXgENqXoP8a3QHZt/eIkn/QWnyxGUVSSOnK0WJTeBDaRm2Lc+BNaIJMxIdQ6RHTR537jxC6ZD7UN8SR44tyJrTc6E7foaHipqZkCLydcB82fjuYlwgAO6lXcyKzJhNlDYdtwyIF1A2fcP5AtfH5iKnSuqYMiFMtfZeZ6NiJOsl8EATTP0NEImi5TneRqAEmOWnH7HVRsvLiQe1TmmiXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA7f3h4+q6iUBpkE/zMfzTDgCBejDxb0+NksYcDxnsAsL2o3UifQEpXJGgfAe2uEen0LQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgU7Gl/vjpl5nKL7G/Ep3QW+/UpDRbytfVNFmAnsZ6/nv64sOKyAWxzq1GCb2JchzyqxdvNSx8dwmStT5P8FDXAocN3T2zdskVDhDnGe/DGCVFwpwQ0SHgUZiJNjgKQ1eOwzvqfsI8RdFqxCEKSMFg/4ixJMw660FSnjsQo7SKhHC95n6hcogQTIRXDIPFa5O8D44e6YwLu9vAiMUss7nGenpvS7EbfsUL9fOMR+7hwHbw4Zv+sYD0RONBsHTl4iBBgfHiE/7IFLLIKpY2FuJ5hLXDK264c5FAb/G4I6aZBRHBR8JZ0AZPGRmOkvTxxx95Y9O9mjeyeaPWxjYnosdEzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBArk9dieR7sapVSlhSMQa8ZgCAxmm9tzddFNFlqP4NXBZgjRCwvOnW8vzKsJ+NRtLyf7w==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   trapo:
     user: trapo
     password: V6G5tRe3otMA
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: vtqEKYjU2vip
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   trapo:
     site_path: '/var/www/trapo-top10/drupal/web'
     servername: dev-www-trapo-top10-mercedes-benz-de.pixelpark.net
index ce1e6a781c5b0363f5b9ad339b13c07e9ddb1752..522bada8108f115b4f84c7b569347b9d7f21e5ee 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::drupal
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::drupal
   - apache::mod::headers
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUA3uyfFKVtb0AwsKIZehubW63zfeMjt5dsQPeBfHeYmbca3+aiG9nM9elbPDDo+NSz8ud6w8nRQkdnxqbCV/gLVxPW58gxY18TrzyxhKjVVQgQt1bcHIlqNeSGG0v3c0S8Ii3Kt7MmEmx3UOYiImh9idc4pQzctFhjTXErItdcX+CA/NIAiafcapfUK4EA65qO6l9FFASNcYFui0dmpXhxvaGXs+2FD10uG2/ENfLMKjlliBYrNU7MS97hc3i/jASmCE/1MqiKKjM8xLoCsalavan4k/vkNvNjbyTatUon/X2KfqRBsMPKX0p1qLcsoT5uyaUrYXk96ebrFWDZmTCjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAJ7tmKMBiNMS5oDrWZmRhDgBDz1FqSCXQx3Yyrb4RvWnib]
 
@@ -31,12 +31,12 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   trapo:
     user: trapo
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYgx0+AIpj1Uc6kpIv6pg6xkCnig1lFXNZWn4omaCV1xZrxJJcGiay3h1ETybuwBfLFG4U2B8ebJ78hl5RAXxyEElcwEH+XlS6SvHNp+8F+Mx3wkIzjmZngWvQuqI4NloLyi9NylsCwxeYAiUGmlm4Ksv7wXAHGzQVC39J44mtr3yBQSak0MOQ6RTbSy+2yYwlqmjczedXXgfOIA6JyROREnyvDWVQReMlTI6kFBsj8cqWXFNwzRtmQvSdPjQkIwwbGEGwhMcz//oyviqg4ZX5GSumzPeU1OcFmsgOvtj9qVeiD8l6OAA1Q7BOBFB4fkI7ehYrJIwfHfyg/dgxBg5QTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAdguBeupHN3woQQg4+EVYygCCmptr6yGBuMtb1b8rqhTJoHKd2BXbML0TM/53REQEbXQ==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   trapo:
     site_path: '/var/www/trapo-top10/drupal/web'
     servername: int-www01-trapo-top10-mercedes-benz-de.pixelpark.net
index 1dfda0c7b95fffc97d68aaa2892129b6eee7b7c8..aa799e5cbfa545bf6530e1bc0c0b57779925379a 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::drupal
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::drupal
   - apache::mod::headers
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUA3uyfFKVtb0AwsKIZehubW63zfeMjt5dsQPeBfHeYmbca3+aiG9nM9elbPDDo+NSz8ud6w8nRQkdnxqbCV/gLVxPW58gxY18TrzyxhKjVVQgQt1bcHIlqNeSGG0v3c0S8Ii3Kt7MmEmx3UOYiImh9idc4pQzctFhjTXErItdcX+CA/NIAiafcapfUK4EA65qO6l9FFASNcYFui0dmpXhxvaGXs+2FD10uG2/ENfLMKjlliBYrNU7MS97hc3i/jASmCE/1MqiKKjM8xLoCsalavan4k/vkNvNjbyTatUon/X2KfqRBsMPKX0p1qLcsoT5uyaUrYXk96ebrFWDZmTCjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAJ7tmKMBiNMS5oDrWZmRhDgBDz1FqSCXQx3Yyrb4RvWnib]
 
@@ -31,12 +31,12 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   trapo:
     user: trapo
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYgx0+AIpj1Uc6kpIv6pg6xkCnig1lFXNZWn4omaCV1xZrxJJcGiay3h1ETybuwBfLFG4U2B8ebJ78hl5RAXxyEElcwEH+XlS6SvHNp+8F+Mx3wkIzjmZngWvQuqI4NloLyi9NylsCwxeYAiUGmlm4Ksv7wXAHGzQVC39J44mtr3yBQSak0MOQ6RTbSy+2yYwlqmjczedXXgfOIA6JyROREnyvDWVQReMlTI6kFBsj8cqWXFNwzRtmQvSdPjQkIwwbGEGwhMcz//oyviqg4ZX5GSumzPeU1OcFmsgOvtj9qVeiD8l6OAA1Q7BOBFB4fkI7ehYrJIwfHfyg/dgxBg5QTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAdguBeupHN3woQQg4+EVYygCCmptr6yGBuMtb1b8rqhTJoHKd2BXbML0TM/53REQEbXQ==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   trapo:
     site_path: '/var/www/trapo-top10/drupal/web'
     servername: int-www02-trapo-top10-mercedes-benz-de.pixelpark.net
index 973192479ab8dee6b85fc2ca42a476a110bad1f8..8311704754ee466224fa97938cb1939818b9f16d 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::drupal
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::drupal
   - apache::mod::headers
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp3mxg9tdFCDhIGNE0f/n4e/jKWbOkHfvtUVMgZ/no3piygMV2Jh3CupZP0iqOxL2AIgALp1Sp0mViAUwumjkNl4tCRRuYdMd8muLpRAAhkDasBWSS55fFqEIkOhSnQQwUU1GrOTtxczgAeFD5AAYISr0uyOmL9xYOzfLGglK2aotbBGZC6FAqiO1pjj5c8jX17lI4kvsVbUj9Gs9sdXTBRvcRfWDHRFLFW+UBfbuq/vgigASkfgx6Lbd7h1I7UiHKfyOd3HHh7F+vj926epNJzd0DbNFopD8cYcjcaUZFDdAoScr7v4r4M2+447wwI0F6KEfIX9prdHcpBRpav+K8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA2tR2+Oh1kJwag2ADDqPkcgBBv5MfH1plrRihKmB5ggZzO]
 
@@ -31,12 +31,12 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   trapo:
     user: trapo
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQO1ZVvRTaMSqV1dq9KLo8lzGYVYwucbTtDAoUfZgowYk26iZhaCvbhwayEDab13cG16R3l4y0OhihdZEY6MqdHAS+ttysWVY5hJe1ovNbF/++NrwlXZw+6SHtMM/EhntKvYYmqsTz9Y4DvF2G0Bp/cOimZmGhJMzf9TS8XAHaQF1SKaLu1HLr0GtHGmOZx6ZD5mRETHg/i7KGC/kWbQRrT4COEPYdGS54g1rCZIFlcDgtJQJ5xw9Ys6GGCmJW/9iZ+5QjGVomy7+I6DxupaFsf56b9kXmcqnVReTmZQIqFZSyTxp4feqz4ss6kaIhz7LFYcai16bDGmqphdT3jaL7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCmkQxs9G+s3NZek0QsYFgCgCAUaE1nza0pqGwD8uPbHsoi1tmWmaA4kJWY/L2BYvNCMA==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   trapo:
     site_path: '/var/www/trapo-top10/web'
     servername: www01-trapo-top10-mercedes-benz-de.pixelpark.net
index cd7b5b396a9f923e43179774e4a7aa0cd059c04e..7b5ba1e9d3cda782c9ac0a1affc42fafcfb7c8b6 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::drupal
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::drupal
   - apache::mod::headers
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp3mxg9tdFCDhIGNE0f/n4e/jKWbOkHfvtUVMgZ/no3piygMV2Jh3CupZP0iqOxL2AIgALp1Sp0mViAUwumjkNl4tCRRuYdMd8muLpRAAhkDasBWSS55fFqEIkOhSnQQwUU1GrOTtxczgAeFD5AAYISr0uyOmL9xYOzfLGglK2aotbBGZC6FAqiO1pjj5c8jX17lI4kvsVbUj9Gs9sdXTBRvcRfWDHRFLFW+UBfbuq/vgigASkfgx6Lbd7h1I7UiHKfyOd3HHh7F+vj926epNJzd0DbNFopD8cYcjcaUZFDdAoScr7v4r4M2+447wwI0F6KEfIX9prdHcpBRpav+K8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA2tR2+Oh1kJwag2ADDqPkcgBBv5MfH1plrRihKmB5ggZzO]
 
@@ -31,12 +31,12 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   trapo:
     user: trapo
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQO1ZVvRTaMSqV1dq9KLo8lzGYVYwucbTtDAoUfZgowYk26iZhaCvbhwayEDab13cG16R3l4y0OhihdZEY6MqdHAS+ttysWVY5hJe1ovNbF/++NrwlXZw+6SHtMM/EhntKvYYmqsTz9Y4DvF2G0Bp/cOimZmGhJMzf9TS8XAHaQF1SKaLu1HLr0GtHGmOZx6ZD5mRETHg/i7KGC/kWbQRrT4COEPYdGS54g1rCZIFlcDgtJQJ5xw9Ys6GGCmJW/9iZ+5QjGVomy7+I6DxupaFsf56b9kXmcqnVReTmZQIqFZSyTxp4feqz4ss6kaIhz7LFYcai16bDGmqphdT3jaL7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCmkQxs9G+s3NZek0QsYFgCgCAUaE1nza0pqGwD8uPbHsoi1tmWmaA4kJWY/L2BYvNCMA==]
 
-site::profile::drupal::projects:
+infra::profile::drupal::projects:
   trapo:
     site_path: '/var/www/trapo-top10/web'
     servername: www02-trapo-top10-mercedes-benz-de.pixelpark.net
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index fc6c7ac5e510822792d87efff97e50a0df03ef11..ad1db7edefb7a7a3371f3b78a6b64cd3915367df 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
@@ -10,7 +10,7 @@ mysql::server::override_options:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACqntXBpJsjoXINeIPuZfETvU5RLLqCUCLkWXddHtNptAO1BAUIp846T1WuRHDTiEhoZSSNZy9B8GInpzkz/q5FH9R+NrLGkwaN0aonvkCFGb4H007hSe1MuvXmTOYSmBinTH5uu6sxZCP4vxAC/vCFCKVXrz5sgx3KEylYDdAAHryz743yy93CBF+SkuAH4vqV5JJlRrxLosHaBe3BFZHjp+r/uKy25NgK332lbV0pTRqbSzrBBxllCE64fTkp00WOCG6tcPUXH1rpt/3F45tEoyM61s9nb/aMZDC9m+agBssgcuBhPWc0y9K/UxD50K2Ey55gRffo7aHymYfZN4lDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCFAbDFES5ZARfmRlySUBrsgCAVe0jjFFrLKfmKWGwcDMk/y9o7+24as5LIKxuJyljHgQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbTC53kLi/RjinTVslDEoPEYbJjuZ1siFqgXQikwQJpgtmgBixz0+QQwSRThyf0kj2JRzPxbsrA103vzqJzi6mQjGDF9XG5P6cVuaVM/7Pepw9a23OXcSSaxAnXAiJUjZ22wjN888t/kzkrVF5WCOAQETtumK1xhLHudo/AuMLohNcjXnUxJ44zxxEnzsy6/8f4oO9LynBuXvp6RpuiOvWotGASxygU0ujFAzUnlecMeSPOEGjT7h9QwsVd8zV8LHuqUlGzcWJlUDwM9l+oPsOHj4cUoWWq04rqwz01mNIp+0bWkJtLVvhvN7pJrGeUHvWJCdl+o1yGBBFm8VHXWLOzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBenYihmhHSHyjmLcOtxBPTgCBv3DoGlVbL9F9cYBe+mwRzEELtHJCgTAm8bQmrWQQYPA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   quiz_onlinestore:
     user: quiz_onlinestore
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbm5B/JduKG6DD6ego1qkczDIvFU8nnMIbKqHvr8cWrHvUd/JU50BeMRhzbPWtFEqAsxO1cBkqwrB5Poj+d292Qno4pDfkD+scnNTDsOf/DMspOuOwx+wa9I1NM2UlX9ePzxxHCLE6tkDRlGMM0fO7u5c3zeZ/aMiKvPVZ+9yWJ3qzgu1fDK9b/WCdilxAHPMTYeDOEEP4++5QbI8Yyfz0evK4maL29uVPdknD2B8elMNkcKjkYGxqeW77fAc2V27HNkE4+eSYHy6T96AtlJ21WfO3UBbKGe3nPI4OwP3cwuG5q4PzCeI0Wfc2fFQPmw9Lhn0RcuvoDs/V621Br7TzjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDR7EiNLCOfpb/sb7y9UWBrgCCYN9pwLqKiD100KD6RRZKRngcjL6oesacBJSB/UNKhYw==]
index 24507a11a1e65bb29c2f4209115758556c1edd63..5d0e924909406743bc51c0ac215adc3a61340644 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
@@ -10,7 +10,7 @@ mysql::server::override_options:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAC5A54lqkf71XCSTldDiNE2v7wKrz2hZxtskrTcTCgf2mPHRD8rvccPMdeB/mv6ZhX1ksxR+pEMfvcczVYVTH6ofFE+8vOTfFrASYfbejMSHD1rLwOfgwhZcc5uJ8cDFmgbx5+fvJ5YnrMEgqdfnjx0BZadif9iMo3CVWaWx+1zTD0o5+67JmGhe0dRXrhDNJpywqFgEoeMwmdmKhpu59fRWooW4PbEL3lq5oSsgCN1Funw3yJ9l/eH1mFbNkkMhHn/FoJFSMsOLKjMTBcNdwqs+l+4pBCGxaLfUtjUKfv0l7r4R6Ep7S+2RiXs7GgdMcksbqf7yHc7ozl8vlpNgwVTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCY/kJ46/JqZRI3wqON2ZPcgCDsGQRkbgWqXS78b+Cq3d+UBD6fSIBnUbCRG4vReY3YRg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAaXQ0FQWeRsPaiWBwA8mPiGlpnKUmE8s8c8RIBfbzb5EUi2uBrULPupogKfzqQOhdWdcmTnMie54SRYiBKbZYu93MiTH8hFl+RPQbwP6AVrnRAA4Myi//61uBPfqIMuUYOaUEsbTRVGJnLMCUvcidplgAbVCuviC51OzN1Cx6hHPzC1/CMvol5xrjKkQdM8csCqQVyLTMZ7bvJY2O5VkECsaodRr9oz/1FcrYp+5G2ZqZPsiY3acvV2T3Dxi68lPCrBH0nu+w2pC3xAf4A5cfFCA5Ah7S3gd7lOAEDTt3L1SQITI+LsttEx9r9nTquqcsWLki7ShCJ3Gwv16tlK4ggzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAxOEdvy8QIfWOyW+hAhpOkgCBseG8Tk2dDu7g5jcClq5ZhAlbTuEQPKn1wyHYLxlKHEw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   quiz_onlinestore:
     user: quiz_onlinestore
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsfwlv7cbomSNgPj+eTfM/RtwziYJR0h5aXwus+Em9gbaGAaJIbZtiC8ehk6KOvVuJobWnr7bm0SrD2ir86tFDeGSaCcVL1pb30H7bHf7IzMjklmMFmFkg3n4rahShEqsW52IYq9be4hIQ7j+QPa8RqjOTrvhk+K2cI9YW49lGEImhac3eh7ax1LmwP3dX5KSD3sivu+XV5DKqQ5UD1LdfSn+qkDvTNy2Yjsk9A/h2XsdJW3ZxoF48DCxoGpj+14JEcsR2SepsI1LYp+ZNtDCmHDeB7BRqMZhBPsVRnLK2HPtvlowzlMxrfc6xbfbz97Z/5sT6MMCcAIBpgP0K+WZvzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDd7EEc5s9E056B5uYgknO+gCB8nwh6BjX2zAAGGgOgCqwrqV+JmiaGwIDjlGVW6j7ANg==]
index 277afa21acb54dba69846b782045533ab25e295b..57384fe031bc696c37ac7dc0f5384863bf3a68fc 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
-  - site::profile::apache
+  - infra::profile::apache
   - apache::mod::proxy_ajp
 
 mongodb::globals::manage_package_repo: true
@@ -12,7 +12,7 @@ mongodb::globals::bind_ip: 0.0.0.0
 mongodb::globals::repo_location: 'https://repo.pixelpark.com/Linux/yum/mongodb/7/RPMS/'
 mongodb::server::auth: false
 mongodb::server::dbpath: '/srv/mongodb'
-site::profile::mongodb_server::databases:
+infra::profile::mongodb_server::databases:
   admin:
     user: admin
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXdXXutfRMi7Z+1EBgGqWxVhL587drCFJfe//tvU34LdPRWdoe9SfzILYSnvh6twpPd345ICTpzooNczDC/ChLB92dqSJ6ijV0tNvQ7ry3ZrA5WyAfKbh+aALxT4hOU66KDp+FkcdLMhTpFj5WFk8ObX1q2gulqF8Zqzeg31FSH557T7w2535laB+N/13iS8+WxBn1YNXqL5lprdNBHJyQQrH51sjFR9st55o6MP0GRZ9f5R5P7vpyDKv3GxZ/OUef8f1lFAhVEfcshU9a3cGIA24u+gL7Cj5zIu1ASPXH4HzKKFyrVlui2vVBhGRNTP5CdEzTmy9xNDHYyS7VVRIzTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0vmIf8ns3aoxR82FsOUQdgCC/j3i2aYCTzRDAM4EQIMZ4i2596IX/6CXrczJQkXd1/g==]
@@ -31,7 +31,7 @@ accounts::users:
 apache::default_vhost: false
 
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   odt.daimler.com:
     docroot: /srv/www/odt.daimler.com
     servername: odt.daimler.com
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 5ec4453a1232929a16f27f844a3a699b32cca7fc..4b626eab648a2732f075c6b3c56d8356478397ba 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: symfony
-site::additional_classes:
+infra::role: symfony
+infra::additional_classes:
   - logstash
   - apache::mod::headers
 
@@ -11,7 +11,7 @@ accounts::users:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkUJD2Lv6byCT/Gs0mvOIBUurzQU47XFPu96IVARyTyJKCSncWgT+71Nte2xh/RfajAS2vEg0hjtsdn7zYGVgSXqCb5skMw3p3a3mWPjkFszoSCWU6bdkCGIL/Dq0G8wkjW5Ad4LjZXdCcxsQjVCQZ4ihu7yjt5YzI9UpIdoyJjG+KSXklgasWvdgNbbNir+oWFlIV+raLC74KGu8Os727KdVr8og20mKm2AnSFBZNEu6FYKyOIMWcsP1SKc1mG+knzoPi/repPhT7hF5SAqKRIrrePN8hQAGc8pA2xSkKaJoDFKYk5iV42TotbuUhL4VWiAGlBw0ozJ5T4t2En8QNzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAN3af+i5YUot0d5Mlm/S2sgCC8J63In2iTmmT/w0M2SeljHqITyTaJQwMNAx9TSovnlQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHolWRCvQDVK8y/3d26RgA9NpyQxxHgdolrsm3UnrqP7GKeBoIrYAFx8KZEmzOKPu2NHUVJbpgM6KrrIP1oIlZRjH27cT6GzBXGm2hvQPqmxCiUpjxJFt+9icN9ZT8M/uBeE17oTBZSHQ09DtP8wbdm3MgHmVjDOZBFPOxUQQZL1qiJEzgswb/gYTq8X8hXAofDM6s4BOEKb2gFXEqZHQE7Hpm7GW+RK3j1b/Ol9LZQE+VFJV/XeuHpGRLl6JCnAKMW9awP2uVk5xWvfBhvFyft8LlprE0AluPmma/vYD26KAAlqaluTu5Lo5YCX7PtgQrSV8TcnjcmKLEYS0s1p34zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6g3J5YU9P6hc2xufpNim0gCDUzDHDE+Rexy22f2aXoYsR5D21sX6JmSo7l2ztzL8O1w==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   svk:
     user: svk
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAf+y9tkD77NvlsDDQqP/ZNHPJ0wuDHRqhvXRoHDwEYSQ9uHwYYvPmoToPy47PWSHcIqR//InFvKTRKSteX2dSNE+GDeKsTMIYBYvEGgMd1TLl2TfhaNTRTIbHmJZU8pLqXkaf21Z9Xwu8B/ABVKPqGqgqmR3PBTTmXM7BvKw6DXLB00fah6oRa4xWpgOvrpYpTd4dj1gEHZNxxiqQ0BmJGKe9hXqI6dy+m6Z1yCMzIaOI/w0JusgXEj1RikPWbUKqkpaWvXO0VB9jKyvyNgHGfVTjGaTCklN+YbO1BmpumbxTxwvSmlaYSqVVlugqUXUpyef3Ws4N8/geUzcN/e/fkzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAilXqhbq7LkCTlga2RdJIBgCAWbAFwozlu6M4azppmo5HCJGm/TZpgf5TED1OrGdwZwQ==]
@@ -21,7 +21,7 @@ repo::remi_php55: true
 apache::mpm_module: event
 apache::default_vhost: false
 
-site::profile::symfony::projects:
+infra::profile::symfony::projects:
   'servicevorteilskarte':
     servername: servicevorteilskarte-mercedes-benz-de.pixelpark.net
     group: pixel
index 4f157fb0127a040525bb71bebca018d020674c61..f20ba4ba12f0b99452bc56de425236c6759a14f7 100644 (file)
@@ -4,19 +4,19 @@ accounts::users:
     apply: true
     sudo: false
 
-site::role: symfony
-site::additional_classes:
+infra::role: symfony
+infra::additional_classes:
   - logstash
 
 repo::remi_php55: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWHr+Eod/FGe2aZaBs1sCdf0RgXV5a3de8EI0y6bPROV4rReRXwYObAzCAXU4K/KzyaVDauNFmME/Tu719kXNqOSVxPqsAWeS5pyQ6N1hQZF59RHffxrTqELWNHzD08VemlK72xXQAOyisULVVYojgi4Qtgm5EBm0cA6xa0GM8SA3jA+b4mnruNfLtUjvdFzUupsF3S97oDg/lmuLRWPDyu8nyt7GiWltKo0hEMEfU0nEnLmDs2kJ/w2fxWJ5257eoSP4mVAE4DoH0Q3sY+y9T57g36QJmAZwcz42Ul8L9iLwg7COE/m/tVT+cgM5Szwj4Tg+2rObHNBZGWhErTR6sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCI8c1Cs5X3hETlZ7JIJFA0gCAhnIjzTB/XHj1A2hGt4b9CztPpF1JqrFJQsZQFSyCIsw==]
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJHBE+9ul5HKeZX/tjjicnKrCzWA1bKQVkeP3QR6nOeyWiiWc9OcDPgHvAF/fGLdCiqMetdApQgwbVKVQbY3uJBK9OAFZXM9BSm1tOznQ14BgBGaU65aUw4XGd4gZM7ieft473IQOkQv3b3qAJC7DC3rcyLBZSLqRSpgkwGny/Z0sCGRazQZWrexVC6Kpby2hpoP6cpZyZTFGPost7ULiE37G9yMjhh6SPN7PlnlPApFnGnUIWSViLOJaUEnsgrhQpdwMe/t9zmLFsAL7CN2CkmzBd8++4sm7zkE6TdE6BI2zieM98reU9Bd8jrMjhmv1vuYpFD6HM+yi1uZHITGV8TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB5FESBGVB6tHCzwWe7TmdegCBqieDA68CS7pKZ3+KFEqvuB6ZfDAnoQk7rpY4Rz/wo+w==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAebEGMrmM3sS4H6pv7kuT8UIHhTEOBSGiD6RsyIn1VAaeBvKudkvpuwxohx58cT1Crlu4TASOGNA3yDkh7uqaSOSRc1xkvmVGcU7frtaMIVyEcmbSzp7a/cm661e0VEDXSWmWTR0nsea6MH4351D86FR5ldNHaPY1iZTV/nDVdh5ay0t9jZZ6JJv/+8bLucy1cDEVTtfN0+aClgnazUNKNKKpu6/oQTVyJ6G/lLPsvonpw97zriYCCPiY+ZNUVaoetfqCFhQEIJjlCjhdg3FebHJR7acG51JYAdYYk467HcSRPk3lO+cbSebi/Movgn/wOB1FFnu9uIdKcbCXj+hQTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCChMM+wO2alYOentAy0szlgCALqtaYpSDx+lAUvpOktbgRjoMwE3BpkUlxRQ3/lPGqxQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   svk:
     user: svk
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAV6JPyBZGxsapqIyAolQ19On8500q5AwbMTEtUTs+TFUvOk+mpPWNND9q6PxRN2cImwqzTt7X+WPcnvuqdjxEtKmoB3FelzLm5DJMmMAuhPy2N7lJcfs3a6NBi9zxoshNoqVG23qMJ8TgKq4UZHncL12hgj+d7KmavJ6PuJzFVJmEI+/yaCOcw1vklUD35VainLLWtpFdc2aquhMn0SQDtw1SqskAaieKdh9r3Bp7HLFYyjZNznW9czFM0ejJnPD8AdMM1Xsvfldb6yZlO1EJUE0ersk7sU7mufZsaEHfZeubGFvsmQ3K6p+5ZX5YSD10CB3iKYmEgahYcfPSbrjyHTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDRt0zgkJruNQ8lxaYZ/U9UgCBin26TiINwsWswMdKe0Tj4d0+yRfw6Wp3bfCFgMirY8Q==]
@@ -24,7 +24,7 @@ site::profile::mysql_server::databases:
 apache::mpm_module: event
 apache::default_vhost: false
 
-site::profile::symfony::projects:
+infra::profile::symfony::projects:
   'servicevorteilskarte':
     servername: stage-servicevorteilskarte-mercedes-benz-de.pixelpark.net
     group: pixel
index e96afde6d69d166a2b180c7ed13ee845dbbbc5b6..9c9612d0600cf92eac0e48f0339922de7fba94fa 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - nodejs
   - logstash
-  - site::profile::apache
+  - infra::profile::apache
 
 accounts::users:
   erik.wendt:
@@ -20,12 +20,12 @@ accounts::users:
 apache::default_vhost: false
 
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   prototyp:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmKczsli1+qJMcX5nAG6POnAG9/heSnbkMDdEImOtDarPrXMISm1JU1+bHn0KRQZr4R7juvrxbwnahX3h6wgFwIKDL3ghByJqzjuDlgP9PKmIGbe6O9wG0yiYWMqlP/YQ+rG6wdhbXP7CtQ6Cgn38nMLwoP0m9wF/bpMj7BkFer1cIJOWt98BpNw2y4sKB8W2iJQlAzppZDOERPbl2NrMkYEcXwxtZcJNSHrHRCIXLgG3/Qehq8n/eL4CSXvV8qlVg6FO16AcpTVzq2b1L2aUi9jRESQlM2dCzh3YI5mFqOrg//9pBp6FK0l5Jb53vx5EeIun/g+1jpXpSpFkoBuh8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBANPzHHNkJ8cZdF7zszKmNagBB1dMLOXE7DbetORag5zEtm]
   service-gipfel:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN5wssDIQjSOgK0PFbI6+JLOObSJlrbQPZDXlTWqQl62+idoxnG/sYqzXWZboaJ9vqxwpRbwyZM+xjUw8I4qdODuwDbyCmgjpKtf+2RUVBzp8Y+ebGgGntoGMILlJMIRee1oPuDW3itSrytdwSR30C67AttGm9KIj8YAB/YNIQf9rerTQap9RPNLK+PpBn3/GNuphpwn8B5De/bY9wZKWjaXJ3Rr6bLfrgx94MzP5uySDHnrZU67Ax5eEvgTlb8/3VAN3uJXgBVjpMmE92KjDBXZ6HHk3jCGASAhJUP7Cb49ad5C9biZJAEV8L9bz4QmjbxRXNRjL/wfd1DWS0RQ6RTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAHmw5BOy0AERrx5X0MjNvagCDssj48/yM9cIpTp6/HsWLBRypAC8amRA7ndLaHcxVcyQ==]
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   prototyp:
     docroot: /srv/www/prototyp
     servername: web01-prototyp-mbvd-de.pixelpark.net
index 6c66ccbdd6be5a217f87465c1693513aafb06aaf..b6e5b313e9fcb0f278d5b707cd36a467b4dcc024 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 accounts::users:
index 22d2d04e4a2a2ead31ca28b38047c5d13d3445a4..ddb4548270c6973542c0dd64924b00b391760a96 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   jenkins:
     apply: true
     groups: apache
 
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
 apache::mpm_module: event
 apache::default_vhost: false
index 92c6d27f9547bdb431c28f0970498fb1465c4f36..fbadaf560b3cbd69e371f40d31dd9d3ab147b71d 100644 (file)
@@ -27,7 +27,7 @@ accounts::users:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJW7gdWzihi3IBifY/NEeq0mLZDyckLbsSJhwH+riXuHHcZAL6BpstwEbYKuU6ir08AzmFTu7M1CmsTk4c3jgQktifC+GoTJGqhhvOy0pjjN1NjJxj1ux7Wp+6ui6k5e3AsjjYFBrGY7IwH4lMIwmshD/ZXox7E+SY9wD0KZUknYSQhOCZHycGqQUWlxdEcMFsJV6+qDxoV7a+6I3V2miC/1l1dmm5MNVwmCteZIHBfZZ5rmJfd4Xxjz8EZfumjdWe0agLvn69DvhtzUlFYQ+C97kKKtfvNemTBahAalyfCJeCOacRqM+z1bl+GgwfIPDJgM67hBcCvuVlAW2fUxVLjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB52MHD5Id+JNeaaKpCz3IvgCCludnljZ8sx0kLma1RQFCGWuRVgHhiBgjvEIPs7d2lhg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASMXgtPyAb9xm+0lV7aUPHQReuJgUy02YDY2impnD3TPSN3Y+0Cto5UJPUYIebwwbnEANLAomkkL9Re3a0G++N+Z+/XfT+mlLN1U4649/rIcUpr5lHssmiXGdYqGe/1Co3so/H0J05k4NuB9UQcvtsNETd/WpbwsR+6GWZZa/m/Sn7bGfoeLmYQlA5rLA7/yuiJh1dMoe2GaL56513EE/sJ3ms+2PJuC1tVFX8HsWLzZIzBOAwoakM9gXh7JgmbaHPnEZ9SBRbXuFbSNkrZ1m4JeAupLS8EZr5gnV3V/nStwKz3hXFegFNncKxY36mLiEFX7cOVGJGIOjVV6PfAar7zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCCw5ANqHWpe344+xFs98EKgCAHPkA1t9A2/K9rg4nuJjknjWeLQo30MSTDc5CPXlt+Cw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mcdonalds:
     user: mcdonalds
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKvbRBFpHJTMWm9tJYmRCj0aeXN+9YEbqNy5LJziduG8as5qHOPJ3mr+ZzVfPmmn1GoMONcmW0bIMbCYdCIhRJxtemvLRDke6rkXGPPTS/8mOG+BhbSYbBjJ7lgL0PSEiE9y5IrujNXwIr0pCKY0MF790ZJA/YJPqqm5Xf1vTLPpuLaGp5ctIDSqU2y+/Ah34K5R1Vv7AzJRC1pZCLrI8ga6fEhlN5LxcX7y3leOZM4z1DD7h/OGW/+huY6yoNrV45HRHOSrHoKwMWckljy9FNLSswC9DY4xdYzN32BKSnxiR6w7vzMywfhEsaku+ly7s2lsv6LPEFCEym+SlU2cCYjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMdbcYgb/QVuH1swknY0N0gCA/1m0y1ftqR2e0YkHbEYFQsQ3wKIYtu2+2jXhoDm0CXw==]
@@ -36,16 +36,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mcdonalds:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQ/AAQvxqyf+owNrZcByY6wZFgoHKNL7/KrvoIH+MxGmZXbA+1fvEd7FZLQIieb6bC8m4QweLBxc4Q1TOEAVwYInBjEwz0PCZCADQmFjvA4CcuznJDHSK3piZFrLwXRmkvW36unvC+vFkOxjFWrrTdOm8KIHnXnDcTuBeOc9UgJqqVXRm0ozKA75VL8FWqIjFClzsWpAPVBo/dgE20kp+jLkbWdvWwS8/pcqhpOQhesZdmiX07sDuhpazy3+Yds1YA5OoUNgTB742t+8H8DnNqhP2mMTE0XVf0fjp9F/ekNLKktAwXuXteeF2SenGFsPK9vODpEhKRCOA+1JzO5xZqzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMlHexAVXQo98bOHgbmgX8gBBIM2hYL1zuWp6PLyOuczW7]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mcdonalds:
     docroot: /var/www/mcdonalds
     servername: dev-www-mcdonalds-de.pixelpark.net # Realserver Name
index e8fe4fdc9ea6b5d60703ca860d45294a0b28fad3..e8082c6b57924a3cf0806766309e53837d6d934a 100644 (file)
@@ -27,7 +27,7 @@ accounts::users:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAt5OJ8CE4A0GFRf+/z8kFq3q4fPYebRtPdMQamsXI6i/DRLnzgKTUAwq0CSrpKrrBJF8xHeGVy9pfRR5uysrKUJB5mh3ZcJiUvM43FwXUOrabsmnSUD9MY8odhYDx2UhShm98g8eYA4cggOueSfBrYAU+YF/TBMBsNydjzB26L7kwjRuVq+vdzOHAoSrD3b41PIuROm8+PXrDsKygtQwNFZn3rpiKl8OuyffJrFd5IYHP5hUG8jsgiA0BifMVUb1MdCx+F+dtWhaF7ddLcwID3xFOrxCiD2Cl7lH1LLCIMKjlkL0MCG6m6kbP/rQtewYOd19OuwKsiTxfxUc60pyzATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAErbPei7s1OVs2RbeQPMKCgCCyLoUnd+0HGHKIdqVslLsIwPAcuocg8/5YNGGjvAPSFA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgSujBL8YOLVV9gPLZGabJnuHuAYIaaleljMLFjFl9eh8fhcXK/K2MmjVvaWUpByylLDccURjKCGOqu3vc03X2UU1zeTh4DkURcTcAv2yO28Ej1To4ud892Y2BCiDcBZRwD3E0hBeLKCe34yhNzzEUBbDLRmWqk6bL2fCfN66WsDtY0kTK01DdAdU+VT27VZ80Rtumo0dO8r0mb2X5WnIQjTc8ghcp0ZYEp6UbDhIwmfSeXmzLuMCQg09sJbwqMMg03Qq28l9I8au4sMpSZATHVxyB/FIdR1MUC9rKApFTn/BSzYh5rlDfJ5JPg//xp7p4jkEiNpTCyENET2iZXZOnTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQ5vZ/B5PH78oR1u77KKpjgCAitwmBXHyUbuHLBBuMqXxduAg3UjTVVAYYeTeqDGgd/A==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mcdonalds:
     user: mcdonalds
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAceNlZTXsB1vIOPA2NGEAuV5CVwCEC7UiP9pn55uzLsyIOv1xMpRQhbq03xTAZnOxPd7wAugt1PIG9wDVjRm33NFAIWpxbWHh2W1KakcWnFkLaJeWA7Gx8ekVtmqhTLiyGQe1HLtcLum345LymulZ1Zfw8na7MD2QpcdyEfXlHeHKPTDcplczF73koK1Vv0f3rY7lIo3wLWbycijp3IMsFoyBb8O8vV+7v6rcZgVlIklowP863eXcNBVV+o2cjAuNCfHjT2mApEfR7PWOCtPyjOjjae1yPpzNTkY1AVVV522JjQiNfcmCoq0hmxxdpMtM2GIA1lf0cMfBAj4j7xfRNjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDJ7vxFytpEnkgsNZwYKkOhgCB8UdFdevDwNT3ItqohFEIfzszp6r+HaiwX3R7C/i7K9Q==]
@@ -36,16 +36,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mcdonalds:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApiyYAgKBrlp8ki+vd7fRnKPia14fOhv+yao4mlrrYVFITk7hYnh/yGwkX+0uA8fhX6HdtQjQLz4m58oAl/yayNpUJuJJI7b5NTjgoR5SFYNV6ggtd8rVNVZlGOK4/XftR96u8gd4ourka01SFqcQch8c2lCPpjWzE/nIbNz171LwOfs6PyjUnh5Zf+rlbRjtFBwNOn/5M+5cb9ydowcpa+dIvB4C/emVzKRwKsz43skLCYuNERwlzfZPtusZY6PiUS8BVT6/ba0kPZ5KUvbUARkT23kldLFz/Il7iGwMkEPcq/VBPbyrYZnG6E2atvlvv8rIUMXSaNpdQqqqWs81LDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDTJkRWPRp0VddaY9/s3fy2gBC2U9OYpm5+flGz611xDZ8R]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mcdonalds:
     docroot: /var/www/mcdonalds
     servername: test-www-mcdonalds-de.pixelpark.net # Realserver Name
index 38b51c3d3adfb173298f4f85ae8be8c1c447d176..ebb4d9237da17039118c86cfa619061c683a186f 100644 (file)
@@ -21,7 +21,7 @@ accounts::users:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZLB8kYmF9OSQr1sn75iSZAIx4ZTOE5LL3zRtC8b+wFIG7kLaBdrBNIksxFOXHlySMWCZP33V7wJR7q1TJEehTf42YbIOnlOZScXMNUqUuElVlzCEGETPXpyM8Qv4gy2nst8E+L9dFc1GgCJV0HhRzdM832oYSKrH127TjB4PZ3myOBSU9P228HysKHPiE9Nz2rRWO5cI/f9KgP8yZjDJB2z1g+RxytdrIWQi4kDOjLGvuWcdxwo/NvydshzJyV2seYYIEQ1OC4Rwi3kAVW19g5d1yuDHOXxqozDb6FhBjhq2CbNmU1Rn/FFVVocUZbiQ+vUTLOBDjb/BAod/CzKs+zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAqbcl7f6c3CBIikkq3un4mgCALtv62YlgS3c3Gh3NFRVB/ukYcxnMG5T6Kp+fkodyW5A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhehuoCcQ54Ugib0akuOD2e/ZKW0Nv0xad8wZ9IRgJKJYceHghq6EX2QE9qJNK8JZJ8A+hbNwA3MoRwfWBARtU9PvJ3CU6hZYkVdByuY51h/DMp5sPrqf5SVJh7nnNGCCjymSsjtcmeNzZeaeK812iIySj4oQMH3/2fLcu9lmxYr1c+XXLNzonYdSmGqbnEGLOx/6eELB8gpOYuae8MnJKifflaoac96l+4DuwjoaTHmvI1U3iJKKAMWzuwd9370TtaZ8OheRAxIIb4fpGypLkh4Fugd+z5n2SIQiBYcJaWL5+7R4jT7l7olJlj/A06bR+shqdQ22NZBabGN45dTorTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDg3/NWjUIDP85s2+Hr+taygCDGjxRr88fXSsAfMo06Ereh7Wd+ulZbBd5mXVDbWVBmpg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   mcdonalds:
     user: mcdonalds
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhOYdtgFbfCKhzQkV+fibelyJKw6QOUqDmEAF7xZzYbvKWBuGGRBdJEghB2ZEXVYJE33RciF/nldBoJ67zW775t/BGC+SKkc91LmOjikGARHDeUIqxInCBbrROGlfFmGdlLGpnUrgwFpqBMVow3NZ4TRPNq97DbTiWGlAGKaS/sM+dliZveHiKS+SD1tnC6mkn4clhIMyyIbPaCOBIfIWYn7tbfUI/VAlfysKjtp43WQ9F52SePGVTnPrOh3LAl/Xbqt2PCHClM7tnv0wifaY51UrOTZmevWubncdUiQztLpS5ee8iLci4P6xZUDG7/AIgGMRyzhqaP7Sza9TMv6hATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB666wQudYMAsst5PfhbRTIgCAeKX7b/jpieBwnidm655FLCEe+5u8T5RbRuYXcLSn7Iw==]
@@ -30,16 +30,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   mcdonalds:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArMy8tTjUbZqYCkEvD7j+tmIrmAgKTau1kab4wHg5W0g3lvvTOa6cdntnxDVzuVFHTUjLx5JkQ7rwWH/XiGfn9XRceeGpcYzCvDDzUkWdPQKNLGdQ/dZ6QYvEXQaJgxnou4fhgaxE8VjpJgA/payZBgvhaXKYgGGxfZB0KtloDjrjPkZkUcOwCLbJR/iUoNF/AnJNWmSQ1kDk1G+YPfiXPX46AIa1kfDEwUMWq1IoBE42xpu7yp3LoKEPizaxK79D5iEwUrbnA6xL3nTsb1ocsu6YeJQr/iP/F85ALs+am5bXu5a1PIayb1qyjc+X6vXxens9NQUljDC6a8PBz4nD8DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDE+u/gLKkcrzSgtwEhVQZMgBCnPMxDpFeOcmzRGyDR7clR]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   mcdonalds:
     docroot: /var/www/mcdonalds
     servername: www-mcdonalds-de.pixelpark.net # Realserver Name
index 31e2ee1950461702f1f7e2b7a00fd2ae82ea8a73..fdc494cfe5e7e15bafced53c9e517c7747e21c20 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
 #  - pp_postgresql::replication
 #  - pp_postgresql::backup
index afb6dc8b17bb45c9fc602db81dbf5eccc9844777..66f5a7c55f18f42ee4c6bf08cbc2633f08920500 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
 #  - xymon::check::postgresql
 #  - pp_postgresql::replication
index 1c1bc59ccd4ff993266c3818a890fca1a539d411..b4d38bf6aa732ca662cd0dd9f6064035d7b4ef5f 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
 #  - nutch::indexer::solr
   - liferay::app_server::tomcat
 #  - solr::app_server::tomcat
index 30390215af5052ad2d11878d4f7093729b375ff8..c7522bb4b16503afb4b1274ea45eff9de7ea4528 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
 #  - nutch::indexer::solr
 #  - solr::app_server::tomcat
   - xymon::check::solr
index 6b089364ec5450965ff7484e3a1dc3bb8a04c41f..09b0af67ce891973f7f18ee436aa8188fb45e4b3 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
 #  - pp_postgresql::replication
 #  - pp_postgresql::backup
index 9f336d7c0a9655fd800dff4dc82e4f004ec97c2f..50048908c386f04b6ed38f9598f2ab416794c7e5 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
 #  - xymon::check::postgresql
 #  - pp_postgresql::replication
index 865596ff9362c960b0fe1e2ca960c9576fa032e4..e8590d8dde886f2bea949454a7bdafff99394987 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - liferay::webserver::apache
   - logstash
   - liferay::deploy
index 768a79cbf85878462cb33bae299a59e42a2ed883..6e871c304fb86583f896922c16576b3a4aea4e85 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
 #  - nutch::indexer::solr
   - logstash
   - liferay::deploy
index 4e10c84c02fa6d7a17f779e4818b78d843c615a6..95cf2f27ceb4a2afba9ef58910c9936da5f203e5 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - liferay::webserver::apache
   - logstash
   - liferay::deploy
index 5d11524c0ef74ee06f4a6b818e13c38d81ed1c31..a26d67b85cea8c9504a825ba7e4a009c12d2bdc4 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
 #  - nutch::indexer::solr
   - logstash
   - liferay::deploy
index c2061c2321f4a76ff6a5febd6ce87b002206a25e..d41889fc1305f0f4afb414c5c63e23d00dd9e48b 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
 #### Just Doin' no auth at the moment
 mongodb::globals::manage_package_repo: true
index c2061c2321f4a76ff6a5febd6ce87b002206a25e..d41889fc1305f0f4afb414c5c63e23d00dd9e48b 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
 #### Just Doin' no auth at the moment
 mongodb::globals::manage_package_repo: true
index c2061c2321f4a76ff6a5febd6ce87b002206a25e..d41889fc1305f0f4afb414c5c63e23d00dd9e48b 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
 #### Just Doin' no auth at the moment
 mongodb::globals::manage_package_repo: true
index e3021171c7073eec284a2c32b10adbdc136caa96..6c92ee62c446ad70e3fdfdd981701c15671a118e 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABHsNYivPBhK5xNbulfDhg/iJ42tcQwv89k11rLK8jCbDQCxBQaWn+nOupvn4FjVPnVcJpIqaYdIlO/2ZremVnGL1jnMl1g3Xz7UC6s1wnE47sS2hg0rlC35Ag0ymxYqAR0gsaLoZvzVb7JJuM644+mKD8ANu1ecyGI5ReaWfXqqIjWSqcnjM22EI0Za6r4qfBW9tPVs3ORtOE6JJBO4t10P+zZ3N8kS7b+NOfc4Pog5dWPIDitHs/NgEaJ8aKKt8nDHZVvjFKy12I6wxRDl9zMtF7Mauah2vqI8fQB9TO/wUy4ORWs0eQ/NpP3AVCQNM9PMnizDmcZgs6i/v97BNiDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDxg5OL57YQ5jVAQeFXKs94gCAKDEmJIFvUuSlpydc9uRFsWSCv3lM31WNUz7u5vbRBlw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAol3rzkLxQddArQoIchF+s3VlhVJYSzW99NKb2WX0p2xxX8OMOg5XS7fa0ebYxWtgGw08zgjRqVhuuUKtqS3BZv0vSJ28HkmAb1Ba0WUKJRt2N6FvGO/hfAKddCNfAe0eKf/Cfic/BW0q0ooCksXEk+3/o4UO1VSTqFDd1W/9R1KmvbWu8xe9/KwVrLIOL7HQh26ZCgVCFS5EKK2f7LHph1M6mzpCqte4RTa/IyqoLmOi+AnyuZt/wEKMWCjllFiKwOThBJ2V18EB0NT2aqM97n6efCDpVlhOEZtE+A/RpnXJtu7OPKfCu4sDtsosL4qzejyLjMnB+wbU5SsRDqR5qTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDjWMCw0ba+BHgRWZ9Y534FgCDj16OKDa8hLvQixlC5mUnkHT9Jh6rVfl9jc4RrKKWFkA==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7master:
     user: cm7master
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAFMUgVd0/sGqsoYliEol2A9Xdj3fqAtVX5aBEbnpT+ljpQvUN66hqnT1iNTpj/C3yf1no2dLSAJvgrhF4sJbzX660gCNHPF1DWBr1FhTRqHPNsJuaqRREELjR869dx9bdw9YrOVm8NHcx9CcfreXrTMDxZ4KQlsDUEOTGOe0iGPXuymf0aXqXQScwtQaaL3rARI8KEU4luEIrcGi5lEbKrmsgJDWvp2sUkBzeMaerfzSjxmzrxqI6AzWaN9He6duMucsElQWlKh1pUbFHEOAfTeBB6txvjkEjnkgSfTESv9g4DCIIhadvagnkQDivAYWXAN8ITf1DzkY3NMuBf1Bw7DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDz/TeEUvyWvSFMeybdaeKmgCACTrZ9B6Qrtn4heFBi59aGMH/2djaUfafUDrwBvhF/pA==]
index 91342d37ad6f42937032e48cb1a0f68d131a5094..aaad165d35c7266905ca5297667db3aef2bb120b 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::apache
   - apache::mod::proxy_ajp
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXqaLALIIccdBpItvPJb3bLB2UQHwXbQTMXXSho+TF0+yYYmcjW6aF0K2g5cobMrjscvxFhiN0OZHQQyyBP8H6hKVn5sdhaq3AAjkduBHdrq2u7PsCv+KfPzYg+sstwc7GvmD2QEuzYl18m+VODGn+eEH58fO0A9EhHjErTN1+xX0J5UhnySiu50eHgVuRid41+ZpQB2RfuEAuE91mqIrNmlmXxvI18HWhhn3BlQ7AYC6NFAtb5xIfE9XcaP474FBl+fQ0LK6OBk2A/iugk14/aIK80O1IjWgfbh4hkcG3RtaBM47MCfynuGBF8llD7h0d67t0WsGiSVHxlWBRxfd1zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD5x8I9oKBZ3vW82/64ZfgFgCDLkNcyrFrqHDMJPQFDLd5f5RYY4AITQo1Jpskp09L46Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApBHhg4hGwRALQ6fe9AjUT7bpG9QEeE4TDvPrBXQ+2pLKAKjGY96MbNB8COzEyq3IPS9nO28EEq7rjPS09IukBkn2D5mccBLFr7JM7845biZTaf8vfHw+MWXPilvC5XCMuQNIh7n8u4fjB5mOpqEk1+ttLLcA/+22/lxK7gwi8wIXoDw42hS5uqin2Ro1N+5f/SDaHToPTt4u3a9UDG/Xv16u1+MVS7auIClcVO9Evej00WqNoV1SCbjvdAxQB7jMGMBEp4Z3dTR54TGspWl3sNAnk6Vp0/Y85LCP1D7yXn2a0A2bWr8nGqNETpxs1ZNmqihiYbAsLrixK6pTa9UHfTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBgD/KCdR7tAMX+PVdcReaYgCBoU9EEdUuoZLKLQSC1QQPC5GW7CQW33V/fmAeQOQ/zqw==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7management:
     user: cm7management
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbVIhrs8XXGKlIBzMiQFwMcbpF3qmPypkoM5wWIhQy/3FjloQ8GqPAMsuNphrjHCq+gykGrG7AQHa76H8/FzQEhWBHjR7mvCliROdNz4QFzxBLLlKD7W1LZmfCrZG01GonjAaPeW1QPqF8OFfXNYatCS9qtJWmPpDYfTwWjJmbCXS7p2TB5Oy5cRdfds/ZPw+/fuEofPa/zL7Ee5tnnUrmN733ZIfFmIBR0u9pZirINeY23heyRdqmZlI4puG8o806GRNtr+PHm56GYvTWgoWDs5wkc7yvBGWC+rncaajoxz4IAsk2heS9zn9uIntsr7aeL8Si0W7AHw32OgNkHC7JTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCbSGWk54OL3lNCrgzL5aVUgCCG2at0RtLZvQmu3U1x+E7XACW3cYMbviExJ9FRZ5i66Q==]
@@ -16,7 +16,7 @@ site::profile::mysql_server::databases:
     user: cm7mcaefeeder
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAa3yvtQcuZcPaxuUnYQ7d4G+/bxcoEO3AugNqfjtK3xbsibWdEQ60agC+rEhp2SKdn7fzOqkz8nAJZXykBy8ZXoMxpXmfUilfmk3tVu7OUNUYIwY0a3tpjzGfjP3I8gpInupiHR51olwizg8QnId+H1BGW3f4qppoHmhJrj0XHiM+kzmRYS8r5yoEGpgjIa2t7zcjl6+oeWKuOHi9vyzxNvxr/qZtvFuTS+0x9pmCcSgarEO2OjNymEkqeIDr2iHXnJ7JIC0BpeXtwx4qf+bGF2eFSQq3uQQtytWik++xc/Ufurqna5SltWtq0pyTNdDFSyAQRmziEwzGbpjOr2t+UTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDGF+ZBzJCKYFMvZqicov33gCAVWCReOFa1UU3QnxV7Qm9Wpipm5HhWVb4TC19bdrD0xA==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mhk-preview:
     preview: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAMrbm5btU56ow2DidcQBiAQ68SFjX7F9GFn7f6Vt/OVSY6MTttrZgVTHhmhLsvXvkbkhAZF9uOHyIH9MyOo7V2ixa/WvaAcNRVoSM3jgOESD92xwOfVk9Pe4Q6ofvMV2ZQZIGaU6lejbwnYb36664wG4Oqsn+Vhf8m30hPDV3rlkr6hAHekLMb5kaUO1IB0YdG38Qp3Fg5EBtFGPxXdKUdFXpcVQXsym4pvGIxtMmdXWeFbT35V6RFZ0oo58fGqYOzH1ZXAhXnEr8wtAccmnXyCQE6k+h63gbmRyRmKaSiP1LmyvFw1O6CH/Tyy6fSHaTrYnTXyPBADp3pkFxXM4ycTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBbGqOFOeS5FjZ4nyn/flBogCDC7m3jQ1TGN1fReXQjtB6GPQtMp9YGpBk9bUru+1GZDw==]
 
@@ -41,7 +41,7 @@ apache::mod::deflate::types:
   - 'application/rss+xml'
   - 'image/svg+xml' # new
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   red:
     docroot: '/var/www'
     servername: red-mhk-kueche-de.pixelpark.net
index 4fbf63c23cdb07bbdac0af3aba40c162c7e8ec5b..a556befe309b07e86eff248c9ffc410f2465336f 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAH/Mg90Udx83uiRJWrHqzFnI+E5zzKXEj2lFrRqMXjoaMjYqit+T+QgNmI5/RYac+lQUYb4Q6beSBI4XBRAFTNNeXGpYEJE0DaQWg8VHLOOxV4eFzsexioJwAfPF1Prz5r27x1QM+4xGIyJqe6pQUV0tataC//uHcbs3eu1R0cgXYYUhFwzMm19H2Qni7YKqP2JhcfzlConnlazQwdkQddL0DE7+l7+ACLyVGek8E5mtAx3QfiOTslfUmG5k5rttVpTigUggzOuYCs4UumNTmYe4U038IlcrNRSvH3tGP3ADSjfARlxL6+mrwqSFWRrcLDj+GyLecnyTHjFj8ajuS3zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDnr9SJbjVg8b7kEveU53RlgCCO1Fce6lpykgTHVhm8ihsi0qUHxyz/v7MF8v73hN+nJg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIGfN7lvvnNDnQcMjXDjBs2CH0H6KHDRNqxWu/kv7/tHffIImJLPmNugGHQPqegV+cT0QpVxr6pEK440+n8ozk8xWk0YHj0jyiy923YKpQ7X1hVhS3ePBX+F3dHV60yWetlwM+wYsSzfrB0kUH76r+qUlpBGXtAoRhMbGSupS1twCqlbb64kEDBLpDrsnG/zUfdMOm5K6Wo7Pioo8oltC+SKEwkwi8rINTUOUldtVQfeGs7Yj19bpsV5uNVTEn4mfmMeTInRgEuwQeuufpsZxXAUPK//iR75QMkg8fz8ldNLS7YqPmAbYsDA7Ke0WrxyR2NS+NJANyrPynEUGWF9S7DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDNs3WJ5O8EZ6COienYnnyRgCAYrk82iCquDZBSUOaar7PIDdfsPTvyYTT3Yyh+lZglLA==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7slave:
     user: cm7slave
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZY1jmoCKfIQRrJm/4Pqv4CSPTQUWR3JGewYQQxTdgc2CAoA/V3a+ThrVd4tsEkPiSdsNCSzN30jQP9Zftee6p1N/wFiULWHa+yB2mMkovgvKcBzwNVXt2qADT5cvOOxdmWqd3s7uPCB8iGCDDqZDope+9gr8v01r59vxHgq248v8+USfmOohTliWSAnqHmcUxzEstQT6pvbC3uvU7qtSnJ4+ymKJKcBPAZQFklpJz276bFpKelzZzPtmjEDhVjIXzx+U/nZajKPhw+IJLkEe7p9xfRhR86bzXpyQMGLB20sbt6bN0T/ZRYM9db9pgjetML5C+6m1B7CzHNL8G6MBQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApX862aL+TfkfaPjM/ejergCCFxlfydzdrojzTfj85EklN7/Nq01sDaW8NrXQw9a2HUQ==]
index c6d3c62fc3dc53a37bf1377473d69bd323b21698..9f98ac67c11d8067fa95a28cbde7149fe16d2dd6 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJXyyedHb8ELoHp5Rg9o9emJAzhP8aYWazKkbHPV+olRIRyUEDOT8/2b2pUUQaNNKtje1OYRga6VfFbDKdS5fzCQRYhK34wLW/m5yxNFOpbiau77Y5CcIDUy0mogtqJdkWYrjql22mLRke93P8atABjSm+v2+h9h8gPUsFstHAxkQd2Q7jRlRdhEolN6ARCHkaGldT+0/qTtbbm0nT/pVmTN3o/P2734JSmm919j1RxDm44RS9wwwPMMD6hMXTUKKxrOIE9ZKZ4uMX3rwiUCRm5i4i9/BxS+OS4RReREATYpL0C68pi/9/9kwzvh6nFba3uz2QxbDCo8Yj8hS8HmDJTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0ZR9BxIjIDvDxYDuETuv8gCCishLbcP6Q0gcLsK+YiA9fbR2icCMFULGSsC+PzR23Gw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsyp8BD3X6fhQCBtshTfK3sldBr+oYEG0yT5XTXIvaERfKrHxPHuPbzQQMMXvJZXcPGyJeofMhqRPQX1bRcxroDQT97+XPpEOUpi0wjn122bep1LbwqJehD89iYoXQAxp1Atpxe8W4hQUzJBhbrbZ2RXRCEgxT/Ph/vCfRiUTyFxq/Xd9eZqOkiasFjfGEIkdJaShQiVEPi7cgU3WVOO8pCxgPSMaSVjDyX7FrugYlCSoyEv0GQUCCMVcBzMQ7Lmf5vUZcg0r1QJLvVal357FLYOZY3dapQJlrY5GIbPQPLB4P/S1QOxIP/vTcHsIjTg0k23paCD1x3NlVoqqW+IIVjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBACa+8WCNM4TlcGNgniWhsKgCAqa7XjziRxHS0mkZj/0Tisq0Xau+h9Cn4fBpWdQV0KNg==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7slave:
     user: cm7slave
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZY1jmoCKfIQRrJm/4Pqv4CSPTQUWR3JGewYQQxTdgc2CAoA/V3a+ThrVd4tsEkPiSdsNCSzN30jQP9Zftee6p1N/wFiULWHa+yB2mMkovgvKcBzwNVXt2qADT5cvOOxdmWqd3s7uPCB8iGCDDqZDope+9gr8v01r59vxHgq248v8+USfmOohTliWSAnqHmcUxzEstQT6pvbC3uvU7qtSnJ4+ymKJKcBPAZQFklpJz276bFpKelzZzPtmjEDhVjIXzx+U/nZajKPhw+IJLkEe7p9xfRhR86bzXpyQMGLB20sbt6bN0T/ZRYM9db9pgjetML5C+6m1B7CzHNL8G6MBQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApX862aL+TfkfaPjM/ejergCCFxlfydzdrojzTfj85EklN7/Nq01sDaW8NrXQw9a2HUQ==]
index 442e59f084299535bdf3b6942e5b7c19e2a61ff8..74e4758df3eb69a2fe787e1979d468975d35dc3c 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
 #### Just Doin' no auth at the moment
 mongodb::globals::manage_package_repo: true
index 442e59f084299535bdf3b6942e5b7c19e2a61ff8..74e4758df3eb69a2fe787e1979d468975d35dc3c 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
 #### Just Doin' no auth at the moment
 mongodb::globals::manage_package_repo: true
index 442e59f084299535bdf3b6942e5b7c19e2a61ff8..74e4758df3eb69a2fe787e1979d468975d35dc3c 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
   - mongodb::globals
 #### Just Doin' no auth at the moment
 mongodb::globals::manage_package_repo: true
index 59693c44a0b4485a9da1143dfa0b895257685aa3..8617aed3c52ef2c412b0600c07fcd7b424e0b71c 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEARP3VWpIcdEK3+fgiiIKhCHewHdJivRdr4hwpkJL3qt6IU6kUUEj78STfI76WSBUhM0Nsg8qpjZQ3sP8OCVido8hvStpG3nLiGbz+kE6cuheeokIsymVuOhZVX+HUcLlP4PfZGFy68BYCnZho1tcM1shsav9G3f61ARuTSWfYCgKOeTHBfR/r4LtV1OPHfE9WNX/lXFky0j4Et2rvoZ4uXz8zp4q5UDQnJJmTAlVQkOP52Z2ImTTj+YfReLH9M1cai57vsZV9WV4lVO2A9Ir6sxMvGYwyug6SVk7XFeIZek4lmGDA9XrHs9N+pI/L6ptIGcYfNcEugXbIKuf4pdsqYzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBfcAqmV6JpnRENU9E/y4stgCCdIXt1IBnjqJNF4gc3lW6/RYLH6YrX8JXfAg4QhbZS6g==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANTWTUAu9QD/FnaXWv+LcbobHS6umG/FGUJq0q86IX5uF5bHngP0NK88LgX7lRkUcmiovB9CdZuOlLjzSHsNzkqCLuuSyLB56qax5aqzKRQA8VlLz42cSmaAYF5Mayj/40OIm6hOXhwDPu68zV3HfWJMR+LbIsuijzp9l9z2UENKRsvPvFTZUNyqpwbRm7alcZIWga17JMrWq5pJIkZPFv4daJqU6tzvStA/1z6z4IBEqgTl8cU7tMs1+sszNErvw8S2763QxMuG1G30P/ftjvYvyHGlnMZR3cuzJ9aXYvT+laGzIEQJL8s/kyU+kG6d4sSwn8ntzm3B/2I1xoDDemTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBb33l0dbn+s4KBJc5pmX+wgCAK9Y1fgI2nFSw5/Xvfd7gZ/DLRDTBvwjPawnXfd4KdJg==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7master:
     user: cm7master
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbc0XJG+iHERNmOE6HkdPmFKxxxDYl9u5i9TZb+WK5VmyBGR4nitN0CiaH4tzaKqmmkvt6BbjIk2AtbHh0njCsgEwNPlVtCwiKCSmhxhW0FVcNVQLZcdEfK5Ku5gHfHXHeOMlX/zG9qrSvytJUIWSxZ4U3o/8P0rekW53IkwQ3W8oH/34RVqIoksz5awhVF/wHK/zNpO9gLr3tJowE8A5qMm92ZiidcDjgib+4+nEmglVJ9RxJHyRAkBU8tcxMXOGyJZC5DY7tPCHdRT8apFEa2ELtvRQpgO6ECpC5MZs84JHihMgjvv7O3BBrrGleryBxlntUPabZvKYUyYNf5LbsjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAVn7P3FaU0vWXnKHHFmHcfgCAHY8UTYdtAlzg1BZ3BE7EC5khjtc7Zgf87Go4QZVSzcg==]
index 099906e6e384fc0b43fb1c3cd9f9598160507843..15a395ef6bb72d7729fb46e5add4f3b360f65fdc 100644 (file)
@@ -1,16 +1,16 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::apache
   - apache::mod::proxy_ajp
-  - site::profile::mongodb_server
+  - infra::profile::mongodb_server
   - mongodb::globals
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPvRUxF6+6iEFM+OWQgHsioCG+vTdm3vWsj4PSnpn6FdlgZCazMIv8uVpWUy0m9B4dE87hNUDANcbkVNDmfWHKVkhqbLGfewbQvx20pkUeyMi27GgpQbLAeIFKpeCn3+E5/X2caJFV/inR5PgkieTtbSkxPFklCP5AnVxFlisidHVl+22pTAqZAIdNgw9qCnOFTyGcT1X0eOBDho24gMxm8bkT1INxvNMCHisQch98OxE2SqdnY3KrWKmSYgKeoCgxaQ/U+0SDF0h7+6y1RGU0r26bWXLpdOlQbOE/fHlW5Z6SPVUkyXAj6+KM4akosUjN8Zwwnp8MG9/GslGbKn4lTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAYY//abLHvPVmXVG7WsjHngCCNVoimvVhTjlXYiUYmoOW5SR1htjGBiWRd+Y2389uMNw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsK2YOMdeflOYo1k3aMNpM/zTkDbVRBU94y9++RpI5MDPFotP5YAYYsdnffzjX4aC7Fhf1v3xyWcn/0IiszpivFwSJu//kbpJRHwarL67BQpQkNOAR6uPQEAuTK5g90RsoHzBvmOH85zpFZucHJ2zwKC7BpAMsNFsxr+N/GmgQZOrEVuk4QuSt2Bk6Axgp8MzXnVGb85DaEGw/mFy72qv3TIJc7hZt6ODk4MWTsK5BjW94grRkv9u+ZIXBFmO3HbovRfowfLIAcNwMnTfdjeGuNWOmduN2vz3u/Fr97TjjAFnbsUGQk+ssGBreG9xmpvvUyQ5A+kE7ZS6g33s4bcwTTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD5bm5J970Khw1HaV8jue4YgCD0uombMjNMdtbRhZZeLew/jCMBPfRPvgLqbtDfHU2t0A==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7management:
     user: cm7management
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABuB4690bbeVP5n4Hbf7M23RdgIE7ef0MMv/GzpFbCfGsKRf6tClkB6nrtmmHaybtfUQipZoAmqkmsGMNBDLVqFMO8kt37n5EMEbJWcfFsdtnK+dt/en3pyfeRzXOQ4t65Q1fqg4j99M7j2d/gw/6eG/LL5IJzoPrrm5ElAWg+iGmNZTxDf7VyYUwhCcbqr7/fHknGebr9mwIlBCoG9QkdcPN0m3P4f97ULGH7HVFTUz8G+DYW/2/FL+LwfEXfY6qJmvT3593EkRfSmX9FsbkK1LlNOTb/6h78zObUCAq2sfmm//NmcezcrHLTgWg6KEA7jKWKrRtBB56IXbVutItaDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAMyFjd2WvYJJwSnfjKRcrcgCCTOkkE3E13Z4WEOZHxo+Z6UvJfTGKgDdM11Cf+/Gg4VA==]
@@ -47,7 +47,7 @@ apache::mod::deflate::types:
   - 'application/rss+xml'
   - 'image/svg+xml' # new
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   red:
     docroot: '/var/www'
     servername: stage-red-mhk-kueche-de.pixelpark.net
index dc699180a69bb0b6a2f787f8f595fe49ae661227..b4b8da175a77ff96d7412021bdd835cc165fd794 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAH84rDkcI85ZfZnmHdpFEbZVhMQ6ncc1klNZrMXUx3wCNgYG+2CsTe/h174JFmpM36Do+ZItdc7DAwkRa7ZX8AcMeVmfIV3zmIBoe0QO1RhxTMZuB3hSFWVRqjHEnBfhvwUNANVhSH7NWcm1TuHbsY92+pJzyH2ccIvSq0f+hB/2AzDV1hqJgd2KbvgYmbq+XkQ+gogSBVYR34yzHJ763vXm0534tOYivBwSJ+0SyV9za1U83toOukmUJokoLraofInE4Fj91KaDO9MI2QhMh/WoKpyZZkhGov3uApZBJkgcG8XkqG7pEFEsaEGuBUtp77AVd5VBx487jymuDc2+DmTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDef06tDhF5er3P9DjfnQebgCCHUPGUpl5AB7iur2lr+vBcrcd0Hpuy2008Fr5renznAg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZSJFmAbKHxOQJqzGO+BPVGbfM0xk537m5MhmDHtms8GkHZLoPG9OrCz8J9snXuen7YO/CTK0AfQHBhtDLPTciIAOXJs0oRWwwqkbGZZIO9TVN9ZwtXBouZPEMSfCGRwKtwmmIy3HrJiQuJjgcszQR8LyL6l5n3E5tu+gLqY/lln38/X4ePMGDgiHNDiViIXDplIjplE5FOH5C+W9nyb1gIuRvRuPPlezdWc9rd26C0g6Gn9+2vN9zKwqONgeBviwqFawPMl5hbkLwc+ZjUUawSxH1gQ520SE0Z/BaQh24trwL+lMe1rk+XKFKBG66ybtScQTifk5vO3nX/bJRwlxOTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA/yYhFAz52RbzdEYySr8+SgCChIA8ohrO3kU23SWBqzbwSbbKlF7nVZRBdjvJkc6yWvw==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7slave:
     user: cm7slave
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEnLfBRtjoFnvDmZWQtf+g28SR4Jgi3y58VYaZFUor4judoQmRPybP6Ye2137XSDBFFTlqTQ3y0Kfc60CSnY+QxTbI8F1hGafFO6VO7JXAblxrI2ymPfBXc0CnyyEeCal/Bw7UlXOj9BL0ydnx6cEn4iLm61QD+jLNwlteOWKv9excDDjCuWze+INsP/raINPW6X1wL0xGgwxdgL/fqIC8gxjCZBcJO4tdIBMEZXMXEwqwvHiIyk6+3+v57XFhJ8xdNmBuDC8ByIhGGlb6lNbShtvhyttneSB7phdyBBXiWwr8QNnKLkiso8qQ18aqutrVJGKGFck8sUMbJHe0WJcJTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAbawhZDoOgy4j+TUEegPfigCAsLU6yxUu7H5VclrQKrqJu19Ufcde6awUmkhypigskWw==]
index eeaa5a0b848f3a399b95f173b4d571028533a9f8..45a79ef1d758e220a717dd8ef67cff24e4031d8a 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmLYcmQ+Gk0wvsCLAhZYov9978FfBVCP6823tywsIqfWpOZj17PShZoNw5eG2BHnTNnoSzPsm0njPi61fYRSpVgBXxQWUVem+FZhyXnYv9z1EMU+6HjpujfZhm7uCOfjx/IDrZkvv5IMSwZQx/0IE2xez+fNwnatdrwXSoVt2Z2imYispJGYQhSQVuHQB2bg7ysji1V4EB3UQvWUBLSeygsIs5OLkz1wkSMPOOmupbL13I+iqxn13w+N051gTZ1MYi4xElBi/PV424TVuTDrCUOVNNiRXc7bXO6WOcfbDe/XfnOJItTZWuXi0KQKz4qEvMoQqESYxNz68FxqcQ8wygjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDD7WomP3qr6awQOsycuV3+gCAcG/Jz3Qd+lBoswVlMNpMIZ3OFj+g34aiOEmVnDpv1Rg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHf1Mg2MJnSeHD/GVjezrhwBfi0iZCvEo8G0MWn/qKH9SbwuVu4xq+iuoyUUiByMLmLxVJkGe3kARhAPW824C/vQ2Ra1uiXVpkYddIBQ0zxULGV7u+ZmXVAUtXB++NAE/QhETnhXtG8vRt3kXCCaxmQLLQIlU53xl40tAqMHj09sKTkhlrx58hDTXHmFjxc7Tm1rI6/e4j110gXROzGFDINQ0EggZW+CmOTyqWuw/BF5aux33NeBEb5aIU/KdtPoWRmo/rMB8pkYn7ZdKB1j+IwOLJBMjipCvOLvZK4OTOe50mRh6F6+1vBRJhPnbJDvggpADiBpsOVfnIufxMTk5njBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBZgKRGdjIQTesr0U85ozPLgCA1BkWHK4CMwmkP9/+9q/bzwFlY2f1XiUUeB9TLREB//Q==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   cm7slave:
     user: cm7slave
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEnLfBRtjoFnvDmZWQtf+g28SR4Jgi3y58VYaZFUor4judoQmRPybP6Ye2137XSDBFFTlqTQ3y0Kfc60CSnY+QxTbI8F1hGafFO6VO7JXAblxrI2ymPfBXc0CnyyEeCal/Bw7UlXOj9BL0ydnx6cEn4iLm61QD+jLNwlteOWKv9excDDjCuWze+INsP/raINPW6X1wL0xGgwxdgL/fqIC8gxjCZBcJO4tdIBMEZXMXEwqwvHiIyk6+3+v57XFhJ8xdNmBuDC8ByIhGGlb6lNbShtvhyttneSB7phdyBBXiWwr8QNnKLkiso8qQ18aqutrVJGKGFck8sUMbJHe0WJcJTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAbawhZDoOgy4j+TUEegPfigCAsLU6yxUu7H5VclrQKrqJu19Ufcde6awUmkhypigskWw==]
index 9aa321a2b0a2b3aed1b7a3e73095557bcea908dc..3d62d973742a65a632dac8836bfd2b026bc401dc 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
 
 apache::mpm_module: event
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/mhk'
     servername: stage-www-kueche-de.pixelpark.net
index 7a351f9e92ea6a98e31fd899957473b8655d87e3..35989c55a7e341c61517cb8c13b1c46a12f91ee7 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
 
 apache::mpm_module: event
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/mhk'
     servername: stage-www-kueche-de.pixelpark.net
index 2c1bb7929d7bd32c5e046e42d32af9c16302fb67..bd25661d8798f2e2c2150ac21291e7171d16db6f 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
 
 apache::mpm_module: event
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/mhk'
     servername: stage-www-kueche-de.pixelpark.net
index d1631f7b1739e1e46d7d491cb739f1f3413f20b1..4cdb7283ea6b5f76e82ba1bf54f6fc5e53b45936 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
   - apache::mod::remoteip
 
 apache::mpm_module: event
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mhk-delivery:
     delivery: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAFIp9rovuVT8KovQAFKS95zitRKpL1tZzGAEKCSRjnp5n5c1ZboY/9exlKzIgx+U9ZRbv0K+XsdCJK+m140b7Ku/EW9S+tfe3Y60YJER2p1yvlreSPH1sXE+tP8PR+C9dGpAUqMJ/f7cDyLVgHRaloWed2UqTgCwZbDQWa+csU3PFddvIwtt82/1u3+a6jqU8o7mLco5Wc+bsjZipKtTulJbNtzwdyGdukpeCSNf6FFUEzbrjhDKG3uS48pMzwPonY+GAA3SCL8Ig/qAJKhbvN6gzvZb3UY7TbSEgguBG/93TKW60W2C5jWYBIZQbttCqpKXvMq3TmKWozGhGZfBXyDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAw81Iz36qd+UJYWPLSa/itgCDU/H6EiJvNLDaOVo9VNWPHoQXBlq0HvXYcLcJ7gZogog==]
 
@@ -16,7 +16,7 @@ apache::mod::remoteip::proxy_ips:
   - '77.74.235.124'
   - '77.74.235.125'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   #baustellenseite:
   #  docroot: '/var/www/mhk/kueche.de'
   #  servername: kueche.de
index ce1ffd337c3f5efdbd693a71097fba3c31d6a67e..b0c3b9f08972542b8a7678ba740c5842ad64f48e 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
   - apache::mod::remoteip
 
 apache::mpm_module: event
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mhk-delivery:
     delivery: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAFIp9rovuVT8KovQAFKS95zitRKpL1tZzGAEKCSRjnp5n5c1ZboY/9exlKzIgx+U9ZRbv0K+XsdCJK+m140b7Ku/EW9S+tfe3Y60YJER2p1yvlreSPH1sXE+tP8PR+C9dGpAUqMJ/f7cDyLVgHRaloWed2UqTgCwZbDQWa+csU3PFddvIwtt82/1u3+a6jqU8o7mLco5Wc+bsjZipKtTulJbNtzwdyGdukpeCSNf6FFUEzbrjhDKG3uS48pMzwPonY+GAA3SCL8Ig/qAJKhbvN6gzvZb3UY7TbSEgguBG/93TKW60W2C5jWYBIZQbttCqpKXvMq3TmKWozGhGZfBXyDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAw81Iz36qd+UJYWPLSa/itgCDU/H6EiJvNLDaOVo9VNWPHoQXBlq0HvXYcLcJ7gZogog==]
 
@@ -16,7 +16,7 @@ apache::mod::remoteip::proxy_ips:
   - '77.74.235.124'
   - '77.74.235.125'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   #baustellenseite:
   #  docroot: '/var/www/mhk/kueche.de'
   #  servername: kueche.de
index 0d15ada40603f742b3707496387c640473b6ffd9..1edade85f54f683789c67bdcef8602b028c596cd 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::proxy_ajp
   - apache::mod::headers
   - apache::mod::remoteip
 
 apache::mpm_module: event
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   mhk-delivery:
     delivery: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAFIp9rovuVT8KovQAFKS95zitRKpL1tZzGAEKCSRjnp5n5c1ZboY/9exlKzIgx+U9ZRbv0K+XsdCJK+m140b7Ku/EW9S+tfe3Y60YJER2p1yvlreSPH1sXE+tP8PR+C9dGpAUqMJ/f7cDyLVgHRaloWed2UqTgCwZbDQWa+csU3PFddvIwtt82/1u3+a6jqU8o7mLco5Wc+bsjZipKtTulJbNtzwdyGdukpeCSNf6FFUEzbrjhDKG3uS48pMzwPonY+GAA3SCL8Ig/qAJKhbvN6gzvZb3UY7TbSEgguBG/93TKW60W2C5jWYBIZQbttCqpKXvMq3TmKWozGhGZfBXyDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAw81Iz36qd+UJYWPLSa/itgCDU/H6EiJvNLDaOVo9VNWPHoQXBlq0HvXYcLcJ7gZogog==]
 
@@ -16,7 +16,7 @@ apache::mod::remoteip::proxy_ips:
   - '77.74.235.124'
   - '77.74.235.125'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   #baustellenseite:
   #  docroot: '/var/www/mhk/kueche.de'
   #  servername: kueche.de
index 7ac350d7caba163ccd726d789e947baf695e75b9..803aaaba5ff0018336440991d652afb1dd1c57a8 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - logstash
 
index 7ac350d7caba163ccd726d789e947baf695e75b9..803aaaba5ff0018336440991d652afb1dd1c57a8 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - logstash
 
index f74d98f7d7223546dc549c70dca1193e962ab823..bd26b1700d833433d86c166d08e681180cc349d9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - logstash
   - accounts
index 358f5502dfc5d73275e6b1ca770f68f6180f078d..d023cb6b7f560389c18d3b1de85b33fbf41e5ba2 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - logstash
   - accounts
index d953237a8a6e7bd86aac9d5fa142ec45bb80d824..80eb47e135ed7cacfc3047f8365d5881347675c3 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - logstash
   - accounts
index d953237a8a6e7bd86aac9d5fa142ec45bb80d824..80eb47e135ed7cacfc3047f8365d5881347675c3 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - logstash
   - accounts
index ea0a8096f42d749367b5c36eb14b222e7634cfb6..214aae8cb331b4a572a014f6f564bb999edb5e82 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
-  - site::profile::postfix
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
+  - infra::profile::postfix
 
 accounts::users:
   jenkins:
@@ -41,7 +41,7 @@ php::extensions:
 
 # Postfix Config
 postfix::myorigin: 'pixelpark.com'
-site::profile::postfix::hashes:
+infra::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
   '/etc/postfix/generic':
@@ -49,7 +49,7 @@ site::profile::postfix::hashes:
     content: |
       root      root+%{hostname}
 
-site::profile::postfix::configs:
+infra::profile::postfix::configs:
   virtual_alias_maps:
     value: 'hash:/etc/postfix/virtual'
   smtp_generic_maps:
@@ -58,7 +58,7 @@ site::profile::postfix::configs:
     value: '+'
   relayhost:
     value: 'mx.pixelpark.net'
-site::profile::postfix::virtuals:
+infra::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com
   'httpd':
@@ -67,18 +67,18 @@ site::profile::postfix::virtuals:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAo4e1z8SeNtm1X5wgFFwPnnPEgttqhoSyDe/un5qs1oqKJfDbowIanS+5Cnxq9pGP9T6cnpq/rKnhbnVuogZpw92orN8eY+c9rvl5kd6R/G5L31gihL0uaATxQgM7LwTWVWwVrTeVCW7PyfmiHtRNUEn6PmvlXRsRIhDnu2202OeO2k3ZkLtlF9wLdWYO7RcOkBduYFnBiDhhJ8ew8KWh8ectSkHIOts5V5MJ0LJRPnwtVeQzXoBpd2ujbk8ejs6vGp60h17XyoT0KcHAZmKbEtZfNcVZDSBaBnX/9QMGtZKQWTTCtORKsnxRxxtxTaQjrx/HriO3HRY1eOhhxZ3BWDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA9f3jLmyGykz2aBiz2lfSkgCC1ooQllYAzAEoFNWXVRXZKYgLirx1CA6P1RTpoj+pQow==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAR6xsBx3+S8bgkaf/UHyA8Fn3XckANuwX77FuYAQ6Y547pL7cfFulnix0H6QZCTs9oIg7wS5hTnayzWbrQpuCBewql6Muei/dn6mKYLFu/R5Nmou03fBOT6tVPlT4TPqtD7SFbOj1LWzG+gDFxBvG2AZMEB7OWuIOdfZmLLu2TeNuit/Zgp+s9n1JpLn3JWleRJIVczeuJQuVAfKzufxe1ioBu7IVkt8XEDsYBGKMPlagXoDtRbzot/yxBgZyere2mSU2EpdD/Tf/toB/1dMfcoGx4a48f5rrm6kpfA00D7AZld5+u0zuJLd+JtiDau0ikaKBKP3yBCEKLFprkvNxGjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCerbX3z4ZEwIOpC8KbPuGvgCCmVI6tSzPxvZ5iKzeeCJ7B5foNlmSwhnwQEFHau5HcCA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   schlaganfall:
     user: schlaganfall
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM1dRomIlHlnJQpY165WD4w7Ajjsb3P1ATl8eTpzJaGmnCnx7RU/6gqRDKs8n1ai2MuTHKbNB+wLP9LL0xLyeIUFcX+KFwqNj1DanTsQDDI+7Fi5zzKElRjRjW/yWdx/O91VWC+EKAhtRo0BXUZOKG+dJxOZ7JbVYb2/lyJ6Yu+mjVjrzAtBfzBiiKnDyru9/Jbf+8UC25S6xf3jpID9UZLG+gbPsbn2GUey0ziNKLGqHDTrv2WmceGJ6JJ4EbR7W8N6qadv0HMC5lRrm5blPmQcLE3lamwVSqvQ4J9KfLqIMXhUTQ+ynxSaL0/R6rdd/axlOfmBaJS73MXdMAVQDlDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA3eHjo7EkaNgiJdsZESYw/gCDa9mwUBHCaUaS+Gge0MWk2+5lqzdwjcB4pVJ9eFa3n+w==]
   testschlaganfall:
     user: testschlaganfall
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPWW6ITRfkjWhuBzq8OsU8L0ESrNQ8BsoJUzXZsJ1F487CJ/MicZrzDbA7lM+gXK/PKnjdBcr1aw92aQqtK5DpK5rgUjUWlSv9A/wlJwwg9+oFoXwLv+afgevn+lt0gYeWLfNInObVy73ppU0cXsx+GZD50X8BPkZ0vmvvG6SrbkOhA1/Mh309kMC90MaZ/Ecab6rLIimJo3Wvul69jRs1/ndjPlfK+5EtZqS7rfjqA2bS+KGUV+XmFfIct43Z1rkO9eSDcfSJv2GyH6Zm7MgjtBuOwjggaqMwBd4L3kda5+XxowPuurEwzF5pOTz49ZD4AXN+wkmhn2sZD21IkEK8TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCu8y6Q/4ZEbyOIYw5T4mEpgCDT8RrhmO5YrW1MPu43pl27DnlmsV03A5KgS2XFvSdBAQ==]
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlAZNeDfsn1rMC85fh7R1YSOx0qdu6BiEw0JiElG/CmNPsh/DDtt4h/lkzkoYGPxTPHLP/96nybWFDPwjkkhBGhF+9cLkJSJDDig/MlvpMo5CAU1QpmApGAwwUHzhY7Tx8bP8p7pxBe1KvKp2/fHIyvo+UrAGhfkgxUgR8sj6ZuDoY6roEq6ZxK2h47ObwpoF1lzxGggiAfUf13eJA1onrDuoJ6PXORybBHbf4/PGF5sVXc+JgYljsjir4EF+eAikIKqIU0S1ivdCmpFsqvmrSTpC1yLyAmQlZBGEKv/R3avTmjJ7dgA9F0cd/J673M4suaSVupvVf5kxu8t5ZUr4fzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA90HyByOJxnf/AkTbEW5WygCAHtU7rYl35+dLEb6Mnv+sGw/4hCA1zOsAWzItzvEdgxw==]
 
-site::profile::typo3::projects_composer_monolith:
+infra::profile::typo3::projects_composer_monolith:
   schlaganfall:
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM1dRomIlHlnJQpY165WD4w7Ajjsb3P1ATl8eTpzJaGmnCnx7RU/6gqRDKs8n1ai2MuTHKbNB+wLP9LL0xLyeIUFcX+KFwqNj1DanTsQDDI+7Fi5zzKElRjRjW/yWdx/O91VWC+EKAhtRo0BXUZOKG+dJxOZ7JbVYb2/lyJ6Yu+mjVjrzAtBfzBiiKnDyru9/Jbf+8UC25S6xf3jpID9UZLG+gbPsbn2GUey0ziNKLGqHDTrv2WmceGJ6JJ4EbR7W8N6qadv0HMC5lRrm5blPmQcLE3lamwVSqvQ4J9KfLqIMXhUTQ+ynxSaL0/R6rdd/axlOfmBaJS73MXdMAVQDlDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA3eHjo7EkaNgiJdsZESYw/gCDa9mwUBHCaUaS+Gge0MWk2+5lqzdwjcB4pVJ9eFa3n+w==]
     db_user: schlaganfall
index 948ec833f79c6c6e47938ff321571661faa33c42..eb48ea3d7658d1d671e1de94c1762a11d731486f 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   stephan.vits:
     apply: true
index 641eff88c6c344399f411a51c6468ecb88a1291f..f6363619dd4512f689e78f46b2ef38cb57480860 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 repo::remi_php56: true
 
@@ -52,7 +52,7 @@ php::fpm::pools:
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHq/Ho0RC22KW05ZEHrIdJFF7awVvuygOldGcp7CiqQnmQRTqYcqc6rBSy5vnzL5/z1GMbyu0SL10yX7pBvHRmXEjDBGgeMVEUo4yntkxkZZ1nnHKlA1BerLQR7uzIXvd64c3CXHF8ng6yrNW1/AdPvSWykHzUpzv3KAhi84BUsIyJ80wudPG4iHoy1nAOtD6pFpIxt0opJv9OhQ4uVnWvZFE+1IC3T+0d1JENwOpQUhdt6W/hG1JZCHnMSbvfV7ATSK8r3bbh9q1m3uo+ce5oBE3iovP633hWnRkYZEAFp60mn27Anm+TbsrkudR3CHIvq3tqupnrVuH6NW8NOxqLjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCy4k1gyLnmzhqgJnbIUHCvgCDoXc8SIH4lue/wHmk36DKYiJWgl4dAHqR/9KK9whY0nA==]
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACd8a9ReBCaFDJKJ5DsVJ44yGHDhwEgWqn0VX3cCkIqBoS2jSgXVeuCHc8HgWN+YR7pKbhhEmmUsd3nFrFCxTt9QJN65HJ14JD1ZQ89Nup9bwEtzRKITB17oVI52kkfskS7sxT5lNfuJ9vgOloocPFyelvlpzajQ68snNeFFDiYf1IAEqhwXZsoN9RQJXAs07gjwVfLfcSMukkudgsubEnkjqGO4QDKdKnbrO8+tCqHfDFBt7lWSqzTH/y3VzIf3mYDpIHAT3v8gCqKJf0+AhtgPMUbt00st899vfw3ptVwREJIOCz0dvOtEDsHUf2TTVGWMhwWbhMGwyfvqD6548BzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAnywYuCqvo1SgeiAO7krIggCAFyiD4nIHvukJHnrD36/2w6QGKKSCXyyP2NsNbvGGLNg==]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   typo3_dev02:
     user: typo3_dev02
     password: 'XGEb_F_Gvqqb'
@@ -67,8 +67,8 @@ site::profile::mysql_server::databases:
     password: 3oPtYj7DRORiq4uv
 
 # dev-bi.pfizer.de
-site::profile::drupal::manage_php: false
-site::profile::drupal::projects:
+infra::profile::drupal::manage_php: false
+infra::profile::drupal::projects:
   dev-bi.pfizer.de:
     #ip: 217.66.55.100
     site_path: /srv/www/dev-bi.pfizer.de
@@ -109,7 +109,7 @@ site::profile::drupal::projects:
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
 
 # dev-www.pfizer.de
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   dev-www.pfizer.de:
     site_path: /srv/www/dev-www.pfizer.de
     use_symlink: true
@@ -550,7 +550,7 @@ site::profile::typo3::projects:
         rewrite_rule:
           - ^(.*)$ https://dev-www-pfizer-de.pixelpark.net [L,R=301]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   dev-pfizer-berlin:
     servername: dev-www-pfizer-berlin.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/mspfizerberlin'
index 893be3eb6ef8a608216789fc0096c6060809bcb6..e7472d2eec92e3846c9f5979c7c72ee7d42bfbf5 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 repo::remi_php56: true
 
@@ -32,12 +32,12 @@ php::extensions:
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAifSmIAyo9l/QDr7YwK+saiYxrdxk7YvgCbzsQfpBNJ3YdvadcAkNGd2itsb439Vm25ju8/PrjFPmHpcP9uxMjeODIu4biZtcSDqvofPm8hWZmpSWSMmMmWsLyCVifWC+ikNOStJYRuxiteL+xLxJWCH5PY2FP8WejuGR2QigqRa6pXSKb6+muvcifhSjuGc2SP9i/l85WClaeFS9PJNw+hsOHACx/X5KMx0mFwE3knOV5TmTbxnd/bYcjZ1JxwcNpch5i5v3F3UHUKs5S+0jUHrM45B4bb4QTJu9WpaGDepAHELEnjuCbRCq3kGDypgbYr4sWINKyGJX0K71AFBovTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBF00yk9r/Wr9fH52NVmkEPgCBpwmlcc5s/m9N6I8ML+zitdrS+4Qsv8UEsdY5qMsw3IQ==]
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAt+HUDmoK/Q+s+nfsrv6JYm9XZIIqmJtT+0nY2/FOM9KcYDNUoH8dWF1z1zB7c9SyZ2wwE3/dKHan2/kb5SVjgY6ZYHRutGS3TblRxyuC622wyPMiFr88f0Ufn7oJP/0BAMoQEJTr6v/TVwhEJsXjEf0D/vdMDx8rf6QobnQHnaon0wVGV0I0h7qUAgBYasIHDB617E5QA4hEsyPiQ4jZm4rCwIfF+vCNH9Fs3XpePAfpNflSusp0MFqTbWWCOPwipG1Go3PYPZZDOtzEbZyySR06RK7X8LjldqokMXOcfif/eD5Pu1z3Zs1rgwnas3Cpvzt+NSdo32c5gocb6J5f2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB8a0T6KoxrIvNnVzAKSTpIgCBDnMMkfiWFb3BIf9k67Pk2AHuUIa90WFnBhsq4KzK/mw==]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   typo3_dev:
     user: typo3
     password: 'rRCmIY76dFrU'
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   dev-redaktion.pfizer.de:
     site_path: /srv/www/dev-redaktion-pfizer-de
     use_symlink: true
index 4ae291678de547091137c473552edc3a5a3df6da..19ed9882d04df41969094cb92c1a2428c567a3cf 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 repo::remi_php56: true
 
@@ -36,7 +36,7 @@ mysql::server::backup::backuppassword: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWY
 mysql::server::backup::backupdir: /srv/backup/mysql
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZLmqG5VkuWG6QR5GqOC9nTOVsoBvQ1svBJBGQbDugX59p+UguRfDY76/8Tk9CxFlYpWznUl+M9dqFrcP0YrQIafch/Rs6NpofsfPqBOc7Z06ZUeAwBdHDfl6Iei/6mv2IzvhqTi1v0IZQxWd4JQBAd4xb7LuCW/otngwirRuMhx2ew9mpmxgdy06h5+82cP2nNMZC0M8+ojNCSHe4KQxfYPFF2MuaGORgsWE3CZVxKcPfl46djWZptfF3ZcdKz4z0nuW2FymItFilA/xSyBwOdea0DOwLTGR47BX3XBqqfrwO8FKgW+DjC3+flvYKlHgwqlqUUu+rdtV3CZlqImC/zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQqqCKeFKW0dmsLBmZb1l9gCC+nh3N0/Vj6RNSGLpbRzE+nGbgA526WjQOC/K/lMx4/g==]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   typo3_test:
     user: typo3
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASM8UWWqxOfXwQeIOjeWdOPU7hB3ZvVJ9gg2lYeik2xxPYQmZ969oNKxLN/ew1Eh+qaxiNpCzYYVFnNbshuuxsHKQyEzIB0uN6+vF+jdfPLE+NFiipRyLM8F7UkSn63ar+s+sywXCmd25/LRuIbpjvIxI3+5lkalCRvVLxp/1/SwxZMxjArGJteslaAWGVUSYY7JI1XA9JwHVJBmuZKFyG7c6diEe0pJ61Eo6bCM8Pky5/59Y+cMEQIv5giGE6nIEulmOsbHA1tu5i1I9RBRpZHGkH96l7Ub/LYzcCylCBdy+n6nN35vCsVh7Yxv62k1C/SdU+cW7Ryxax2JnJhQKjTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCuShSG+2AfEkaZv9tXTTskgBBgVYFvHNkenz9qHFEQ9ZJc]
@@ -45,8 +45,8 @@ site::profile::mysql_server::databases:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkl86pPixewvCE8kwxOs5kUL+ZBCxq3Zkvf5C/0tGu4STOrFnHN89F8RASfi0delpaIlVgOOHNG39dcuwoVHnZjmzUx19JKB4T9pLfdirzywobETazgkJad8I4D2+WB2Ft3dMQGX2dZfiBWYwf/MmmjRaBmuWggWlRMYDNSwW7JkAvxOJoax0yFi1G4Gr1qOnTdcIF9HBg0D5nZN8uxy41sYsY0gxBnTCVH0Vr5mOUG9POVewYAjtD/bGnYL3HlqO1U/3Lgb1MsqOL3q3dg3etZ9UG/hjkG0kZWUADsvOB2MQS3FNKgSf8GLaNp5Cye8LCaOSw0LBshcRII1xOi1RYjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDP3W8oTXIbnletuZb4TcoCgCCUe+zrlcGW5v+UX78h1+i6qtl2aA+vyjzema1QdkpZGw==]
 
 # test-bi.pfizer.de
-site::profile::drupal::manage_php: false
-site::profile::drupal::projects:
+infra::profile::drupal::manage_php: false
+infra::profile::drupal::projects:
   test-bi.pfizer.de:
     #ip: 217.66.55.100
     site_path: /srv/www/test-bi.pfizer.de
@@ -84,7 +84,7 @@ site::profile::drupal::projects:
           - ^(.*)$  https://test-bi-pfizer-de.pixelpark.net$1  [R=303,L]
 
 # test-www.pfizer.de
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   test-www.pfizer.de:
     site_path: /srv/www/test-www.pfizer.de
     use_symlink: true
@@ -540,7 +540,7 @@ site::profile::typo3::projects:
         rewrite_rule:
           - ^(.*)$ https://test-www-pfizer-de.pixelpark.net [L,R=301]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   pfizer-berlin:
     servername: test-www-pfizer-berlin.pixelpark.net
     docroot: '/srv/www/mspfizerberlin'
index 69399b5143961f5c884643a873eff1446f3d4ea9..d30f85e0f648c725db002c7442f2d546c54b731f 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::drupal
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 apache::default_vhost: false
 
@@ -51,7 +51,7 @@ mysql::server::override_options:
   mysqld:
     bind-address: 0.0.0.0
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   typo3_live:
     user: typo3
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAL2YhTcAecNHUMTzqbpXuyyW10ibj/UlWbhfwrPKVi5WDdI5WlcWTZEtzhETTTru1lbMD/OPSk/NC2bGi/ywA5G7I5KA0cIk0Tl3r0SFDIn/RVjfH6ttcYKuX2SmFllwtaYCOO7j8IiMzDZeK0DJB7vrDibifs4HqiVpdmx2f7tvTi7jw6tRkmYZF7smJ+vw7fOvCDs6uHX3DX01nfWBUTFv907HQJJdnfGnDuluJnXlgwEHPOSyCAn/MFKfQt3ZE2NNczM8rKK8ESow4YGHUQEt1jHdeo+kI+6odIWYv5/QIadgL/1a7ccklnW5n+9n/q8yO2SFu3y4AShsmKOV+dzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQBlVy7eG59gdde6kQtjNggBC8dYWeUWkAvXEgtuoEhh+Y]
@@ -66,8 +66,8 @@ site::profile::mysql_server::databases:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnQsqf3gBxY1MqjtcfQl5yikUG0qWXLkWXe+/bTuwsYZoTG1DkbOk61dBMAEBHZn/ZXMnntXWgqWN1EAnhCFVxBFVKJra11tN1W1B3j3Y+Y3a+Lqga2udkDttTLSJZRI6cbskYJMqONHTixRKeICyUN0T+mWSLWNbEEryfyPaXfRKyA74Qg8QONBEJf6cAPN9/KenQS2dlOh054BDOB4JSeTSdL+nZlexV0hPBG/XbEnpbfFrpEHJKHeZKYIePgPa3u/ijo/c1vX//e1QQWN6VBtCccuqiUaj+tUyFGAVOqV69yI9m+1wGHc9EWq7Qag+YUDZHM1pY0AJYN3x75TKnDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATXPnY7/g3qpYwL7r378iLgCDOrbZHUiINPd2jYBjedY02Ms0MfYzhco2wjK3QbL7ZNA==]
 
 # bi.pfizer.de
-site::profile::drupal::manage_php: false
-site::profile::drupal::projects:
+infra::profile::drupal::manage_php: false
+infra::profile::drupal::projects:
   bi.pfizer.de:
     ip: 217.66.55.100
     site_path: /srv/www/bi.pfizer.de
@@ -92,7 +92,7 @@ site::profile::drupal::projects:
           - ^(.*)$  https://bi.pfizer.de$1  [R=301,L]
 
 # www.pfizer.de
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   www.pfizer.de:
     ip: 217.66.55.99
     site_path: /srv/www/www.pfizer.de
@@ -1135,7 +1135,7 @@ site::profile::typo3::projects:
           - '^/$ /fileadmin/rauchfrei-durchstarten.de/templates/landingpage/landingpage.html [PT]'
 
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   pfizer-berlin:
     servername: pfizer.berlin
     docroot: '/srv/www/mspfizerberlin'
index 9ce3c1440c61825967634aaf1259b0312ce62482..9807b195d14827cc239c23fb99b2d380f8edee88 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
   
 # TODO: Abwarten auf Ticket: https://jira.pixelpark.com/jira/browse/PPPUPPET-202
 #  csv_upload:
@@ -48,12 +48,12 @@ mysql::server::backup::backupdir: /srv/backup/mysql
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkFOrx1EsH5zFt3HkXKx4KPUMbrHf529yicey6tji92W9GKETBdmojUyJY1G9WiIyeGLA6SHNdIDWdnvsKZsJQVWL4hI4pjXnU56UwW8mdMsdQe/zhMqdPBhrMIhXqiGQyoPbBCeQwpuacLvXULpJX8kScy3+0GX6i6vJG5wNE7OYj9PDuJm8oQI7H7mVBTtfaARyKZ46bXB4U+tU4Qebisv2/IRassxlvc9UG6K8qpj+yUJncAN8g8gSJDpLCafAWQHbE5asUAKonR5IAP78Zenk5ZmTQWZuVq1+fHWaG63Tug51LS4ix3SQ3RhvgyZvriuPoWJKoO58tLwHeh20HjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCEvfHJ8y1go3FejUaoMLiegCD3/BB5vGA6X8qLWU19B2RhY+MVzn+PpGol9KtAwRqkIQ==]
 
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   redaktion_live:
     user: typo3
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXuKl9eAA6Tkn/EBkH/2/piX7+aTFtQrqgz223VfKf7MxaT1fQbZmp3iDAYcHok+6A6E74iOJCOGnK3S9MuotoV6DnFw4gQ1onw+tpiIzjeXDwsyy1rgPSADtdgrfl0nusCm2vswRG7aoooh5AovcfoM8jEY9aFYvC/Zk4xjxIkl3D5TCagWn6jmzeo++WbtRaP6KW+YJDTAu/qF8o7yn5Iue+brWxe67vwX4xG31xNVvEnV2NYYBMqsTSJsHV58ubKdyWUyBUbB4mKhpQdGRpS0uvOeRzjmRyVGiPV7Rk5S9mIMke4WZKhj2yVHt4ZmUy5IiFSpcyLOAmqSud/T7NjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAzWsyln4zH23mbv+HgNNXAgBB9p8d7DGdZrXcAlJjt+Zrk]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   redaktion-pfizer-de.pixelpark.net:
     #ip: 217.66.55.106
     site_path: /srv/www/redaktion-pfizer-de
index 8529886d778ddbd93b4a3d0e6d22c4d255fb0312..4717edbfe5e1cc000f61aa4731151b7f3327756c 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::additional_classes:
-  - site::profile::sasl
-  - site::profile::postfix
+infra::additional_classes:
+  - infra::profile::sasl
+  - infra::profile::postfix
 
 # Necessary, because the host has a local caching only DNS resolver
 puppetconf::server: puppetmaster01.pixelpark.com
@@ -28,8 +28,8 @@ sasl::authd::ldap_password: >
 sasl::authd::ldap_version: '3'
 sasl::authd::ldap_filter: '(&(objectclass=inetlocalmailrecipient)(|(uid=%u)(mail=%u)))'
 
-site::profile::sasl::enable_authd: true
-site::profile::sasl::application:
+infra::profile::sasl::enable_authd: true
+infra::profile::sasl::application:
   smtpd:
     mech_list:
       - PLAIN
@@ -41,8 +41,8 @@ site::profile::sasl::application:
 # Postfix configuration:
 
 # Global configurations
-site::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
-site::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
+infra::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
+infra::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
 
 ldap_server: 'ldap.pixelpark.com'
 ldap_port: '389'
@@ -67,7 +67,7 @@ postfix::mastercf_source: 'puppet:///postfix_dir/master.cf'
 postfix::myorigin: 'pixelpark.com'
 
 # Main.cf config entries
-site::profile::postfix::configs:
+infra::profile::postfix::configs:
   address_verify_map:
     ensure: 'absent'
   alias_database:
@@ -206,7 +206,7 @@ site::profile::postfix::configs:
     value: 'pcre:/etc/postfix/maps/virtual-regex hash:/etc/postfix/maps/virtual-aliases'
 
 # All postfix hash databases
-site::profile::postfix::hashes:
+infra::profile::postfix::hashes:
   '/etc/postfix/maps/access_client':
     ensure: 'present'
     source: 'puppet:///postfix_dir/maps/access_client'
@@ -236,7 +236,7 @@ site::profile::postfix::hashes:
     source: 'puppet:///postfix_dir/maps/virtual-aliases'
 
 # All other postfix configuration files
-site::profile::postfix::conffiles:
+infra::profile::postfix::conffiles:
   my-networks:
     ensure: 'present'
     path: '/etc/postfix/maps/my-networks'
index c1c14da01908ea442169934ae90ffe338369a1de..c90ec476aad915d4a05de6a97939c2082daea259 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::role: base
+infra::role: base
 
index c1c14da01908ea442169934ae90ffe338369a1de..c90ec476aad915d4a05de6a97939c2082daea259 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::role: base
+infra::role: base
 
index 2d1bcadcf9577b2e9b156538cdc597b470844560..5a62487dc5927ce17bf67d66af5c6630c5aebd56 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 apache::mpm_module: event
 apache::default_vhost: false
@@ -24,16 +24,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   pressthebird:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQsgfqgYOM2UCd0iIF7Ps0fXuGjOCL+Z975boQ229SHtJdoJpraQM/IA66Ma6YfXyIEncAbj/uX1C1c7u/8eyDb6f1lZLKEqEqYLK+b0awgJMPOIK8bvLjwqsNQ9/ct5Md3tVk5EWvfVlOHtKOxQQESPFjG8ZCHvBN0lRjvmmEckL+6nTNaN6flrHlBzeAfKgIKKaipjg51laBmh3t3Pk88+3Bh1EPlBTEmsa5nK2gO3dmcKuUhVmkUwtocIKcjMrt+r2xR1cxhvu9ffm6fHwTP02f6aAxQ2KbarAPW5FxDRvsHvHXPCZ7naLqd4Y46euTskfiWgDzx0BJCOMZAFPyTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBab0txA6Fx97KxImehKLHAgBDGbLA/OUJOq7KMSAlAkmMd]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   pressthebird:
     docroot: /var/www/press-the-bird/public
     servername: pressthebird.pixelpark.com
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index c46d701031d861ec8e87ded635a4401e75aa15e0..a414d1612b819ac790c8c42b893fc485851139a8 100644 (file)
@@ -1,3 +1,3 @@
 ---
 # time01.pixelpark.com
-site::profile::ntp::disable_ntp: true
+infra::profile::ntp::disable_ntp: true
index f8fdb43332547baf6a036cbe39f934f53377c50b..93c364c8c634415126da066eb00e4416dbcffbe6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
\ No newline at end of file
index f8fdb43332547baf6a036cbe39f934f53377c50b..93c364c8c634415126da066eb00e4416dbcffbe6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
\ No newline at end of file
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index b0a0efb639fe3920d786a511a3906a1abddd19c6..413037104b9f379207ca34e2b13e58980f619533 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
 accounts::users:
index 3874e682e6cc74d3040fd65bc3097c74c9fb4237..142dedd0753c84afd74e14a1cf6ea46531cc9e45 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
   - apache::mod::headers
-  - site::profile::apache
+  - infra::profile::apache
   - apache::mod::proxy_ajp
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUada+kimadlXsqgdPwSDFOx/MbELuv3ANBG01xuhF6j+xPGjco0BIozZUvNaFuqV4oANFbmTiBRn4AF9J7FLfJ4bg3S0LsqGzcA8ks2TiA9o9AyE78HA1dB8TlbRMoHMNbm13VwYPLgsVdHWnEKC0SiV9eX8l4itdXpdi63yJkJ3udFubK/+++5e9U0RoVEQyGS+IzXFxK/qzhhOGEafMW3nY9r2ubA3oQ1OAUZQ2c6/fGGgqZ+hwWSxEP8ZT5f5/mr6mQfPfZgI6aPFsm5+qZeXldYCka+46G1GvtlkGzanZam8FGi7Lw5MjPfGe80q2n4xBr//Mjtutz3l1c+CGjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDSCAweiAxN6azcsWCc8hhLgCBy6ga+PizimkRLQyT+P6K2laOoqd3tLqtKCkvOis8rYQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhHuo6vgrjXGrmf18l1vLcE4rpaV7/vY4FNie3q9GKHcpYYJac7+D2VVvlwaji4Gj+4JkodhUq87SF1yPtDRqjCV4dvNbbt+DUuAbNBn0IEaizQnPdaIe/YlldV6TgwE2WgeLDCZATBnBOfbMTmTlfxOY4Y8WvxOZ1FQxz+5s+hrOmnsmXPIa1wGVougJ5apx4SvGyJLPhrfN6iXQZ6rU5SnS6spWVUOQn8hM7w+Q732rPj9YKnl2TbZC/fJCJ218uM6uWkwcLNr/uliT0cMt9dcHDEGZNJNyQlqbZFoEfsevgAcw4tQrSkyV/LNacKS4PtxCOYNy6EJ0Pa8nrDMlHTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNHT/HGJn38Jmp7DlvWcXWgCANg6sN1VIOy+bjB32X0P7jX3QZsmTqY3SJ3GZTRFGSfg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   openemm:
     user: openemm
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvF0zOrVUkaN/mi6QOSo1Rj7z3+5UE3KAq9UUptW5jIDEpVu0V8ydik9rtdLvgpeUccbiqSMF56zsi8QnP0e2k/IcStXP2+rbIdj4lVLZ3GNzj19+TLAf3a3IBx+s63aQem35u5lk1mAio+ZIgUdXWXzEyC7+he6Cxe9D3XQlx7WN9L6AmHi1fKF6aqigKlc73FczbqyWb0Se1rpZ6/TwdP6Q9NOAEbEcKKrEFOb0jw/w3td5fUNhnLW9v7/x1MjmyjMAEV2sy8zC9O+OUt33Z2D9vOc+TVOgxfwIBYOP18nkgqzpB2AQd1HVZYW14H8rBO0LOuxB3uGRHyDb4r87KTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB9EDq9LC2CMk/XnIdxnvAOgBBghLZSVEduknclhyVZOqjQ]
@@ -18,7 +18,7 @@ site::profile::mysql_server::databases:
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvF0zOrVUkaN/mi6QOSo1Rj7z3+5UE3KAq9UUptW5jIDEpVu0V8ydik9rtdLvgpeUccbiqSMF56zsi8QnP0e2k/IcStXP2+rbIdj4lVLZ3GNzj19+TLAf3a3IBx+s63aQem35u5lk1mAio+ZIgUdXWXzEyC7+he6Cxe9D3XQlx7WN9L6AmHi1fKF6aqigKlc73FczbqyWb0Se1rpZ6/TwdP6Q9NOAEbEcKKrEFOb0jw/w3td5fUNhnLW9v7/x1MjmyjMAEV2sy8zC9O+OUt33Z2D9vOc+TVOgxfwIBYOP18nkgqzpB2AQd1HVZYW14H8rBO0LOuxB3uGRHyDb4r87KTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB9EDq9LC2CMk/XnIdxnvAOgBBghLZSVEduknclhyVZOqjQ]
     host: 'localhost'
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   openemm2015:
     servername: bat.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
index 74db6ed965494656a7f3e634dc3542fa182a0495..e303284c85950e532d47b00e9c804c383ca032cf 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::role::build_server
-site::additional_packages:
+infra::role: base
+infra::additional_classes:
+  - infra::role::build_server
+infra::additional_packages:
   libpng-devel: {}
 
 accounts::users:
@@ -49,7 +49,7 @@ nginx::nginx_vhosts:
 # Nexus
 #
 nexus::nexus_work_dir_manage: false # Grund: Recursion ueber den kompletten Ordner mit Berechtigungsueberpruefung - dauert viel zu lange ist auch unnoetig das alle halbe Stunde zu machen
-site::profile::infrastructure::nexus::nginx_vhosts:
+infra::profile::infrastructure::nexus::nginx_vhosts:
   nexus:
     server_name:
       - nexus.pixelpark.com
@@ -66,15 +66,15 @@ site::profile::infrastructure::nexus::nginx_vhosts:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem
     rewrite_to_https: true
-site::profile::infrastructure::nexus::version: 2.14.0
+infra::profile::infrastructure::nexus::version: 2.14.0
 
 #
 # Sonarqube
 #
 sonarqube::download_url: 'https://sonarsource.bintray.com/Distribution/sonarqube/'
-site::profile::infrastructure::sonarqube::version: 5.6.3
+infra::profile::infrastructure::sonarqube::version: 5.6.3
 
-site::profile::infrastructure::sonarqube::ldap:
+infra::profile::infrastructure::sonarqube::ldap:
   local_users:
     - admin
     - jenkins
@@ -86,13 +86,13 @@ site::profile::infrastructure::sonarqube::ldap:
   user_real_name_attribute: displayName
   user_email_attribute: mail
 
-site::profile::infrastructure::sonarqube::jdbc:
+infra::profile::infrastructure::sonarqube::jdbc:
   url: 'jdbc:postgresql://psql-pp02.pixelpark.net/sonar'
   username: sonar
   password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp+9rnytCDtvva/oOgepGgyEO7grAntw0VfLTev338YdzmKEXWgu8/f1zPskk/BdUqdBoT4q69g8hLD/lgqFOGUhHRDCInXKHB05YHz/6zwGgYSaEwHoDj/FqOy6uqHuEQXS9ImRh53FtYho+jhXaWo0ID6+EFAycOBLXWtES1+4lPxfS+FTiSv0penNWiACfOc2qEbBx1RIr64MOUtdva1O+TuNMfxvCW2j/4kATqcj6s+WDG5sqBaM4XH579GXr5EtLLk+5BMkPBzswC/mF/qGVMG/rf2YqvAn7L6d51a6ODlg3sTlhUU8P2+jbTOKVSNqq9on/8Hpaa9c7PbPBBTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCDzJLxehok1ciZOwOGiqudgCCyi/pk5qcLZJ+ZGnFdMIt/VTY8VJbVg/8qKoZZJ9mTYQ==]
 
 
-site::profile::infrastructure::sonarqube::nginx_vhosts:
+infra::profile::infrastructure::sonarqube::nginx_vhosts:
   sonar:
     server_name:
       - sonar.pixelpark.com
@@ -108,7 +108,7 @@ site::profile::infrastructure::sonarqube::nginx_vhosts:
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem
     rewrite_to_https: true
 
-#site::profile::infrastructure::sonarqube::plugins:
+#infra::profile::infrastructure::sonarqube::plugins:
 #  sonar-php-plugin:
 #    version: '2.8'
 #    groupid: 'org.sonarsource.php'
@@ -130,7 +130,7 @@ site::profile::infrastructure::sonarqube::nginx_vhosts:
 # Jenkins
 #
 jenkins::lts: true
-site::profile::infrastructure::jenkins::nginx_vhosts:
+infra::profile::infrastructure::jenkins::nginx_vhosts:
   jenkins:
     server_name:
       - jenkins.pixelpark.com
@@ -149,6 +149,6 @@ site::profile::infrastructure::jenkins::nginx_vhosts:
     proxy_read_timeout: "600"
     proxy_connect_timeout: "600"
     
-site::profile::infrastructure::jenkins::jobs: {}
+infra::profile::infrastructure::jenkins::jobs: {}
 #  master-Watcher:
 #    scm_url: git@git.pixelpark.com:puppet/master-watcher-job.git
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index af95ee4511ff7236e9ec4bcf1a38e47faaccd686..03c1b0f2af7be56b73ea9b59005a570a2399dcf6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
index 33099caed4039ee791658a330b80af1f254aef6b..5dec46872f166e8e43540a4f3a7c46b1502cb528 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - accounts
 
index db12a661155dc6359d99f52b0fd73d2516384048..6a18c6b2cff3c4fbc14ca0384cbea85c0eea5217 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mongodb_server
 
-site::profile::mongodb_server::backup::replicaonslave: 'no' # Wir sind eine Standalone Instance
+infra::profile::mongodb_server::backup::replicaonslave: 'no' # Wir sind eine Standalone Instance
 mongodb::globals::version: '2.6.12-4.el7'
 mongodb::server::master: true  # Wir sind eine Standalone Instance
 mongodb::server::bind_ip: '0.0.0.0'
@@ -14,13 +14,13 @@ mongodb::server::create_admin: true
 mongodb::server::store_creds: true
 mongodb::server::admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuqFkinPuJdolvOMOi+oH9Oc9o7s/UZfE+GV1OzfBu9S6YWXFRmKIxePuTzBtZ8CK6vYuAwLa4LGNgurWH0I32ZHzBlpurxr5LvrtakzZpFNR+vGXqy3bFbOLN875gF1pd3MhPQqLF8QzENVsTmZS+LMcd3nScElSHxh5Kvh8gUkWiF+S2fTPvxuyzbLIaQ6O86UC2icZF5NvgY8BzzkPxW73s0RJMYn/8bppfGRLPm3Fq9jsnwtnhLWBFZmaaldo1KxEebwzpKfAuuhvekTax6jqDFYqqJJ9/AKimBlMtgWiqfdeoSI/R6H7wCH7R6UNJJInkc1FxeDzaifwW15QIDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBvZb9OgGhelW0ISjE3sw4KgCCvOTAbNn0fl+DvsgII/yXSZEczVwFF7K5S+zQh5urnmw==]
 
-site::profile::mongodb_server::databases:
+infra::profile::mongodb_server::databases:
   rocketchat:
     user: rocketchat
     password: "%{hiera('rocket_password')}"
     roles:
       - dbOwner
-site::profile::mongodb_server::backup::db_username: 'backup'
-site::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXT58nwkAa/RCgvWlrAnpYtmyo8BAb3zaaSVGPy8tJbH8ah/uZENC5Rn7ffjrHRgROMR5G45Bx8Kl2IdUuL6bzVZouYTHVT8XnVg/qGT02JrNBUKatm+M5uq/Ag58zVg8j+37rhm9w0rJ64hJGMobksCFysLUxnKnVRvISD9VPRDeyu/A6L053b0VSiZnadRYTpG1n4wwFWjzDPahBQyyOQ5vbnvBLfBFBO8ry5XsUQCswzb7UZumMxpNsHxKyE6JytqDHRFDvIxAFmhhVVMvEn4pvkLaDrvEvIXnjh6q6Ytauarx3byX7ikBGsmkDWwdfRSrUJCTfrZkB189ijw7rzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCgD9E3wxrlhMiPjXJattskgCA0UXFyrpqUBV/2d2ThSeWcX1/GmXWujME///bh7llFQg==]
+infra::profile::mongodb_server::backup::db_username: 'backup'
+infra::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXT58nwkAa/RCgvWlrAnpYtmyo8BAb3zaaSVGPy8tJbH8ah/uZENC5Rn7ffjrHRgROMR5G45Bx8Kl2IdUuL6bzVZouYTHVT8XnVg/qGT02JrNBUKatm+M5uq/Ag58zVg8j+37rhm9w0rJ64hJGMobksCFysLUxnKnVRvISD9VPRDeyu/A6L053b0VSiZnadRYTpG1n4wwFWjzDPahBQyyOQ5vbnvBLfBFBO8ry5XsUQCswzb7UZumMxpNsHxKyE6JytqDHRFDvIxAFmhhVVMvEn4pvkLaDrvEvIXnjh6q6Ytauarx3byX7ikBGsmkDWwdfRSrUJCTfrZkB189ijw7rzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCgD9E3wxrlhMiPjXJattskgCA0UXFyrpqUBV/2d2ThSeWcX1/GmXWujME///bh7llFQg==]
 
 rocket_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc+MotDbT3tEy7dKnbY9JHQfYVxnHCdKI2l9XuuT81eEXBce98XzayrQlI/syZK3YJLM8vMbwlP4RoKbltKogFSlyo7RBvcFjvnVtY3TidVToxQVb4pevoTmkFNjfRepbbTuQXCWTR9DtuvzTDN21Qy7QCkbGLDZ7692KCI6rg5fqzwKYXckg2TZXpCA8LDQjOIxTgbYehHPwL3Hgunl2tYr5RWIljD2S7rr8T9wo2hvkidgH+Nawjh6Vm044W/jfbFTlxzMM++zNh3WhIggcayASMnUz2+96xUNKbntQH6o6e8Kepp5ov+9U+XWV67QpYzDt0eiJ7kN9j/f20yvQmTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB4NUdTgbxirg25xY9VB+jMgCA2fxdarOz6j9/VBwynHcf57mrQFwjzXcwIVMkBsGrJfQ==]
index 7219d11857550d5e00707d343b503ade278073d6..e9ef6b2d3c8d3775d89022d5da3fb9aae35ba584 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - nginx
   - nodejs
 nodejs::repo_url_suffix: '4.x'
index 3183458bfdc9311fffce10af101ccbd267cc083c..a91c52d9ff8c92c780bdceb5830dc934c9a835eb 100644 (file)
@@ -5,7 +5,7 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
+infra::role: base
 httpd::webserver:
   confluence01.pixelpark.net:
     modules:
index f8e79e1375a0f661dfc92cb3f5422e7a988dfb1d..fa6ce89a4cb1e19382691fb2da054dde2f6678a0 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - accounts
 
index 5f98cf599173c8d4bd19c63dd570cea93b7566ff..53c73643c0e0a278306b627a42dec4a6001fb6eb 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - logstash
 
 python::dev: true
-site::profile::ansible::optional_packages:
+infra::profile::ansible::optional_packages:
   openssl-devel:
     ensure: present
 
index 7bb1907af611c63b3b7943dfd64baf3ca4ab4a6d..9f9a569464c752d3744e8733df6974947384950a 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 repo::remi_php70: true
 php::settings:
@@ -15,13 +15,13 @@ accounts::users:
     apply: true
     group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   nl-frontend:
     preview: "Dwnkip1!"
   Limitierung:
     extern: "pixel2012"
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   design-berlin:
     servername: design-berlin.pixelpark.net
     docroot: '/srv/www/design-berlin.pixelpark.net'
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 627adf09a3042b428f10bbba0ecf9d6115914272..b67f2fee78fe0afc2100adfa8342a1c843822b92 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 # icinga2
 # TODO: has to be applied on common.yaml level
index 92a85259d06463e437a0b7e74891d453e413cd3f..95648bfc4e195409b08da07e2b949efe4148f5c9 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
-  - site::profile::icinga2::master
-  - site::profile::mysql_server
-  - site::profile::apache_php
+infra::role: base_for_old_systems
+infra::additional_classes:
+  - infra::profile::icinga2::master
+  - infra::profile::mysql_server
+  - infra::profile::apache_php
   - accounts
 
 
@@ -30,7 +30,7 @@ icinga2::feature::idomysql::password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYC
 icinga2::feature::idomysql::database: 'icinga_ido'
 icinga2::feature::idomysql::import_schema: true
 
-site::profile::icinga2::object::user:
+infra::profile::icinga2::object::user:
   'icingaadmin':
     target: '/etc/icinga2/conf.d/users.conf'
     display_name: 'Icinga2-Admin'
@@ -44,12 +44,12 @@ site::profile::icinga2::object::user:
     target: '/etc/icinga2/conf.d/user-templates.conf'
     template: true
 
-site::profile::icinga2::object::usergroup:
+infra::profile::icinga2::object::usergroup:
   'icingaadmins':
     target: '/etc/icinga2/conf.d/users.conf'
     display_name: 'Icinga2 Admin Group'
 
-site::profile::icinga2::object::host:
+infra::profile::icinga2::object::host:
   'generic-host':
     target: '/etc/icinga2/conf.d/host-templates.conf'
     template: true
@@ -68,7 +68,7 @@ site::profile::icinga2::object::host:
     retry_interval: '30s'
     check_command: 'hostalive'
 
-site::profile::icinga2::object::service:
+infra::profile::icinga2::object::service:
   'generic-service':
     target: '/etc/icinga2/conf.d/service-templates.conf'
     template: true
@@ -103,7 +103,7 @@ site::profile::icinga2::object::service:
 #    assign:
 #      - 'host.address'
 
-site::profile::icinga2::object::hostgroup:
+infra::profile::icinga2::object::hostgroup:
   'linux-servers':
     target: '/etc/icinga2/conf.d/hostgroups.conf'
     display_name: 'Linux Server'
@@ -120,7 +120,7 @@ site::profile::icinga2::object::hostgroup:
     assign:
       - 'host.vars.os == Solaris'
 # TODO: feiertage!
-site::profile::icinga2::object::timeperiod:
+infra::profile::icinga2::object::timeperiod:
   '24x7':
     target: '/etc/icinga2/conf.d/timeperiods.conf'
     ranges:
@@ -152,7 +152,7 @@ site::profile::icinga2::object::timeperiod:
       'may 1': '00:00-24:00'
       'october 3': '00:00-24:00'
 
-site::profile::icinga2::object::notification:
+infra::profile::icinga2::object::notification:
   'mail-host-notification':
     target: '/etc/icinga2/conf.d/notification-templates.conf'
     command: 'mail-host-notification'
@@ -214,7 +214,7 @@ site::profile::icinga2::object::notification:
       - 'icingaadmin'
 #    users: 'host.vars.notification.mail.users'
 
-site::profile::icinga2::object::notificationcommand:
+infra::profile::icinga2::object::notificationcommand:
   'mail-host-notification':
     target: '/etc/icinga2/conf.d/notification-commands.conf'
     command: 'SysconfDir + /icinga2/scripts/mail-host-notification.sh'
@@ -255,7 +255,7 @@ site::profile::icinga2::object::notificationcommand:
 # php + webserver
 repo::remi_php70: true
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   icingaweb2:
     servername: dev-monitoring.pixelpark.com
     docroot: /usr/share/icingaweb2/public
@@ -287,7 +287,7 @@ site::profile::apache::pp_vhosts:
               - "^.*$ - [NC,L]"
               - "^.*$ index.php [NC,L]"
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   icinga:
     listen_owner: apache
     listen_group: apache
@@ -300,7 +300,7 @@ php::fpm::pools:
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANSTyR6Pk9055IleFmvafEqP2Bw1cjNAbzCStB7VhszpUKhbCJBjGgonZieTO9sN7R43DU+nzlzqGI1Z0D6oG4MrTZquNmfWzMsag6OtMnyo0kKjQpKEVvXmqqKf7d8Nx4kcFhN0LUAIzbqOP/QKhcDiC7X2cuU05pYz/oHjCL7iY6PcBr9ACzLuDgHE/SzsoYxoHblriaOn0Mhajh0XrvxlAHwlskIN0aZQuVDOCefaa9/RLunnzBpeXyWHpFRs5kcwVIIE3eMNtjC8iZz4BZsZcq6x7ZZusZr8by/QdClbesrngCneBNcdpL1pQlxysowO5LlZ9OSN/rT8IeDrR8DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBraeKQJkRAyEVZKGEhrizygCAM2krG2PgGrkFpg9huZopfwdIQh1JNKc8FZEXR7v+nkg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAv/nHHag2KidJTDIgxNWJ+DDvpAKriL2YZkZKPSXBLQKc8p0ZO6OED8SsBkW8UV3YZF4c9aLDW8KgaFV8pVRwBDnSylKh/N3Mt8ve9Ml5MMeBAYOiStBJGeKcfDdTeaTx0SiHC8k+mkX/4m8VqbXP5weP1yp1Uhxj6QsHaMODFPrxy9FsYIX3iB1BWm/gp6wUu3xUH/5GqUVyvpxP8LEFXQsz20ec0ATSH3i/IgBNXHm9f7NJ4Sg6PAHSsMQzDxHZj5FnNFVkyw0ucXg9KMsXeZE69ix01l3AybUv+QYF6VYV9wxpaNCdYY/lUS5JiXW7LL8pdF+gDTriXN72Xl2tFzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATITnSI6urzadVfTHjArZPgCDOWfe9jxPEvmqoxZMH4jXWZmEupCtI/IAF08TWYUyBwA==]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   icinga_ido:
     user: icinga_ido
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAEWZ145rxmeT8ExolYh9bxRoJu3rPMvhH/T308Mt59XgiYICw4KMsIom+H2aR0vOQxCyjif6wsohdQFN0Ds4W/etkfBPtj5Q7vUDBBnkABYAfu3AjSyW6JLncb2qmQq8MnEa+nG3oYlKfrwEDFZSBFlRQUKuEuKagiCnP78RKEd/84Hpbx7Lqa+lehObRt0K35hTb17oegf3l7sDbB7eOPhgjduP3X6JIONM5+CvYQkHz4+lpoKTsEufLSYChoFREeUjYmVPhROITPc0aQGdvz8fSAZ1YN0ZyhOe5k+l2gj80mFBMC80N9BpEZ+yVRfvmPPoHuVpVkuUInW8SAi+4qDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDu73p8hXRkJYbXYLgPJVtbgCAdu7/9/Cl0dF7jzAp2h4J1EqEUNqPF721qq/dr9VOVBA==]
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index c108aa463ee7ff31754d452aa71c680f88184895..2dcc34555b553e569f04653f3b3c219b30f93277 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-#site::additional_classes:
+infra::role: base
+#infra::additional_classes:
 #  - powerdns
 #  - powerdns::backend::gmysql
 #
index 96d797ef6475a976f149a2be568400ffc11dc882..9215582ae73287c1a7af72da563711f2fab58cfc 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - powerdns
   - powerdns::backend::gmysql
 
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 36a6c12aecc48077f8e8791dd662463a6ebb14a0..fddcce22a0aa0197372a0d4dfb76bee13c494cc6 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - xymon
 
 xymon::modules:
index 20061910260aff9dea3cb4108d95187f7245927b..e2f9e3305f55a1a0b61573668565451285490e54 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - accounts
index d1d2b2854282cb81ee417144c2a8eb4c6a64a6f5..30ecb608606f130527ba522e3f026c904cc9b6b5 100644 (file)
@@ -5,11 +5,11 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   extranet:
     docroot: /var/www/extranet
     servername: extranet.pixelpark.com # wenn fertig umgezogen
index befd578741448a5aee3e0bbf469e4d02368ce4a4..025d5688d9cf0002917a3aee6632cb6e27f643c8 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::passenger 
 
 
@@ -11,7 +11,7 @@ apache::mod::passenger::passenger_ruby: /usr/bin/ruby193-ruby
 apache::mod::passenger::passenger_root: /usr/lib/ruby/gems/1.8/gems/passenger-4.0.18/lib/phusion_passenger/locations.ini
 
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   foreman:
     servername: foreman.pixelpark.com
     serveraliases:
index 17857dc070312d8de2ea30391cc5a89ac3cb0948..6161ee4b4d88a9bf1c0f8b6f04771b97bbdcc817 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - python
-  - site::profile::apache
+  - infra::profile::apache
   - apache::mod::passenger 
 
 
@@ -11,7 +11,7 @@ apache::mod::passenger::passenger_pool_idle_time: 600
 
 
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   foreman:
     servername: foreman.pixelpark.com
     serveraliases:
index 83e24db66e3bb44a81e2348f910fd16e641e9a9d..aa439e1d4fdc1242cd1983fd8f76322a96350d6b 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   carsten.hensiek:
@@ -18,13 +18,13 @@ accounts::users:
     apply: true
     sudo: true
 
-site::additional_classes:
-  - site::profile::apache
+infra::additional_classes:
+  - infra::profile::apache
   - java
 
 java::package: java-1.8.0-oraclejdk
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   firstspirit:
     docroot: /var/www/html
     servername: fs-training.pixelpark.com
index 1ef447873e2ff421211832281b6139bf882b886c..34de3a1f046d0badb7b539cf482d1cba35efa202 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - nginx
 
 repo::redhat::oel7::ol7_UEKR4_enable: 1
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index af95ee4511ff7236e9ec4bcf1a38e47faaccd686..03c1b0f2af7be56b73ea9b59005a570a2399dcf6 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
 
index 1a8c5a20242a36c3a48991e89c8c2d00e4a30dd8..31d46bec4a404a117b7d087b0e0b8d0fdcb653c2 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - xymon
 
index d2d0c6e807e2b886614c47ed9393486a539dea74..cff48ae2f1deec6976a887802b1416aaaf89a551 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - accounts
 
index 8357665a306b31657be1c913d914183a552ea7fc..d06336c42522bf77e38cd8f987406a5ecde51e6e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - python
   - motd
   - tcsh
index f6855a71f47b80d98e64e85acd2f34f43c2b38a8..b05138fa79812e9309186fe0a04de4feec76a007 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - motd
   - tcsh
 
index 4c5bc6d0198e798eb72951265a797510df40452a..a709c950c43ecb7e30ded298b5b99fe0a1478f22 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   jenkins:
     managed: false
\ No newline at end of file
index 0d57db8be2fdec39fbfdf8911ceaec85f262d539..ec162249134762328123c7d5bab1b73eba9bf585 100644 (file)
@@ -5,7 +5,7 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
+infra::role: base
 httpd::webserver:
   jira01.pixelpark.net:
     modules:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index e2f678cd4d71f86fcb08e949a7b8f51ecee9aa96..ad484e4f960547ce7f122f060f1e1997c7b0e44e 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - zabbix::agent
   
 zabbix::agent::server: '217.66.51.48,217.66.51.91'
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index a00e3e17bd2a7c0faca69e0c9b1922fe82943384..d73e4952e381705ce0886b1b96fa0cacda4bda83 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - logstash
 
 logstash::generic_resource:
index 5ad053ba5464a43e51b25a2bec686b828142df2c..6cecf7a11852e099f051de8d255cefa176d1cec9 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
-  - site::profile::cron
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
+  - infra::profile::cron
 
 apache::mpm_module: event
 apache::default_vhost: false
@@ -57,7 +57,7 @@ sudo::configs:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN7szcfcnX9TfHlbjsNhnd1FgzPDFB7G2I1O02xxh3LUnqESOEeTz18hhU590UyRd1BHt8oLByKDhwHALcdo9td3Np3M+FYYoqKtEkNvLw7Ttu90KFUVgn6/ErIoGbUBhUf2yu2Q/DO3Stp/nbtOhTpn/SngYVf5u5ZjXSslUTq8FJE6g8McKCbxOSsTaA+kwohBdsl0j6h/W39PQqxSPalRAKJJDAfvxeDm67ruC8Jpu/2ekB6jq8XKjIV392fi+ttEg7k8OeVWSSEyVv+FDZC6KaDRRavbadEonW6CZ/RGZaL5sOFHRULyDkTiJ6UfuHzl28Gs+NESnchaU2uQc8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8DXqmI6LeV+K/566n/vh7gCABNWwZYMf0soA2wFT0MTxi0G1+5gS9Zx8oc59dcuV89g==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGVXLsUCc0P/kikdJT+OGIjQcYnlw+B3tYHWM/dfbTK35BFonXIFQ5JL/0IC50sT2Lbbm/ezUbsiFonY+a2n2SOVVK1y3UpzJgkXrBES7MCTaNfA+PRXNF5o+m6hchipQdntmW5b+2AdM9blKLM76U9Kfcgzlsma4r5Wf0aEcucKRR5EUVH/fvvnv2F41YtYTtmLPlDK00FmpwTn9OLnUrRA4QbZyLZqer9qSgwZpE9jlbPp7J6sloRQ92WdhAzKKrI7cyQZaWKIrtUzp/Ldnf9tqKAlgf/r/f07PzdHMlpw4AnJLeQs+RTGldz0Uqttt+cRF9O7ZvxgUfAQhLfCtbDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC95xRcgRUWl/89+iQk/kD/gCAXmMLr96bFusgYyL+4ROndwzZYoQyzdRbDHTM0uhdlgg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   marketing:
     user: marketing
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJGLMpQ7VzR6LPqpfQQt+g9wXJ1JKGSAqXCo91ei1QHz8GCYvKhMhivW9Wlqre3HfeFAObCWgZz92jU14QY+V33cP9MHcBhfOVHUsCuhUE2K20YIZSKEPJP1tsQMn6tBbWIPXAO3wPOvU3rxsHYis16g8NPwaFPVRCyMlCIbPhPO3cvhSiAMdkBdayXYDqK3GgYjglzHnZWqKHirC2LX/H8izdQtZunpOtA6wseNJ/fzd8Qx1455aY8b8GVbT4iVWpV/jWZTM8lmTDMMY4iwlTsXdY9hWFpAHL4liBv8RcqBkhSAOrOWxjGjaSLZ6tiVzOHakpw0tZ1T47fxzRIHK7zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBoeWoq3iI+9CJ7zoaffigYgCAnadODjjPPZaI4cOWwZUr3FTmqA4gHLiuxsv5TgpcIcg==]
@@ -66,16 +66,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   marketing:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtuT7sj9WgMDPXbw1Ry4ZcUXgxMd33lkJ8kqKy5KkVFgb3nCp3iI5qJZb+Y5vH0QLZPw61Y2CN7Yyowr9+nxduBHMbrpMztKzXYSGKt1Plry0IxJT+EdzK2fBgw9MNZIztNVR70STtt3bZtuyUMY2R2W84V8Zd3PxQAtEo69P4JL8gOd8K6/e2Rrbu8pukxBv3hcKw4CDjp6qYTg8vo6oFnJl9tNFi8DvrxUiXfnZNTQ3VDIHbiA2m8obRFYzLSurgleXWs14q5h2VWGia4V5XgVc2IhRV56lrD7sB/xtbW3kWPSFKnVL4w0CdvolJB1AmsPtgdjcZe+1OW+2uJB3jTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDulRdb3CWUjL7Pj/g+xoxjgBCsRQ1f2EyLm4TR+ywXmY2y]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   marketing:
     docroot: /var/www/marketing
     servername:  marketing-publicis-ai.pixelpark.net # Realserver Name
@@ -112,7 +112,7 @@ site::profile::apache::pp_vhosts:
       - 'MAUTIC_ENV live'
 
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   mautic_update:
     user: apache
     command: 'php /var/www/marketing/app/console mautic:segments:update'
index f652a242bed217144b9239701b2788dbdcbcc1db..070a1a04590657a428212f22f4a64d9a696de5a0 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
-  - site::profile::mcollective::common
-  - site::profile::mcollective::middleware
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
+  - infra::profile::mcollective::common
+  - infra::profile::mcollective::middleware
   - rabbitmq
 
 rabbitmq::delete_guest_user: true
@@ -26,12 +26,12 @@ rabbitmq::ssl_cert: "%{puppet_vardir}/ssl/certs/%{fqdn}.pem"
 rabbitmq::ssl_key: "%{puppet_vardir}/ssl/private_keys/%{fqdn}.pem"
 rabbitmq::ssl_cacert: "%{puppet_vardir}/ssl/certs/ca.pem"
 
-site::profile::mcollective::middleware::middleware_admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQhq14SLl4sOEMuIQrr/C4hQcUytStmX7J4VNkkquOHG7TiApBIXJANVvizwffDTW0o8hdcP+wXwD+6ZWD6hNpGBPSsoJqzUIyhlYs+mWPsmhymRgIVsAGYaNeynT1jfR4vBNH+mli8c1N4V7WVY4Z6QfSOr0OV+/Q2Iyg3KdkjJ8GChQIZGV4hjPKJmMBkH2oOWucbb8zxnIw8A/U18RIwf7EPTqoY+XCgYe5UG2kpy6OsWqAq7c6+r80vqc8IQGVvPqzMmd/wNNsbhWTsQO7KTArLJp3B4sAJzQa3hel+id3eMp0VlXQkTlgSD7JqtpB0YTb/IhwgAzXZ5PIn/4xDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDUIUJX1Et6IZ2I6qDpyHrvgCDjjA10thdhvKI5cnynMm15+Rlp+0u42FAJdRzTYmab3Q==]
+infra::profile::mcollective::middleware::middleware_admin_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQhq14SLl4sOEMuIQrr/C4hQcUytStmX7J4VNkkquOHG7TiApBIXJANVvizwffDTW0o8hdcP+wXwD+6ZWD6hNpGBPSsoJqzUIyhlYs+mWPsmhymRgIVsAGYaNeynT1jfR4vBNH+mli8c1N4V7WVY4Z6QfSOr0OV+/Q2Iyg3KdkjJ8GChQIZGV4hjPKJmMBkH2oOWucbb8zxnIw8A/U18RIwf7EPTqoY+XCgYe5UG2kpy6OsWqAq7c6+r80vqc8IQGVvPqzMmd/wNNsbhWTsQO7KTArLJp3B4sAJzQa3hel+id3eMp0VlXQkTlgSD7JqtpB0YTb/IhwgAzXZ5PIn/4xDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDUIUJX1Et6IZ2I6qDpyHrvgCDjjA10thdhvKI5cnynMm15+Rlp+0u42FAJdRzTYmab3Q==]
 # Password für MCollective Channel
-site::profile::mcollective::middleware::middleware_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbiONpIROd+0gOLwd9g3YrG8rbKs9IE3XRVvbkolYM06y8ViFEawJZHrg8BhguIuxEPQAqXPNWdbrCiPrTI50tItmtlPIWfkoI32fcOH6Ztxio/iQceYbm77K5eRqkB6S+MBPB9NDu5g6JWscy5B6UKQwezZ+KOsS61BzvoCGEEi9DTj/0Z0QPA3lVil+m3YVMMJyqaS97l2Vho2gXbQMZRiI5zXzYvJQRk90gDenAkeqmNU6w68qcyNCUZPEuPn9S+4TjZRCEWIRld1dNHnfyAdg90G/pXT/HhS1JSixblgn2Hokn4b2zMtQPwDiBjDRUOWUfCgMRIjvLAn/8IbcUjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqEp+afH5LF7D0Z3g5PSs2gCBh4LwHt9Q9UFCF0OM6yikhfmSZhs6SusoIUKgAQxxvOA==]
+infra::profile::mcollective::middleware::middleware_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbiONpIROd+0gOLwd9g3YrG8rbKs9IE3XRVvbkolYM06y8ViFEawJZHrg8BhguIuxEPQAqXPNWdbrCiPrTI50tItmtlPIWfkoI32fcOH6Ztxio/iQceYbm77K5eRqkB6S+MBPB9NDu5g6JWscy5B6UKQwezZ+KOsS61BzvoCGEEi9DTj/0Z0QPA3lVil+m3YVMMJyqaS97l2Vho2gXbQMZRiI5zXzYvJQRk90gDenAkeqmNU6w68qcyNCUZPEuPn9S+4TjZRCEWIRld1dNHnfyAdg90G/pXT/HhS1JSixblgn2Hokn4b2zMtQPwDiBjDRUOWUfCgMRIjvLAn/8IbcUjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqEp+afH5LF7D0Z3g5PSs2gCBh4LwHt9Q9UFCF0OM6yikhfmSZhs6SusoIUKgAQxxvOA==]
 
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   messageq:
     servername: messageq01.pixelpark.com
     serveraliases:
index a198c94c83fd9e39313b469e3cbb826e1e635ad7..3b2d165f5aa448a03f4ce7497b5a4e8cf0f6e368 100644 (file)
@@ -1,3 +1,3 @@
 ---
 # time03.pixelpark.com
-site::profile::ntp::disable_ntp: true
\ No newline at end of file
+infra::profile::ntp::disable_ntp: true
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index efd1defaf1b616c267b5525780ebf688cf36002a..f2d282cfe6c63a7a95de32f5ab9e1e675f9830b7 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon 
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon 
+infra::additional_classes:
   - accounts
index 2f1eda15dd2b35da075f3320c91463a97357119c..f0e1379c1f7e0ebcf703f9cc0ad6a5519a1fe598 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   ivan.prikhodko:
     apply: true
index 8f383d1fe26397142124636938037cf99c4f9c12..f173bdf7828db1ece30a7fbb42dd2557e6ea7b49 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
 
-site::profile::mysql_server::backup: false
+infra::profile::mysql_server::backup: false
 xymon::load_warnlevel: '2.0'
 xymon::load_paniclevel: '4.0'
 
@@ -14,7 +14,7 @@ mysql::server::override_options:
     innodb_file_per_table: ON
     max_allowed_packet: 512M
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmhaYOecnhmbu0DsrhkWCg9Y5cb60n6SWq54h/bwukjsVZ5FxTwtnWpqD3Y6fale9OA840FTmh3XrBzVlM/Gc4UxGWXHKqH8S/oEtwgtKGhbk6ZoPquRR7hWdThjXzVNMJPsDkNSQqyz8aHPXuAns088aZMCAfQFZWcyEyZmXHtsg3UIsPSZZDjGhrm0umDgN8kO6EJ0oslQrR+XE+7t1Qx/mKPQswsE/LYLwTvdzSYrQ4HPTdu2MiU6K+Qt61s0lCG9QfIpcQPlO5RHrzILuiZ++by7zfo4aKu4sSrlfa6PPaMgkLTfMo8nELUI1CcgZnNL2WzPWGksvEKEeeCbZFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGbHoldhvmNM/pzGYiUUVvgCCttHRovkVMMCgIvhPohyKHo0uNL+UW6E0MU6iu/viS3g==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   pdns:
     user: pdns
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkDloiQBQekR+SJiiJbIoLvu0TrAb+SKyZeBiwUDsjuoCxBiYavuqzQ4FfL3Zsv4oF0q6uhe76rfgOI6olBoD+vmBr1NtfqUHRBbUrR6gN0zB9IiV51YZP3Jb/KgTD9s78KKZCPayaTnMUM2ZCD9QI5iRI03v6JlW5S2BHJsrRvW5473YRHJcYJwQ8/rrtwdAaEgdAzSuF+STrHpEdkEb5VqvWqpv8LqHw+BcIV4OGs0KO97sTu/h4H1NwlaDPofZTkd2QdOemDZiwFAn/mKrZ5f22wnscv7iqovLP7WMpywhtuY7cojeqvBja7HlDs/LDreufN5UJs8tfY6ucFSDgTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMJlKR+ekjNsxR70f8mYkcgBAUmmZcK8NohsFzfMNzTIhg]
index eabe824d0d99f8b7340a2134da6ef5e13fe70aca..45b4bd1378564a070c82371b8a86e504b6e51e28 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
\ No newline at end of file
index bfdaf51bd4cfd18ef6a6a13f530122aeb2f0a938..d3ef044040bbe9fca5242dcbbde7a9efa9b13d3a 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
-  - site::profile::zonehost
\ No newline at end of file
+infra::additional_classes:
+  - infra::profile::zonehost
\ No newline at end of file
index f04f7d9057f1952cde935c9463daf273394dfb03..93a800b8fcb3a186639f1b33b50b5f9d67010d63 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
-  - site::profile::zonehost
+  - infra::profile::zonehost
 
 accounts::users:
   tobias.kostyra:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index b45d9c9de28b90485b53c97520ecf193c4820809..b01e610d348922a1e900f39ae9c5a3e53527efe7 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mcollective::common
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mcollective::common
   - zabbix::agent
   
 zabbix::agent::server: '217.66.51.48,217.66.51.91'
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 380f8e83b8ce3e14029bbe8d801b5ebb6c298e96..006e5aa6f850f5648925943e8f18231e59c10bcd 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
 accounts::users:
   stephan.vits: # Rollout Stephan as Tester
     apply: true
     sudo: true
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   owasp-zap:
     servername: owasp-zap.pixelpark.com
     docroot: '/var/www/html'
index e76a8b12823fae1b672f4e72e777c964528dd1cd..b75c0428bfe9c7de5e9b7a8fcb0a6662cede8793 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - apache::mod::headers
-  - site::profile::apache_php
-  - site::profile::mysql_server
-site::additional_packages:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
+infra::additional_packages:
   php-ldap: {}
 
 apache::default_vhost: false
@@ -27,16 +27,16 @@ repo::remi_php70: true
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAwfRzr/5o04J4sIhtNeKVQdrWzl7yogwkxMrgJ1yt62yGucU2UCPXlwq4PO9jdjbhrRDozT12295AqWftyD5olAVGLy4Lztel8OfQJLDTLrGWlquvTEFXsgS0efaHTvuKgB80pMrqBkZMnaOmgBcmV6OMDlBsRMa82kz/1wVYlQlIu9v0vhE+/uIPD7KfZ9iUCzf7xugatX9kIxWtFJcWz8vYZFl65zdvErgSlZdSRZ9SaKy2wyZ+CQz86kM7wpWTtXBSDHkc/iFkCxk0Z4/u3uhWrdgc53rlb9rQrqNEljmeLSeaVAsg1pyYXGfmpvdlsK8ydD3BzpZmCcXgeqmCSDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBmjfqDDVaCeTJreLfOTtBNgCB0IrZZngyOe/twae/fmETPLBkUd2afydDevS2bBSHE3Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAl4VkgdDgHBOTsa9Q4ska1oWDZwJ0Q85LhOh7jR6z3i8IMy81WvJjOIg6mib89VUO+HbATTW51GJRhaeVNdKJFyOy5UKqg4ZOx0985LPbuZTAqu3Rg9QAd38qR4wDCNjJfnokfv9UJBOxBCZ94AtDjp59ZxIkfpg/HnTeQjmducOmjOoGyLjy8XJMKeYIv0vKeOcQ9/+1Zo3rU9gXnlUZucpl0tudVv1siSPTnD8VO25T7c7jsQ6/x7G9yF5l6eB0JembetiqMxfmo4Ba/J7RoM/7zem+W3A+WXlvyOTIQfY+bDMmmE4m3pvckG8QYv6VlYXRFMw4l9USAwKfNJm15DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYNnwJzVTMUbs9+p9io4z5gCAA8deoZ9N/rMqDoX0ftSx7sEgluMcQTbxcuEPjpMs3rw==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   teampass:
     user: teampass
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQ8ZZyCHS124bMc0eWDeY+lsjCRNTdj4ONDspCQIokwSwVZUshyQ90qJ/Y5r6qn9JEUj8tC0zfP4UH00vnhXKhl3P0ph+ljJCdS4KWHGowP8QaC09vwT6rDY3fTIvCQ6Q++qpqglrd3oqowk9Q9omL9Q+ETDWu5IjyVAqbnW1aefGGlZ+Hg9qvDQvzhuwbdDE2cdchGE5iq9/oTj2fM6hpp9PkvevyVQ/aDl7yhuFuQbeliEI2jCwWTA6fd+UeW1d7P1xXucTA6ZFv2GRYl/wtEolLRffQnt2Ka+G8ecUSVZoYc8hBZ2ygXW4AxobPNFIHDK5mOLTBPNx3tRMsxfLqzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB+NCnWIm/Qzp2nmm/oBvUggCBBM0KB2cpavylLZv49hOykDFbsYEKkNoc4I95cAxPT7w==]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAaitVIVD34ARrwWvyrMcU8DdP+9ZAiO1UEcahqAkRacZLeU1ky/UkUISwmp18uPD3HsbJ3L7qhAxdKQO9x5t/jMbdK8HcbQSvZHEayeY38M3v+Ow2iHDx68WEc2OGaorL7X5vslEmK1RBYoUvjy2s/JnEonTFuW/T9UNsaJjEg0BWWWBwXlDGTa27+frlk/PJoIb977ursFALyz26KvFaqVdlgkUWlCRBHClAGmdR3jSQEDrKZwMt1BuE+lp5hehQEhha9+UVoRkzKlmEzhuubGpUTEzb+q1ecsjFl4AoRf3e1uuKAiuopMdHaCLOvxhODM3mNQXCnTnLWh2oW7Aw9jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0kHRnHmIB1xLiVnJeWnxUgBCLXCBEoOXBcELc883TKGlC]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   teampass:
     servername: pass.pixelpark.com
     docroot: '/var/www/teampass'
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 359ea68f12fbb31d144b14dcc8eb2549591ac79c..fd3276132d9122fded1477cfca7060f0770e4241 100644 (file)
@@ -5,9 +5,9 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
-#site::additional_classes:
-#  - site::profile::postgresql_server
+infra::role: base
+#infra::additional_classes:
+#  - infra::profile::postgresql_server
 #  - www_tree
 #  - pp_postgresql::backup
 
@@ -34,7 +34,7 @@ postgresql::server::ipv4acls:
 
 postgresql::server::listen_addresses: '217.66.53.169,93.188.104.42'
 
-site::profile::postgresql_server::tablespaces:
+infra::profile::postgresql_server::tablespaces:
   ts_confluence:
     location: '/www/data/postgres/ts_confluence'
     owner: confluence
@@ -57,7 +57,7 @@ site::profile::postgresql_server::tablespaces:
     location: '/www/data/postgres/ts_gitlab'
     owner: gitlab
 
-site::profile::postgresql_server::databases:
+infra::profile::postgresql_server::databases:
   confluence:
     tablespace: ts_confluence
     user: confluence
index 757a3c0a39ef6f5888e642ed308a1eb1480d7c95..b360ed5c9247e8a9fc05c13458b28174f384144a 100644 (file)
@@ -1,10 +1,10 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAs/K2knCaiWzeMpTQWGpAQZod1YKxSQg0ZO8n6s230mFsYYvnRHa8eZGAQZjHQj4pKgafx1fNJeWT2zoFKYgS+Y6K+xsK6qk8QEyxrEPYaBcQfjmp06hENYO1kQskRbT8Z4OSoNhDkxnJAyq0SVE57bGYkQ5rLAA5HJjfPDEXPKqJojCFTAX44EyTJAnNsB0KCvOqymq5SYr4Q62mYMmboprXdXQ0ZC0GSfm9qqcL5y/Ch+RLZ4+v1yPzo6mdVv5ArnC2Fs8oTNKkp9DzdSTWZ5c1CpdYE8xJTpehH/Hdcwt062vXNLifDZ4dIJYw6OdKZ95vSl8MqQ1daByyjkftbjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD4DV37mVbm6TwfY9yDSKzRgCBbGVzQWqpbHGchclTcHoJ9W/EZy4oRQLPOqT/kWRM46w==]
-site::profile::pg_server::version: '9.5'
-site::profile::pg_server::configs:
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAs/K2knCaiWzeMpTQWGpAQZod1YKxSQg0ZO8n6s230mFsYYvnRHa8eZGAQZjHQj4pKgafx1fNJeWT2zoFKYgS+Y6K+xsK6qk8QEyxrEPYaBcQfjmp06hENYO1kQskRbT8Z4OSoNhDkxnJAyq0SVE57bGYkQ5rLAA5HJjfPDEXPKqJojCFTAX44EyTJAnNsB0KCvOqymq5SYr4Q62mYMmboprXdXQ0ZC0GSfm9qqcL5y/Ch+RLZ4+v1yPzo6mdVv5ArnC2Fs8oTNKkp9DzdSTWZ5c1CpdYE8xJTpehH/Hdcwt062vXNLifDZ4dIJYw6OdKZ95vSl8MqQ1daByyjkftbjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD4DV37mVbm6TwfY9yDSKzRgCBbGVzQWqpbHGchclTcHoJ9W/EZy4oRQLPOqT/kWRM46w==]
+infra::profile::pg_server::version: '9.5'
+infra::profile::pg_server::configs:
   shared_buffers:
     value: '4096MB'
   max_connections:
@@ -12,7 +12,7 @@ site::profile::pg_server::configs:
   work_mem:
     value: '4MB'
 
-site::profile::pg_server::dbs:
+infra::profile::pg_server::dbs:
   sonar:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp+9rnytCDtvva/oOgepGgyEO7grAntw0VfLTev338YdzmKEXWgu8/f1zPskk/BdUqdBoT4q69g8hLD/lgqFOGUhHRDCInXKHB05YHz/6zwGgYSaEwHoDj/FqOy6uqHuEQXS9ImRh53FtYho+jhXaWo0ID6+EFAycOBLXWtES1+4lPxfS+FTiSv0penNWiACfOc2qEbBx1RIr64MOUtdva1O+TuNMfxvCW2j/4kATqcj6s+WDG5sqBaM4XH579GXr5EtLLk+5BMkPBzswC/mF/qGVMG/rf2YqvAn7L6d51a6ODlg3sTlhUU8P2+jbTOKVSNqq9on/8Hpaa9c7PbPBBTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCDzJLxehok1ciZOwOGiqudgCCyi/pk5qcLZJ+ZGnFdMIt/VTY8VJbVg/8qKoZZJ9mTYQ==]
     network: 217.66.55.64/28
index 0caa7fd606c1afb03e1b61f5e32b3c86cff7d793..4f4e79bfb83eee0a66c2249e384cc5a7d9c2e655 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - pp_mcollective
-  - site::profile::mcollective::common
+  - infra::profile::mcollective::common
   - apache::mod::cgid
 
 accounts::users:
@@ -24,7 +24,7 @@ pp_mcollective::server: false
 #apache::mod::passenger::passenger_ruby: /usr/bin/ruby
 #apache::mod::passenger::passenger_root: /usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   rewrite:
     port: 80
     servername: puppetmaster.pixelpark.com
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 9576854484a34e2f97e42dd3a2565e486141c93c..1a1f380c1960d5c6ff3c50e0e25c65e7e9b602ad 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 
 apache::default_vhost: false
@@ -10,12 +10,12 @@ php::composer: true
 php::fpm::pools:
   www:
     ensure: absent
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   satis:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   repo:
     docroot: '/srv/www/repo'
     servername: repo.pixelpark.com
index ab2bc33e472f30aff8772e4956844d3c7359cbaf..2a0f3c60385de17e9e9966cfddcc68c6f64baec2 100644 (file)
@@ -1,14 +1,14 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::cgid
   - gerrit
   - logstash
 
 
 apache::default_vhost: false
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   review:
     servername: review.pixelpark.com
     docroot: '/var/www/git'
index 96eb710f9fb9f600e8386b4b6c68dadb9c5c9df9..8fc26ebe78e86bb584e3b23423f95bb8c775b9b1 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mcollective::common
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mcollective::common
+  - infra::profile::apache
 
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   rpm-repo:
     servername: rpm-repo.pixelpark.com
     docroot: /www/sites/rpm-repo.pixelpark.com/docs
index e2f678cd4d71f86fcb08e949a7b8f51ecee9aa96..ad484e4f960547ce7f122f060f1e1997c7b0e44e 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - zabbix::agent
   
 zabbix::agent::server: '217.66.51.48,217.66.51.91'
index dc1f0c12af05bbe2f5f8cbc0fbe86623d9aef8c1..c1a952e9835cce2d40f502a9c82aa1940509d12b 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   florian.schade:
     apply: true
index 44276e43ea634207660d53240d014476ecffc904..94d7a59cc5093000c090b5d4fe2ee54ed365e4ec 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
   - accounts
 
index 9ea48958805e0b9c3f0433b9a604e9eeb494f030..9bee242ec337ee221450e08f00eb36e72747170b 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - bash
   - tcsh
index 2ac1dbd06798e63d69a2275fbff84e298b91114d..68e380ad1368b11a5cd588993c6a37b3138de004 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - accounts
   - pp_tools
 #  - vim
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index f39064c3a37113a328a4739f2d59aa5ad922dbb3..a2cfd04365f305da336c493a159b0d7315574666 100644 (file)
@@ -1,15 +1,15 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - java
-  - site::profile::apache
+  - infra::profile::apache
 java::package: java-1.8.0-oraclejdk
 accounts::users:
   andreas.reuter:
     apply: true
     sudo: true
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   formular:
     docroot: /var/www/formular
     servername: support.pixelpark.com
index 9e22fe96924b88036e6d7d8568ae537b6dbb1679..61f9318913ee318847112e698eff725b28797c55 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
 
 apache::mpm_module: event
 apache::default_vhost: false
@@ -13,7 +13,7 @@ php::extensions:
 php::settings:
   PHP/short_open_tag: 'Off'
 
-#site::profile::ntp::disable_ntp: true
+#infra::profile::ntp::disable_ntp: true
 
 ntp::servers:
   - 'ntps1-0.cs.tu-berlin.de'
@@ -44,12 +44,12 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   jumpstart:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   jumpstart:
     docroot: /var/www/jumpstart/docs
     servername: systemshare.pixelpark.com
index 1a8c5a20242a36c3a48991e89c8c2d00e4a30dd8..31d46bec4a404a117b7d087b0e0b8d0fdcb653c2 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - xymon
 
index 96b4e1560c123ace43f0d4ea945fd5b7808ff66d..1c2841ed06ab43735245a655b20dd5c3eee3a45e 100644 (file)
@@ -1,24 +1,24 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - java
-  - site::profile::aem::author
+  - infra::profile::aem::author
 
 #
 # Die Bielefelder Kollegen besitzen das AEM Admin Passwort. Bei Bedarf soll dort nachgefragt werden.
 #
 java::package: java-1.8.0-oraclejdk
 # Author
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhPaSFTCON30uuAN6Rpwey5Jiu0GvNGtVStIs5NcOVkyuVO+itn+djtMhKCfoXKh/3WbQsRK9Eco0wODY/FHKnpaR+00wM4PU6rMUgMy92bB+hCM/yzvMHZsUrKgKytPbA07/uXLu6r3pSAngsDhT7Jq3GNE5SGBuIVZVMt6l4YGOeTxtrKt3qNGIettxXpRgSUN+OGwzNVuoQ+zuOT09fRaMoontUZmw4sve+UYNRKZLoXVg5gmDZHFbnYNz5wdHZaZNzlqHjuy6kfXtdWzbGyInyunSpQXkE0b/9BsOeugMPbJpO71eyPQuKHozDUhCeLOMH1x10e8zzGrq4cHvPTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAZ+1jwlkl4YDmAUU2xT2BkgDDq0atckomVtScB07CUnUt9RzA1alR0/KQJxgr+URwhZjTCGz6OG9wx1t/yZT3CAHU=]
-site::profile::aem::author::license_product_version: '6.2.0'
-site::profile::aem::author::license_customer_name: 'Pixelpark AG'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::author::jvm_opts: '-d64'
-site::profile::aem::author::samplecontent: true
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::oak_version: 1.4.1
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhPaSFTCON30uuAN6Rpwey5Jiu0GvNGtVStIs5NcOVkyuVO+itn+djtMhKCfoXKh/3WbQsRK9Eco0wODY/FHKnpaR+00wM4PU6rMUgMy92bB+hCM/yzvMHZsUrKgKytPbA07/uXLu6r3pSAngsDhT7Jq3GNE5SGBuIVZVMt6l4YGOeTxtrKt3qNGIettxXpRgSUN+OGwzNVuoQ+zuOT09fRaMoontUZmw4sve+UYNRKZLoXVg5gmDZHFbnYNz5wdHZaZNzlqHjuy6kfXtdWzbGyInyunSpQXkE0b/9BsOeugMPbJpO71eyPQuKHozDUhCeLOMH1x10e8zzGrq4cHvPTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAZ+1jwlkl4YDmAUU2xT2BkgDDq0atckomVtScB07CUnUt9RzA1alR0/KQJxgr+URwhZjTCGz6OG9wx1t/yZT3CAHU=]
+infra::profile::aem::author::license_product_version: '6.2.0'
+infra::profile::aem::author::license_customer_name: 'Pixelpark AG'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::jvm_opts: '-d64'
+infra::profile::aem::author::samplecontent: true
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::oak_version: 1.4.1
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
 
index be1324d7f21efbc050e9b24e802781a6408ae0a3..ffd5a727c19756d5c543bac78a41924b82c0a60a 100644 (file)
@@ -7,7 +7,7 @@ accounts::users:
     apply: true
 # custom-admins
 
-site::role: base
+infra::role: base
 httpd::webserver:
   test-confluence01.pixelpark.net:
     modules:
index 792427d4e936e219e3be912ec76bcf5b99714784..4268ee2790a0ca9dcfb17526cf5981d0d19bbd8c 100644 (file)
@@ -8,4 +8,4 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 834d7f7a2042211b93671ff05d6a7ee742f64774..56024da27bcaf97140b270b95b26b8389bc3d1bc 100644 (file)
@@ -5,7 +5,7 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
+infra::role: base
 httpd::webserver:
   test-jira01.pixelpark.net:
     modules:
index 2676ae0a2f5a24ca4ed4250c8fc0abd058c4b702..07e57227999780b7a41296912e96270e31099753 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
-  - site::profile::cron
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
+  - infra::profile::cron
 
 apache::mpm_module: event
 apache::default_vhost: false
@@ -63,7 +63,7 @@ sudo::configs:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoiCQsfsSs3rCT8Hui1J3WYgZXe/IMwoFtsO0T4g7qnBxhwDn9LmGJnivDWhUiILvsCDpC9z4xjU/mcV1v0gOOX0OVaFEO4b2L9mVGLepcCsan1u5pveEEz/nJbHAltlpV/lae7oDODlxWW2GCTy70rRhwiTzawx+rg9ucck+BBTIRNkV3QhaKl8W1a6998GaM6oKeGTINm90JnVTvWfT9xqvPlOxP0rkzQzTY8eN/WVHvRDTv/bRgODRYmP2SQksyqpcIT38+RneRmx6sGRXt1gBpSpvMFpUa6Us5A/yhA/cKZQkvDqIAmapFL5hX8+jGf/eHXleSRlK2zB+4jstlDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAK+BmYMRoPatKs/NuzKVpjgCDilru+L70lUX1x7y8Kgf/6dNhNlJKdf9kU1wN62ChDZg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAf4pVeY2puBKHt2pv5BMMiYXPXN5nBYi+ItJZ7EnmnmwKEPiZ1YC5yZMd+CuDBd882Z51WzC0TSOgk5g3U2cd4lyDNucGI57IEZywMkFdeGN2853YHF+l3xqqcy4HnHwuggrM5TQBQzTob1zKOnIFmbN6ed+EV3cROO5vuD0ylnSFpIMlzCCZcVEc7Ny5mk5Z8rsjv7LwiCa1+LM0EvmA42Xnl47d5ArR2SWBEoABpQQtyvv0pu08p4LHVBmA6gDlW6boQ4tDnu7NHNdG9/OgNCEb6Ttga6o5G3VL620EhVyCwshG3eufbFOXVkz46A+ZLpMBFC2cJWouRVekU3JoqjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAkdDDLK9j2ZnOX0p194h4YgCBZ3XfX5K353AHwSAR9G17QkIsUZnTvfpHstKqfWFnogA==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   marketing:
     user: marketing
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArKusrFUVbxdGpSBSV/7irXyJUXreO8Rh+Z/1oQLzDWRs32sDbDMdTq6lEFSMprtIf0dyN39DJtwqSiXlYOxFLjJgxa+hhgESgcg+4w1lXJp6EolG4NqSd2BCQaOI8awq7TDd5tsoWwFznXYJYnRDpMnYFVrDoeJvh04HPSel5fuV9LDfZB+3FWxZgOPPLU8gcz3pKV7F1u7lzjVFf35c4D89YDk6YekPs7jcccijMdoTxk5tWcqBhGnFCk6W4inn5ABG5eUDYORx+nLpCErODtAjHZTDpFfgmE1KehehW3GkqIFytyyA6gwMO+TwvEfDp0Ro3hkr/xhBgmc3sBHJrTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBiw1xOGCsts+kVld9hGe32gCCIOJPrQXxjURA/WqLPEvR6Uy4UmX7hhuocuUrXsOsZpQ==]
@@ -72,16 +72,16 @@ php::fpm::pools:
   www:
     ensure: absent
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   marketing:
     listen_owner: apache
     listen_group: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYdFh2WS9R+8MJnzjfquonnR6WGbxz/7ous/GkszdI5G2AL4QNH2cjN2Ys4Doz5PNEQbZnsAL3GPkna+z5sAntzuVzsPELh+MN/UwJLxstthMj/c4dlDAbnhqVZa2ZiDpJryGyNP4ZPSnDDgVrvec25jozP10rRU0ilvGTE+Tx9qLgA8khehjHJ88PIBGJLv8XIYkeid/VArFkQvA5sqPcXoWjTK3P2dljEtQDohL/oE+LUPj2bpBKpxQaJ0u/0cMnF/14W7242fggAxlmbTA5BoUxFwYcDErtJSF0iFrtvRl0kcxaFtCigUC06SL9KMH7iXLG3okJKBxkAJdgs7YwDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDJCvec4LnKTV5MNRY8T4L6gBB91zmZZUWG4aD1h6lmpc7C]
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   marketing:
     docroot: /var/www/marketing
     servername: test-marketing-publicis-ai.pixelpark.net # Realserver Name
@@ -117,7 +117,7 @@ site::profile::apache::pp_vhosts:
     setenv:
       - 'MAUTIC_ENV test'
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   mautic_update:
     user: apache
     command: 'php /var/www/marketing/app/console mautic:segments:update'
index efd1defaf1b616c267b5525780ebf688cf36002a..f2d282cfe6c63a7a95de32f5ab9e1e675f9830b7 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon 
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon 
+infra::additional_classes:
   - accounts
index 4f3699afb48e806a0607904731affa207123c813..f9809122cdc5d279b06e8a25dff9355bb36d96c8 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   ivan.prikhodko:
index ff1ad428d5984be16fc5aeb7c5663786ceadb86d..74fc3c1fcdb75809cfc3c41f1085c6515b5b264d 100644 (file)
@@ -5,9 +5,9 @@ accounts::users:
     sudo: true
 # custom-admins
 
-site::role: base
-#site::additional_classes:
-#  - site::profile::postgresql_server
+infra::role: base
+#infra::additional_classes:
+#  - infra::profile::postgresql_server
 
 postgresql::globals::validcon_script_path: "/www/tmp/valid_postgres_connection.sh"
 postgresql::globals::version: "9.3"
@@ -27,7 +27,7 @@ postgresql::server::ipv4acls:
   
 postgresql::server::listen_addresses: 217.66.53.170
 
-site::profile::postgresql_server::tablespaces:
+infra::profile::postgresql_server::tablespaces:
   ts_confluence:
     location: '/www/data/postgres/ts_confluence'
     owner: confluence
@@ -41,7 +41,7 @@ site::profile::postgresql_server::tablespaces:
     location: '/www/data/postgres/ts_confluence_ext'
     owner: confluence_ext
 
-site::profile::postgresql_server::databases:
+infra::profile::postgresql_server::databases:
   confluence:
     tablespace: ts_confluence
     user: confluence
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 31dd860db754ccfc7ee08ac6de4bd1873d4d2c5c..7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
\ No newline at end of file
+infra::role: base
\ No newline at end of file
index 6a7f0008cd6a1f0160f945647e92123399ac5ff6..19d807fc0f9fd59a052e5e8d936ee57bbe1d9b57 100644 (file)
@@ -1,8 +1,8 @@
 ---
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::wsgi
 
 apache::default_vhost: false
@@ -10,7 +10,7 @@ apache::default_vhost: false
 
 apache::mod::wsgi::wsgi_python_home: /www/apps/python-venv-portal-esysta-com
 
-site::profile::apache::vhosts:
+infra::profile::apache::vhosts:
   esysta:
     servername: portal-esysta-com.pixelpark.net
     serveraliases:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 76ca93fe7b38425f546e4951a2d5707e3cd195d8..44d84f60ade5fde6b784210baa1138a24988c8a6 100644 (file)
@@ -19,26 +19,26 @@ sudo::configs:
       Cmnd_Alias JOURNALCTL = /bin/journalctl -f -u node-survey.service
       Cmnd_Alias JOURNAL = /bin/journalctl/bin/journalctl -u node-survey.service
 
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - apache::mod::headers
   - apache::mod::proxy_wstunnel
 #  - nodejs
-  - site::profile::mysql_server
+  - infra::profile::mysql_server
 
 nodejs::repo_url_suffix: '6.x'
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPCo/9hlPSqjUtb4e5shtBwK7m6KwS6tOefhiz2B7JTlQpDRWzn3lxVUBhxdEy9vtCLAb9yrll602tSKxv4mjUIQ1Rd1eRZDOdGzY/l0ElHm44IKBnK3FtZroMLus6J4UyBUJu6ow4gYL45r7wsTVfgqhZl5pnmyWrJewI+U8rXDfOjUwsPzWyBggut/wh/tVwF9YU3AuXf5Z2+lEd0LHgAGQrLx/U2oBoIP+oGhODmoH/mg5zAA/ldFFzjDsAj5wSdaG/o9j/dvTHPQgaFm2j3ZCvMPZeDGgCzysFY8L1MqPfRXhN50gyK/6L3oRmnbb+pYhQv/S+GwTkcfzoe8tPDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAfddZ6pyD+bPJ6CZ6oo9ZBgCDd8m2FSjj24l1D2vCDhZIYtuSmM6xRG4esiRBbrlgZ0g==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfZnlGTBXihZv98wI03PfmQpDd3F36QSHnPqTk2CIsk6oI4LWpb+OogiY7BFWb1GQbxfVxRInuH2155KJB8pVpbKjjHDTmzwYdJCJfw5i4ZPJlZS/OMgWaiOAIo0rzxdJ192Z9aJjT19lnglfOnI7oNeaOGiidc564MTUYKbx06/T4EmeZ1IsyJCf13AkCA8T8/OMa0jRtdzsdgMCd/DTAILdrjz0cvs75jYLcqNRUeoHDWt3yykmsTHAWlBIVvYmPy4uFMkzNCQYanczprvp8KBjBv4KaQasFt4vd9AT65OCX0rGn/K/hqFGq9qmzqljr37SltJ1OpjvS/OoHmdk6jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBdn0nQ4U/OF+AxLgtxu3+agCAjfoYNtmFcOA+9kXqYRyyVeaOpMuJhLeIo0S0LqXBbgg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   clientsurvey:
     user: clientsurvey
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAaAVh5WMbKzcyTCQ5UvhMGmg4i1PLiFfz//KJD0JxXLS1ydzTsMbDKxMvYT92wCzp8YBybNP4W1GcsEfjAxHS275KZ6hcfRWrPgkMYDpULgzmpZifMHmYKrQlTgk+Sylox/qZrXLBP0cLEuQZptvHKvRZIaqOpTfAEJUI7eLPiqxbxl/UYsoiF0byKE0/MS+CbNMZdph1/H0cko4O/Gw57gUXeELEAf9LcX6sIGtcDmyUonMLEQa86dc731n1VxUnFR4FbZKpCk9MYVzdtmxgPa+xy0GvyOh1CdCHdp3ZIuOF2EBubApdeIVV6bWEsfTvHOqaJa+aejZ0Y4AVpAZdFzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApzLJDeFJwYkF53a6laiN/gBDwiIJD7cGFIg477jJyHGsP]
 
 apache::default_vhost: false
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   clientsurvey.pixelpark.com:
     servername: client-survey.pixelpark.com
     serveraliases:
index cc6ce0237cc1e121c878df125e8f2f17d4ff7444..7bdbe882feeab132b99c6222edc31912532987cf 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
   - logstash
 
 # Apache Konfiguration
@@ -11,7 +11,7 @@ apache::mod::worker::threadsperchild: 60
 apache::mod::worker::maxrequestsperchild: 10000
 
 apache::logroot: '/srv/log/httpd'
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   web-inhalte:
     docroot: '/srv/www/inhalte'
     servername: inhalte.pixelpark.net
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index 3295ddaf86fc3d2edd65428927a10151980588d3..4cdc959a63a11e1186028f246b4e9646c7e25d4c 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
index fefeefb6a62885e8c3651786b0945fcd2eba83a5..deda1983cc52b7b33bf092675fc92028bad50d03 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - xymon_server
 
 xymon_server::static_content: |
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 303bf9c6c98fb326bfefaa8df14b79629f9a3abf..6019150d94bd6d0362c5049b4ec7e8f464d48a19 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
+infra::role: base
 accounts::users:
   tobias.kostyra:
     apply: true
   andre.schmelzer:
     apply: true
-site::additional_classes: 
-  - site::profile::apache
+infra::additional_classes: 
+  - infra::profile::apache
index 6233f677306e2a032dcdff03ef4895ab88a64ada..281de7936fa91f89ad4a17c1018550ef2cd0c1e2 100755 (executable)
@@ -1,18 +1,18 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::pg_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::pg_server
    
    
-site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAs/K2knCaiWzeMpTQWGpAQZod1YKxSQg0ZO8n6s230mFsYYvnRHa8eZGAQZjHQj4pKgafx1fNJeWT2zoFKYgS+Y6K+xsK6qk8QEyxrEPYaBcQfjmp06hENYO1kQskRbT8Z4OSoNhDkxnJAyq0SVE57bGYkQ5rLAA5HJjfPDEXPKqJojCFTAX44EyTJAnNsB0KCvOqymq5SYr4Q62mYMmboprXdXQ0ZC0GSfm9qqcL5y/Ch+RLZ4+v1yPzo6mdVv5ArnC2Fs8oTNKkp9DzdSTWZ5c1CpdYE8xJTpehH/Hdcwt062vXNLifDZ4dIJYw6OdKZ95vSl8MqQ1daByyjkftbjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD4DV37mVbm6TwfY9yDSKzRgCBbGVzQWqpbHGchclTcHoJ9W/EZy4oRQLPOqT/kWRM46w==]
-site::profile::pg_server::version: '9.5'
-site::profile::pg_server::dbs:
+infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAs/K2knCaiWzeMpTQWGpAQZod1YKxSQg0ZO8n6s230mFsYYvnRHa8eZGAQZjHQj4pKgafx1fNJeWT2zoFKYgS+Y6K+xsK6qk8QEyxrEPYaBcQfjmp06hENYO1kQskRbT8Z4OSoNhDkxnJAyq0SVE57bGYkQ5rLAA5HJjfPDEXPKqJojCFTAX44EyTJAnNsB0KCvOqymq5SYr4Q62mYMmboprXdXQ0ZC0GSfm9qqcL5y/Ch+RLZ4+v1yPzo6mdVv5ArnC2Fs8oTNKkp9DzdSTWZ5c1CpdYE8xJTpehH/Hdcwt062vXNLifDZ4dIJYw6OdKZ95vSl8MqQ1daByyjkftbjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD4DV37mVbm6TwfY9yDSKzRgCBbGVzQWqpbHGchclTcHoJ9W/EZy4oRQLPOqT/kWRM46w==]
+infra::profile::pg_server::version: '9.5'
+infra::profile::pg_server::dbs:
   'meep':
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANmFwTMR7I+yHqSMANE7/RvUgyLhB+652Cz5MSk3tyLx82aaSiF90H7aA5TOEcrNOhgS7O8wKmnJDca/vrWDTH6Uofdfu0GObS+fs/yFdIdKeCE4v5WUpOigIbLyPgPVaEtDoIPPJslnKIF3VW2OhnBeG5KfIIz4TbtJECNpA15seC93gGN/u483EVkg1/NyqbP0Ue++N8C69Py26d3ZgrZh5Wa9wG9u91cD+UhdxYmh6NgTDfnVOUmmSPyr2PWWUCNWmdRF5RNzmy6lahhTbyWI54bINhqhu/UIpLZWTcfuIV+12x2DgoIPbblN2LCUYuKkeIePjlNAAZcsw/CHSQjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDJG5cDRITztKqYi88qngLfgBBuKD8OXsPcua0uKbvMVQxA]
   'troet':
     password: 'troet4711'
     user: 'hallo'
-site::profile::pg_server::configs:
+infra::profile::pg_server::configs:
   shared_buffers:
     value: '4096MB'
   max_connections:
index aadcc9dff5a103a272880c75431573132986054d..ee8fa7b69707cdcf13da477cc3e7c12eaf9c4868 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   frank.brehm:
index 70d22f6960ab35778d748ac1107bca44ac50493c..1f509dbb9fb3cadb38f338710c629ecfc8b241fc 100644 (file)
@@ -1,15 +1,15 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::tomcat
+infra::role: base
+infra::additional_classes:
+  - infra::profile::tomcat
 
 tomcat::install_from_source: false
 
-site::profile::tomcat::instances:
+infra::profile::tomcat::instances:
   default:
     package_name: 'tomcat'
 
-site::profile::tomcat::services:
+infra::profile::tomcat::services:
   default:
     use_jsvc: false
     use_init: true
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 5a37579de3eff20b5d7037555c23d8c0dcab2008..d433ee90df90be733a197c48e9280dc2031cf482 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::role: base
+infra::role: base
 
-site::additional_classes:
+infra::additional_classes:
   - logstash
   - accounts
 
index d99921ae4e18932318553251887df74f8715f3b8..9028343485b8a5295ecc01a95e8d128e954ec83f 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index d99921ae4e18932318553251887df74f8715f3b8..9028343485b8a5295ecc01a95e8d128e954ec83f 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index d99921ae4e18932318553251887df74f8715f3b8..9028343485b8a5295ecc01a95e8d128e954ec83f 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index d99921ae4e18932318553251887df74f8715f3b8..9028343485b8a5295ecc01a95e8d128e954ec83f 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index fcb5fc044ee8ed949c7e3af95bdea2af3bfd7261..468fbab45fdf4c031fd663b6dabb607a4f50284b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index fcb5fc044ee8ed949c7e3af95bdea2af3bfd7261..468fbab45fdf4c031fd663b6dabb607a4f50284b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index fcb5fc044ee8ed949c7e3af95bdea2af3bfd7261..468fbab45fdf4c031fd663b6dabb607a4f50284b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index fcb5fc044ee8ed949c7e3af95bdea2af3bfd7261..468fbab45fdf4c031fd663b6dabb607a4f50284b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index da009e7486dd85aa20c751a6fee468ae03bf486f..edddcec9ad55e7c80eb689963780fb0b2d05c4c8 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index da009e7486dd85aa20c751a6fee468ae03bf486f..edddcec9ad55e7c80eb689963780fb0b2d05c4c8 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index fcb5fc044ee8ed949c7e3af95bdea2af3bfd7261..468fbab45fdf4c031fd663b6dabb607a4f50284b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index fcb5fc044ee8ed949c7e3af95bdea2af3bfd7261..468fbab45fdf4c031fd663b6dabb607a4f50284b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
   - logstash
 
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 19f41c4dbde272b0deceb47a01c2125bc3b70581..4dd303adb84a1619558c1b207801a8ff821329a9 100644 (file)
@@ -1,21 +1,21 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::wordpress
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::wordpress
+  - infra::profile::mysql_server
 
 accounts::users:
   christian.mueller:
     apply: true
     groups: apache
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXCnvx5O4EVu/ri5SuRJ6DPzuDgGljlKGN7CFsoA0ZG/QtbhDeQmx5u/tSgSNIbjU4DTXvP1bVk5ubq/iUcVyh8tlUklDHgrxclXy2rKSOPjX5TvuG9lFEkr0kTqzyBVjFkXygLGP8j6YMjfvZ1SdyW3w5TBWdyodEStDmAGm1/7IISOfW/uwzZHxLgRXeledJkMDAWrvFLRyRauTnrvZNu5+8YvaGUgnA+ADKhVoozbFXuSmZ9RLIiHKYZo0PdxZ9mYsKCUDJEImbNCzYSXfDz9v+pLWyGpg91xoEN5qd2zO8vJCCoDNitlNz8vaThHecyqDCCUiumMb7OczqquD5jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB8HHRKsbDv+pZCUaN9KHXTgBCHGuhFUnfaeU1tidRnKK0j]
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYtNpdyVxhBy0uZi92FnWCN2IPlncqNn6jj65EHld3LSkdhBQk12azB9ZA9f1iHUGaWHyChRVZyUQgkgBqJUAHUuD2TX24xtnRHpZXLCehloZYue6zk8t44Rv9e1BvaYWcKrApjAx9lNy7Q0Bw7WsxYf8BlRXx0Jx7sCHNLpjoagBRBkuhrIn9IMgdn2p5l+4PhrCrYgNMij/rqGZrkHWwUc9qmRnV4wTCYOYIH11W3G28qil95wohE8vUqC9EH0/Jvmg2iKkW5R2t9DvKoT9Y+x6ls4odq0xWZIAedWfgpNJqnZ660FKcUuMlR8mBogPl7Tr3InUf/VneSoupr7M0TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBgDfdI48hDNvlDtSGXaKXQgCD6JESJ64giFFC4iUbZzJOT0a78cdxcckRBIlxs+ma0mQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN/vXpWrPclX3xr3enI6hQS+Ft/My8UCxBOiOz3QqRCMBkBHPxfCLeArJGVN9/bLLp3pZwywddHFBElvOR9rNkMX9BDipQ8tpbEz0hHYtETFieR06JZKpYCfLFpDQfllDYsRfb1sQVivOhJP0O+GUcEI6y6nKnW5egAxaTFt/We/8kmzAf05iLBwtUgvqX7QlwF4PgWJWiRQUW5THjg4rEGLzjRs/s0cDa+R+opfcLRimEyeJx2Zi16DsluJcSRKrwlWpAObg5Hd4mGW5uc12HxreiotAUWIhdnpgdJNAPo9l690c5sdaO13SBrIw8zK2Z0YPS3jh1l/2azwFmpykqDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDfvnetzL7JF4OvPFVe7bmEgCBvh51yMVgSrCOUTFz9oa+5TXjly0I37a/wm41pTGo7vg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   qperior:
     user: qperior
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoVSmZAyXGTeJsrvl1F4atzCPH5FfcxWY1ClriY6P8QbOCWpsJFAjHLzd79AipdYqALksULov9DbEZa/m3jZrI0yHZh3Lgy8sAw9/4yatHlruhlqlqlrR0S4pe0oHek7WodtdsdLvzlXw8Db2B2VIuyVdX4zuijzjeTv+to9oSxZPe2+1uqRSjPrzgGttOgA0e64oz6WroVszZ4ZC+h+MOlx3EjDn/dGG4qUYKui0iHOb5tgPnVJYPjgsXCNnbEd+7tTuYwxT+nBcF+cVocjUe8lGi6u3ccOUty8adzmIv6jO1ywqUgvmhoxiyFXPwSpfEMBSIZtPqsifzitgNMNwoTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC8l3Tj0bGfmQp3mb47BAb5gBA5eLQ53jViTAs6jdYQ9ayz]
@@ -43,7 +43,7 @@ php::extensions:
   mysqlnd: {}
   opcache: {}
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   q-perior:
     docroot: '/var/www/q-perior'
     servername: test-www-q-perior.pixelpark.net
index adc45e3593cd1f0e8d31a40370562aa47d2037b8..8d2bd931d9bec855623b4c7540ff8fe7df783db8 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - java
   - accounts
-  - site::profile::cron
+  - infra::profile::cron
 accounts::users:
   jenkins:
     apply: true
@@ -26,9 +26,9 @@ repo::redhat::puppetlabs::puppetlabs_devel_baseurl: "http://yum.puppetlabs.com/e
 repo::enable_pixel: false
 
 # Disable Logstash
-site::profile::logstash::apache::enable: false
+infra::profile::logstash::apache::enable: false
 # ZFS Cron Backup
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
@@ -102,48 +102,48 @@ sudo::configs:
 #
 # Author
 #
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::author::license_product_version: '6.2.0'
-site::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::author::oak_version: 1.4.8
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::author::license_product_version: '6.2.0'
+infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::oak_version: 1.4.8
 
-site::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
+infra::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Author
-site::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::author::mail_to:
+infra::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::author::mail_to:
   - philipp.dallig@pixelpark.com
 
 #
 # Publisher 
 #
-site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::publish::license_product_version: '6.2.0'
-site::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::publish::oak_version: 1.4.8
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::publish::license_product_version: '6.2.0'
+infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::oak_version: 1.4.8
 
-site::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
+infra::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Publisher
-site::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::publish::mail_to:
+infra::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::publish::mail_to:
   - philipp.dallig@pixelpark.com
 #
 # dispatcher
index cc74312754ba6c130bd532630595ff635d9323fa..5e39b1efd681a898c06c119b6ba99e84eaf123b1 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
-  - site::profile::aem::author
\ No newline at end of file
+infra::additional_classes:
+  - infra::profile::aem::author
\ No newline at end of file
index cc74312754ba6c130bd532630595ff635d9323fa..5e39b1efd681a898c06c119b6ba99e84eaf123b1 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
-  - site::profile::aem::author
\ No newline at end of file
+infra::additional_classes:
+  - infra::profile::aem::author
\ No newline at end of file
index e73ba649d621d8352221e486f3c3ef3db5e96063..e0b8c94cdf3601a4df6edc80774d271854a21809 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
-  - site::profile::aem::publish
\ No newline at end of file
+infra::additional_classes:
+  - infra::profile::aem::publish
\ No newline at end of file
index 2a923c3935343144b93d199be47bc6a3ce7db36e..84597814fe78c2c427f08cfe1c3f75b797f26e79 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::additional_classes:
-  - site::profile::aem::publish
-site::profile::aem::publish::port: 4504
\ No newline at end of file
+infra::additional_classes:
+  - infra::profile::aem::publish
+infra::profile::aem::publish::port: 4504
\ No newline at end of file
index e73ba649d621d8352221e486f3c3ef3db5e96063..e0b8c94cdf3601a4df6edc80774d271854a21809 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::additional_classes:
-  - site::profile::aem::publish
\ No newline at end of file
+infra::additional_classes:
+  - infra::profile::aem::publish
\ No newline at end of file
index 38169babd2efb3a37e037a78f73fc93b1d1095b6..c9514470f8debb7e14f8bd3db22e7b307f8446f1 100644 (file)
@@ -1,18 +1,18 @@
 ---
 # Author
-#site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYPmonogCYqFe79tYHhPbs2k2UWBS2fqxBJ70cnBfZdPQa935JMViAEEBu03YFDI4P4PYAFer9+HND7HuomkusDfN5AD2PFdZsPBwwMPnEJcnBblmlSSJQMKkQAtFddJGGE3LuEqCZMv6ZADE/pNQwZLcWGbb2lMaM/siMhFhBAepYwuJyfo65CXrHQ623DG0nqb6i3an7gt/cjuGzjhpI4W3jpkLyW6Ce86iQhb5h//OsItvFpTp2+kIhdFyzunbKVbgORxfgjauUvYs8ur0dybrF5qb7W45RyyLzgNhVsoYdpE003P/9b9nrAWXODkiM08a9YyiyoXfCjv26l8ouDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDCWhsAJu1BB5NJmTGuDNuYgCCnR1CzR+4WLUhPDcX+594XfTat/nbtnecpl+SacAD6Kw==]
-site::profile::aem::author::oak_version: 1.4.8
+#infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYPmonogCYqFe79tYHhPbs2k2UWBS2fqxBJ70cnBfZdPQa935JMViAEEBu03YFDI4P4PYAFer9+HND7HuomkusDfN5AD2PFdZsPBwwMPnEJcnBblmlSSJQMKkQAtFddJGGE3LuEqCZMv6ZADE/pNQwZLcWGbb2lMaM/siMhFhBAepYwuJyfo65CXrHQ623DG0nqb6i3an7gt/cjuGzjhpI4W3jpkLyW6Ce86iQhb5h//OsItvFpTp2+kIhdFyzunbKVbgORxfgjauUvYs8ur0dybrF5qb7W45RyyLzgNhVsoYdpE003P/9b9nrAWXODkiM08a9YyiyoXfCjv26l8ouDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDCWhsAJu1BB5NJmTGuDNuYgCCnR1CzR+4WLUhPDcX+594XfTat/nbtnecpl+SacAD6Kw==]
+infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-#site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYPmonogCYqFe79tYHhPbs2k2UWBS2fqxBJ70cnBfZdPQa935JMViAEEBu03YFDI4P4PYAFer9+HND7HuomkusDfN5AD2PFdZsPBwwMPnEJcnBblmlSSJQMKkQAtFddJGGE3LuEqCZMv6ZADE/pNQwZLcWGbb2lMaM/siMhFhBAepYwuJyfo65CXrHQ623DG0nqb6i3an7gt/cjuGzjhpI4W3jpkLyW6Ce86iQhb5h//OsItvFpTp2+kIhdFyzunbKVbgORxfgjauUvYs8ur0dybrF5qb7W45RyyLzgNhVsoYdpE003P/9b9nrAWXODkiM08a9YyiyoXfCjv26l8ouDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDCWhsAJu1BB5NJmTGuDNuYgCCnR1CzR+4WLUhPDcX+594XfTat/nbtnecpl+SacAD6Kw==]
-site::profile::aem::publish::oak_version: 1.4.8
+#infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYPmonogCYqFe79tYHhPbs2k2UWBS2fqxBJ70cnBfZdPQa935JMViAEEBu03YFDI4P4PYAFer9+HND7HuomkusDfN5AD2PFdZsPBwwMPnEJcnBblmlSSJQMKkQAtFddJGGE3LuEqCZMv6ZADE/pNQwZLcWGbb2lMaM/siMhFhBAepYwuJyfo65CXrHQ623DG0nqb6i3an7gt/cjuGzjhpI4W3jpkLyW6Ce86iQhb5h//OsItvFpTp2+kIhdFyzunbKVbgORxfgjauUvYs8ur0dybrF5qb7W45RyyLzgNhVsoYdpE003P/9b9nrAWXODkiM08a9YyiyoXfCjv26l8ouDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDCWhsAJu1BB5NJmTGuDNuYgCCnR1CzR+4WLUhPDcX+594XfTat/nbtnecpl+SacAD6Kw==]
+infra::profile::aem::publish::oak_version: 1.4.8
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::author::install_files:
+infra::profile::aem::author::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -26,12 +26,12 @@ site::profile::aem::author::install_files:
       tarmk.size=256
       pauseCompaction=B"false"
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::publish::install_files:
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -128,12 +128,12 @@ aem::packages:
     artifactid: 'sirona-initialcontent'
     version: 'LATEST'
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYgRlfDobsI0lPkkWJ/H+EqR38l60JKLl1i5izFRfRFrAhQAQgqvfxYpgidsu0xl5uYtkTlIyeJKR4KoKVJ7IkdyVPcIYls0iTMDiszpgHJNQ+GIWQ14GE3Cax+9/RbqnW8a0Rgb9LKsCyyum6pOrnoOqTlxs2i6wQF3fqxprBlt9PaudzSmxwDjJge2CzGLJW7IBRa5FDRv/UMgKvCcm+Jd91xmAZBmtARMprn/JbHjHee99ora16/0DGfa3EkrHlNdCXEtR/fnc6uwx2hwx30Zcs4S4awnaFZGg04QQUuChTevpgefodBtSFfIH5aUCJXPW+TnzxYJYPizwSfEhTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDh0WdElrugo93Svg7DtbtbgCCmW9q7Xd5oLJPbzYQ0LZgmr+VDX4zx5xGpMcbuHZ0GUg==]
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   sirona:
     docroot: '/var/www/html/cache'
     serveraliases:
@@ -167,7 +167,7 @@ site::profile::aem::publish::pp_vhosts:
           - 'env AccessControlAllowOrigin'
 
 # Apache Author
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::pp_vhosts:
   sirona:
     docroot: '/var/www'
     directories:
index 9415315e4dff8efb9b32f536bf5ec7a881b45ecf..2e8ee8c8ce31a2f3d47d9eb95bdf3efb627ce861 100644 (file)
@@ -1,18 +1,18 @@
 ---
 # Author
-#site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
-site::profile::aem::author::oak_version: 1.4.8
+#infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
+infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-#site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
-site::profile::aem::publish::oak_version: 1.4.8
+#infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
+infra::profile::aem::publish::oak_version: 1.4.8
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::author::install_files:
+infra::profile::aem::author::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -26,12 +26,12 @@ site::profile::aem::author::install_files:
       tarmk.size=256
       pauseCompaction=B"false"
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::publish::install_files:
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -128,15 +128,15 @@ aem::packages:
     artifactid: 'sirona-initialcontent'
     version: 'LATEST'
 
-site::profile::aem::author::jvm_heap_min: 12g
-site::profile::aem::author::jvm_heap_max: 14g
+infra::profile::aem::author::jvm_heap_min: 12g
+infra::profile::aem::author::jvm_heap_max: 14g
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAC6UHVr2KCcP2R0AcXYupc1zdKkh7YXJ/xINkSpTyYRYBWw29eQ6JUa/mx4eYqRjqz0x37w6wqsTqLIcizJMdGVKpQipBXLuLQ5hA3YOWRST+bupvG0JoCEaQVczj/AikRE3Mf+QzOBaQMwEo4e/exCLKNZEuDfnIspJb5oTPbi2vaNJgEHWNJS6hTLf1ZonzvOXe4Mtqw+5B8xAosLDVGvWM1Zb7Hrb/8tUjG1xsaJ9YqLzVF1qH5ytmPmEfhImPMN9u490VzTMObYt6XivSuIpA/0q9tBfH12rz4A1yZPbnpX4iDlFHRDcJiVWyNgZp7IrFovDSlmS2OQHMgOMvRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwKyXhMzA7p/9rpHf1H+MNgCBbwv2GdbEw958QxRxezuECS1fkS97ZUkydQI9NuOoQeA==]
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   sirona:
     docroot: '/var/www/html/cache'
     serveraliases:
@@ -170,8 +170,8 @@ site::profile::aem::publish::pp_vhosts:
           - 'env AccessControlAllowOrigin'
 
 # Apache Author
-site::profile::aem::author::enable_apache: true
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::enable_apache: true
+infra::profile::aem::author::pp_vhosts:
   sirona-author:
     docroot: '/var/www'
     servername: int-sirona-author.pixelpark.net
index 4495f9da739d122538a925184126ec389a014475..6556fcef5ddb021fa186053086f690279a527ca8 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - java
   - accounts
-  - site::profile::cron
+  - infra::profile::cron
 
 java::package: java-1.8.0-oraclejdk
 puppetconf::server: puppetmaster01.pixelpark.com
@@ -50,48 +50,48 @@ apache::mod::worker::threadlimit: 50
 #
 # Author
 #
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::author::license_product_version: '6.1.0.20150507'
-site::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::author::license_product_version: '6.1.0.20150507'
+infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 
-site::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
+infra::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Author
-site::profile::aem::author::oak_version: '1.2.7'
-site::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::author::mail_to:
+infra::profile::aem::author::oak_version: '1.2.7'
+infra::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::author::mail_to:
   - philipp.dallig@pixelpark.com
 
 #
 # Publisher 
 #
-site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::publish::license_product_version: '6.1.0.20150507'
-site::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::publish::license_product_version: '6.1.0.20150507'
+infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 
-site::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
+infra::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
 # Compaction & Backup for Publisher
-site::profile::aem::publish::oak_version: '1.2.7'
-site::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
-site::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
-site::profile::aem::publish::mail_to:
+infra::profile::aem::publish::oak_version: '1.2.7'
+infra::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
+infra::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
+infra::profile::aem::publish::mail_to:
   - philipp.dallig@pixelpark.com
 #
 # dispatcher
index 1543ee4301d5a0d6b25d93ebefaa3159e502db33..a940ec645e00a778fe8b239fee7d3ad24e27f544 100644 (file)
@@ -1,12 +1,12 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::author
+  - infra::profile::aem::author
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 55c183eaa609bd62911b358b7642b9db65078f93..bb1f4d3d790c1e0efcaceb6bbdcb14249e47b73e 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::publish
+  - infra::profile::aem::publish
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 2e5f694e81d0e8ed2d228d1c042d4f3addcce09d..5b83f27c70382743aa02319249a7ee7675e971d1 100644 (file)
@@ -31,27 +31,27 @@ sudo::configs:
       deploy.vogel ALL=(aem) NOPASSWD: ALL
 
 # Author
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::author::license_product_version: '6.2.0'
-site::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcy620f813a2WJgRBWNdekp3xno+PYgGqUqHy0B+YXKZHEawt6lb17WlegQ/UCzxc7QTx0lrUNDD2hsOI0VpXrRInxMcwJqILXgky9EZ+ZaOhwoRA/Dct45w/7B3Ig4xbuy/TUUwNFFw9n+63OKH53qr+WKRrIbDnIr9kF4vox/cAdE4KuBDOT+YsTEaWCq+4TezSFxwW2bPo4sjLJ3UZuNp4U3JKXyJDAIZK2R/GtuXA6Ks0hLUih1ZvA1WU2p2uT7qee8jdLNLJmKn2OpNrh/uWCtKtECX7dToQRNk8+QNYcq85UsEN02J5eptU+Upwc5aX/DYKKCPSgdL97ns+5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3W/GdD9T9k4I0ul8e/RNkgCBAia9/PxWvFDLVqmTGWZmTIs/JYA+h8+yAbveKvDtzcA==]
-site::profile::aem::author::oak_version: 1.4.8
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::author::license_product_version: '6.2.0'
+infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcy620f813a2WJgRBWNdekp3xno+PYgGqUqHy0B+YXKZHEawt6lb17WlegQ/UCzxc7QTx0lrUNDD2hsOI0VpXrRInxMcwJqILXgky9EZ+ZaOhwoRA/Dct45w/7B3Ig4xbuy/TUUwNFFw9n+63OKH53qr+WKRrIbDnIr9kF4vox/cAdE4KuBDOT+YsTEaWCq+4TezSFxwW2bPo4sjLJ3UZuNp4U3JKXyJDAIZK2R/GtuXA6Ks0hLUih1ZvA1WU2p2uT7qee8jdLNLJmKn2OpNrh/uWCtKtECX7dToQRNk8+QNYcq85UsEN02J5eptU+Upwc5aX/DYKKCPSgdL97ns+5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3W/GdD9T9k4I0ul8e/RNkgCBAia9/PxWvFDLVqmTGWZmTIs/JYA+h8+yAbveKvDtzcA==]
+infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::publish::license_product_version: '6.2.0'
-site::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcy620f813a2WJgRBWNdekp3xno+PYgGqUqHy0B+YXKZHEawt6lb17WlegQ/UCzxc7QTx0lrUNDD2hsOI0VpXrRInxMcwJqILXgky9EZ+ZaOhwoRA/Dct45w/7B3Ig4xbuy/TUUwNFFw9n+63OKH53qr+WKRrIbDnIr9kF4vox/cAdE4KuBDOT+YsTEaWCq+4TezSFxwW2bPo4sjLJ3UZuNp4U3JKXyJDAIZK2R/GtuXA6Ks0hLUih1ZvA1WU2p2uT7qee8jdLNLJmKn2OpNrh/uWCtKtECX7dToQRNk8+QNYcq85UsEN02J5eptU+Upwc5aX/DYKKCPSgdL97ns+5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3W/GdD9T9k4I0ul8e/RNkgCBAia9/PxWvFDLVqmTGWZmTIs/JYA+h8+yAbveKvDtzcA==]
-site::profile::aem::publish::oak_version: 1.4.8
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::publish::license_product_version: '6.2.0'
+infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcy620f813a2WJgRBWNdekp3xno+PYgGqUqHy0B+YXKZHEawt6lb17WlegQ/UCzxc7QTx0lrUNDD2hsOI0VpXrRInxMcwJqILXgky9EZ+ZaOhwoRA/Dct45w/7B3Ig4xbuy/TUUwNFFw9n+63OKH53qr+WKRrIbDnIr9kF4vox/cAdE4KuBDOT+YsTEaWCq+4TezSFxwW2bPo4sjLJ3UZuNp4U3JKXyJDAIZK2R/GtuXA6Ks0hLUih1ZvA1WU2p2uT7qee8jdLNLJmKn2OpNrh/uWCtKtECX7dToQRNk8+QNYcq85UsEN02J5eptU+Upwc5aX/DYKKCPSgdL97ns+5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3W/GdD9T9k4I0ul8e/RNkgCBAia9/PxWvFDLVqmTGWZmTIs/JYA+h8+yAbveKvDtzcA==]
+infra::profile::aem::publish::oak_version: 1.4.8
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::author::install_files:
+infra::profile::aem::author::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -65,12 +65,12 @@ site::profile::aem::author::install_files:
       tarmk.size=256
       pauseCompaction=B"false"
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::publish::install_files:
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -206,12 +206,12 @@ aem::domain_mappings:
     aem_path: '/content/test'
     create_sling_mapping: true
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApKE+VEBNzSXc8slYU25oAb9vqkpkJTCPld4U+gVaiSm732qDYwUM2BotAwLfUdLry7yms86f2O885IVezAzFFWuJQgV5E/mXGfQu8LCF//9b84w4lGPnmtvEs1MPhHdA2YPJA+NurFTcneT8WzldXttn18+Z+j9uNg6C0RtXXnl1mxd5T0yZ/WH/DfVIuDKhEPMzZ9tWB9ehLy1Y9Purnub2mbhozCygPlAZAg20IN4xOG5cgKUYfI5zcfvRB4exWFnV2jMC3uikY/u53/hAaAC+56d5XjJ94awFi4SpxIkK/M1odmksD6eUaB3O5y+Mj9gLdo8OA7tDm2phlfTnQjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDLIe922oQOBCvb0UtgFNTAgCBI9HFm6wJUUN6QQbETF5xCCakH1Of53f/HipKy93P6Og==]
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   sirona:
     docroot: '/var/www/html/cache/content/test'
     serveraliases:
@@ -271,7 +271,7 @@ site::profile::aem::publish::pp_vhosts:
           - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://dev01-publish-sirona.pixelpark.net/%%{ich-trickse}{ENV:language}.html [R=301,L]'
 
 # Apache Author
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::pp_vhosts:
   sirona:
     docroot: '/var/www'
     directories:
index bac09f0aedd9c60a97fdce2b3f9bb68d67230208..d781d02b2af61cfa9891dc0a8bdc89f576699228 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::author
+  - infra::profile::aem::author
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 55c183eaa609bd62911b358b7642b9db65078f93..bb1f4d3d790c1e0efcaceb6bbdcb14249e47b73e 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::publish
+  - infra::profile::aem::publish
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 55c183eaa609bd62911b358b7642b9db65078f93..bb1f4d3d790c1e0efcaceb6bbdcb14249e47b73e 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::publish
+  - infra::profile::aem::publish
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 45bc7d64b7ba7eb1082d418443c07b3c0156729a..a2896256482f694ed5e6a7fba3aa68acb9fdf409 100644 (file)
@@ -1,10 +1,10 @@
 ---
 # Host is down
-site::additional_classes:
-  - site::profile::aem::author
+infra::additional_classes:
+  - infra::profile::aem::author
 
 # Cron for Compaction
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   compaction:
     user: aem
     command: 'sudo -n /bin/systemctl stop puppet ; /opt/adobe/author/crx-quickstart/bin/oak_compactor.py ; sudo -n /bin/systemctl start puppet'
index e8d70c04ca8a4437509f60c951a6f8afec23bfd2..7c8f7f9241f35e2c5541ce4981983f5d9ceb37ff 100644 (file)
@@ -1,10 +1,10 @@
 ---
 # Host is down
-site::additional_classes:
-  - site::profile::aem::publish
+infra::additional_classes:
+  - infra::profile::aem::publish
 
 # Cron for Compaction
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   compaction:
     user: aem
     command: 'sudo -n /bin/systemctl stop puppet ; /opt/adobe/publish/crx-quickstart/bin/oak_compactor.py ; sudo -n /bin/systemctl start puppet'
index a8ebd25573edd36a09cfbec4b78a46f82c5bf0c8..b9a21555a79e09851ef7b95921e60c328aad608d 100644 (file)
@@ -1,10 +1,10 @@
 ---
 # Host is down
-site::additional_classes:
-  - site::profile::aem::publish
+infra::additional_classes:
+  - infra::profile::aem::publish
 
 # Cron for Compaction
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   compaction:
     user: aem
     command: 'sudo -n /bin/systemctl stop puppet ; /opt/adobe/publish/crx-quickstart/bin/oak_compactor.py ; sudo -n /bin/systemctl start puppet'
index f6a7cd0186c75d71f7665ebd6fc8133108603d3c..c9d9bf802841ad6f8707bcf9a0da5e7c569ee605 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::author
+  - infra::profile::aem::author
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 5a723a62a08cddc0708c4aea5c48f8ef95d7a4c5..7e78af44bf270585ca5be591705c95f4696c5e4f 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::publish
+  - infra::profile::aem::publish
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index 5a723a62a08cddc0708c4aea5c48f8ef95d7a4c5..7e78af44bf270585ca5be591705c95f4696c5e4f 100644 (file)
@@ -1,13 +1,13 @@
 ---
-site::role: base_for_old_systems # because we don't need xymon
-site::additional_classes:
+infra::role: base_for_old_systems # because we don't need xymon
+infra::additional_classes:
   - accounts
 # Disable because of extra 7.3 download path
 #  - repo::redhat::zfs
-  - site::profile::aem::publish
+  - infra::profile::aem::publish
   - apache::mod::include
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
     command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
index ac07dd2c5a7c49a689a1f3666c7f15a85795cd68..e937e2948d0b86ee22bde2d23e0d3468133cf624 100644 (file)
@@ -13,19 +13,19 @@ accounts::users:
     sudo: true
 
 # Author
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::author::license_product_version: '6.2.0'
-site::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAChQgmoCFgGytTAfaXPn3pyWVrS3qbVqEmNJTWUctffk0GIhzOMnQNbVYD0RIl/x7/kJZq7/uuZMdYyygmvbRyHu2Oel405M0UVjxAZdRQO9NQ79f68BzEbvMMO2cZB/N/Hi4cj4sQbl5SiyvkFUmXhgHCdk1vmjC5Afm1jv9xpngW0RE3fQ4elnCjEIz5+oJoCK1JaQjXVlXmKM7EQBuBQ4Tz0OYuU3XA331g9CGrIGjaw8BnG9Ufmre5mWWG0nug+C33mRjkdUP5W1qSSNdT4dLzr1cZZnWxfEJXir+4yO2JimUDWulwcfF0JPU94QPIiDwR7hLiYd7I4rsgk7/jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpdga+IqNzyrek24Z1AdzIgCAdtWyrNkZcZp0wS+OgbkioCdy85Et9xe0kC2dhYQbwJA==]
-site::profile::aem::author::oak_version: 1.4.8
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::author::license_product_version: '6.2.0'
+infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAChQgmoCFgGytTAfaXPn3pyWVrS3qbVqEmNJTWUctffk0GIhzOMnQNbVYD0RIl/x7/kJZq7/uuZMdYyygmvbRyHu2Oel405M0UVjxAZdRQO9NQ79f68BzEbvMMO2cZB/N/Hi4cj4sQbl5SiyvkFUmXhgHCdk1vmjC5Afm1jv9xpngW0RE3fQ4elnCjEIz5+oJoCK1JaQjXVlXmKM7EQBuBQ4Tz0OYuU3XA331g9CGrIGjaw8BnG9Ufmre5mWWG0nug+C33mRjkdUP5W1qSSNdT4dLzr1cZZnWxfEJXir+4yO2JimUDWulwcfF0JPU94QPIiDwR7hLiYd7I4rsgk7/jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpdga+IqNzyrek24Z1AdzIgCAdtWyrNkZcZp0wS+OgbkioCdy85Et9xe0kC2dhYQbwJA==]
+infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::publish::license_product_version: '6.2.0'
-site::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
-site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAChQgmoCFgGytTAfaXPn3pyWVrS3qbVqEmNJTWUctffk0GIhzOMnQNbVYD0RIl/x7/kJZq7/uuZMdYyygmvbRyHu2Oel405M0UVjxAZdRQO9NQ79f68BzEbvMMO2cZB/N/Hi4cj4sQbl5SiyvkFUmXhgHCdk1vmjC5Afm1jv9xpngW0RE3fQ4elnCjEIz5+oJoCK1JaQjXVlXmKM7EQBuBQ4Tz0OYuU3XA331g9CGrIGjaw8BnG9Ufmre5mWWG0nug+C33mRjkdUP5W1qSSNdT4dLzr1cZZnWxfEJXir+4yO2JimUDWulwcfF0JPU94QPIiDwR7hLiYd7I4rsgk7/jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpdga+IqNzyrek24Z1AdzIgCAdtWyrNkZcZp0wS+OgbkioCdy85Et9xe0kC2dhYQbwJA==]
-site::profile::aem::publish::oak_version: 1.4.8
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::publish::license_product_version: '6.2.0'
+infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAChQgmoCFgGytTAfaXPn3pyWVrS3qbVqEmNJTWUctffk0GIhzOMnQNbVYD0RIl/x7/kJZq7/uuZMdYyygmvbRyHu2Oel405M0UVjxAZdRQO9NQ79f68BzEbvMMO2cZB/N/Hi4cj4sQbl5SiyvkFUmXhgHCdk1vmjC5Afm1jv9xpngW0RE3fQ4elnCjEIz5+oJoCK1JaQjXVlXmKM7EQBuBQ4Tz0OYuU3XA331g9CGrIGjaw8BnG9Ufmre5mWWG0nug+C33mRjkdUP5W1qSSNdT4dLzr1cZZnWxfEJXir+4yO2JimUDWulwcfF0JPU94QPIiDwR7hLiYd7I4rsgk7/jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpdga+IqNzyrek24Z1AdzIgCAdtWyrNkZcZp0wS+OgbkioCdy85Et9xe0kC2dhYQbwJA==]
+infra::profile::aem::publish::oak_version: 1.4.8
 
 aem::maven::mirrors:
   - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus,!sirona-releases'}
@@ -47,12 +47,12 @@ aem::maven::servers:
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbTW1ZWhJ6XWqPPdsU4vXYYLQk8zEOh0y/a/g5SJ8bFH8ygZrbTNHeEaVTKLguF8Qai5diDKzL3pUiQUlRlbb6m69rf+g4hlNUM1n5PA6dfNnqUaMfpRH0X8VvhE6/Pgz/9zOep92UlVO9Aj78IZddWOjWd1Rj0KJ/RFoLBPfkXL7sgFv2pfoFMQIQ+5Yelaq+hy4vNbIKeJx1poHA9JEEl7O18bzYTO/TFzlvjbM4MphRvbM39c3F7IVV6A4PfZEYIFamHoijrWSuA9QoHCB6m5p/SgGisiKshpaQvBhAsmMmWXvHlFy0xifkt3ZllBPdSdtZuLnBHIpOAhNZcMZOTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBMwmGTKpQIcXGnUejWqwRFgCCDSr38JPWvgcVYUXTLTBOTx+GXPyygaUwFjHLOtIJnrQ==]
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::author::install_files:
+infra::profile::aem::author::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -66,13 +66,13 @@ site::profile::aem::author::install_files:
       tarmk.size=256
       pauseCompaction=B"false"
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
 
-site::profile::aem::publish::install_files:
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -162,11 +162,11 @@ aem::packages:
     artifactid: "sirona-initialcontent"
     version: "1.5"
 
-site::profile::aem::publish::jvm_heap_min: 8192M
-site::profile::aem::publish::jvm_heap_max: 8192M
+infra::profile::aem::publish::jvm_heap_min: 8192M
+infra::profile::aem::publish::jvm_heap_max: 8192M
 
-site::profile::aem::author::jvm_heap_min: 8192M
-site::profile::aem::author::jvm_heap_max: 8192M
+infra::profile::aem::author::jvm_heap_min: 8192M
+infra::profile::aem::author::jvm_heap_max: 8192M
 
 aem::enable_https_mapping: true
 aem::domain_mappings:
@@ -241,7 +241,7 @@ aem::domain_mappings:
     create_sling_mapping: true
 
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgXGL8yKBQfWtlGeVsg1+GZixvGuji+xKkBsVmHnmSEzHcWf+0n+vgT78n7Cbu1bEsvEK3rgxYy/tJmAjif/arLMxMKwGvPHRRIflLFR8aOVAVzVr51ou9G6dzp4VFFKpcoC8dMJDoU916Iit5rR9gur3fiOxTldHYm9ACC3LS5ob1LFy4eM8ZfitOgFyd7fMUpeTJOJOo3wvxt9228DmPZ/+lktrMeCbWpUaYQkIdIUTGfO1E2HOreR/kB4KKXtdJr86R1CpuhaOCopcygvSKA2yEtdbpXLVrhNG6q4UeUx7ZkSqmP3CxgGJh89zVS/DZzKEHZBTxDPOyHfups/wcjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBdBISg03E1LAQ1Na16W5uwgCAlIRifeGFvQ/cGA+GJgrWL1jVdB06FonJX4CPjaHe3XA==]
   brand:
@@ -257,7 +257,7 @@ site::profile::apache::htdigest:
     sirona: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoKgv7PxnEEvHarHzl4+sEDPEPU7rCPEwGwkCiXTBv8dGi4a3aHw2qd9vhhs+07sq0Z7UKoD/mjNkjw03YiuxSXUo8qaJUS6TXMx9tXiZDeuqNt96GmsvTVGJoRO1UaVi0/xwQC6bbhz6inyId+evq0nu9wfrbHY/6/HK3tNxCE7BpvkaqBeLDcB2fOlt2LqYtIYF0Vxzn5mK1MG4dDCruqsqUUBCXJig67yV7euVuOBQJWNfc6q3Qbn3EYf+0uI2qt75S0kqU5qUXYkAb476jG2yI4VO6b3xVYTSTQ7T03fstw6RsKc2VKAA8CnDfdi71bT1/8vSuIw6oQOLu926vjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBpKbTk2QaXut21gaT78GRWgBDg/TLvXIFT2zpGoV1Dkkxu]
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   sirona:
     serveraliases:
       - prod-sirona-publish.pixelpark.net
@@ -1635,8 +1635,8 @@ site::profile::aem::publish::pp_vhosts:
           - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
 
 # Apache Author
-site::profile::aem::author::enable_apache: true
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::enable_apache: true
+infra::profile::aem::author::pp_vhosts:
   sirona-author:
     docroot: '/var/www'
     servername: prod-sirona-author.pixelpark.net
index 9c5a31fa58f1859541334f6f6b6461d7b82acc68..690e4edb27c7c83818fe6234bf595bf9a7f106d4 100644 (file)
@@ -23,33 +23,33 @@ sudo::configs:
       deploy.vogel ALL=(aem) NOPASSWD: ALL
 
 # Author
-site::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::author::license_product_version: '6.2.0'
-site::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::author::license_product_version: '6.2.0'
+infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 # echtes admin passswort
-site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
+infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
 # admin passswort ist admin
-# site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALC8JAdv3FCdkq6yFBJME4jXn39wDM20XHISJMCvwtFi+v2jEkKXXXg595wAsfVG34ub72HR7HoFRQb7ciU4bThzCOkNkGmndMLbss9M9GfhFJsnX1tt1QX9gf+SpljLjz3qRYoXZeOc6BZsXelMnW9VEN/Bc7rKAm0InvngVMAL6Bz7cI58tjKBZzvibyPX3eN/wvdR63/0xsxXiXmvqu2myE/E3lo3uMeENaNIJnl7D1SqlNPgC5x6aPX2/iCVlvwbCS1iiGvLSfQSjK5qbofil9KuRGXwbrOqZYok3hOYtrhXlNBEoYgs31sA8UtiBw6chEntHdxSbMxGhTmcoXjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBkAWpYa4Zj3cx6MbSLJo1pgBBknstNOXBrrfN9PxBwe+Xe]
-site::profile::aem::author::oak_version: 1.4.8
+# infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALC8JAdv3FCdkq6yFBJME4jXn39wDM20XHISJMCvwtFi+v2jEkKXXXg595wAsfVG34ub72HR7HoFRQb7ciU4bThzCOkNkGmndMLbss9M9GfhFJsnX1tt1QX9gf+SpljLjz3qRYoXZeOc6BZsXelMnW9VEN/Bc7rKAm0InvngVMAL6Bz7cI58tjKBZzvibyPX3eN/wvdR63/0xsxXiXmvqu2myE/E3lo3uMeENaNIJnl7D1SqlNPgC5x6aPX2/iCVlvwbCS1iiGvLSfQSjK5qbofil9KuRGXwbrOqZYok3hOYtrhXlNBEoYgs31sA8UtiBw6chEntHdxSbMxGhTmcoXjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBkAWpYa4Zj3cx6MbSLJo1pgBBknstNOXBrrfN9PxBwe+Xe]
+infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-site::profile::aem::publish::license_product_version: '6.2.0'
-site::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
+infra::profile::aem::publish::license_product_version: '6.2.0'
+infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 # echtes admin passswort
-site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
+infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
 # admin passswort ist admin
-# site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAf+Aeig3Iiff8ImsVahdrA5VNMrmt8d6dF+xzhdl6ptL5fxorCRfBmgV1x3Cj48unmv1WM8E+cWHkOXlnjbhEcE3yR63rOMgYJhYAyDzNLnaAQGZvbY8e5Y4xOUY9tblSY78ISyCV/2X9u6JstbpS6L9Fkf5Q3jkW4d2NeO0zbdjlc/uMpZaJskkU+eckdPzZYnfgkKXYjPiVujSNMmV0ZM0Py58HZf9tkTAwMjzmDOZ9BqUgzPcO0EV4Z1ymXi9DK8HxLKbndCnQTRgR6dMXEn+QUTfZbKSc6CekHkNFNWSsTUe4chaIGWG1Aur1Kn14ZKspzbHfyV3muJhxIHIzIzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC5ajaeTDNBFE93ZoxDzvdPgBCslv0jerR9CNBiwe17Sllr]
-site::profile::aem::publish::oak_version: 1.4.8
+# infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAf+Aeig3Iiff8ImsVahdrA5VNMrmt8d6dF+xzhdl6ptL5fxorCRfBmgV1x3Cj48unmv1WM8E+cWHkOXlnjbhEcE3yR63rOMgYJhYAyDzNLnaAQGZvbY8e5Y4xOUY9tblSY78ISyCV/2X9u6JstbpS6L9Fkf5Q3jkW4d2NeO0zbdjlc/uMpZaJskkU+eckdPzZYnfgkKXYjPiVujSNMmV0ZM0Py58HZf9tkTAwMjzmDOZ9BqUgzPcO0EV4Z1ymXi9DK8HxLKbndCnQTRgR6dMXEn+QUTfZbKSc6CekHkNFNWSsTUe4chaIGWG1Aur1Kn14ZKspzbHfyV3muJhxIHIzIzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC5ajaeTDNBFE93ZoxDzvdPgBCslv0jerR9CNBiwe17Sllr]
+infra::profile::aem::publish::oak_version: 1.4.8
 
 #aem::author::install_packages:
-site::profile::aem::author::instance_name: author
-site::profile::aem::author::install_mode: 'quickstart'
-site::profile::aem::author::install_options:
+infra::profile::aem::author::instance_name: author
+infra::profile::aem::author::install_mode: 'quickstart'
+infra::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::author::install_files:
+infra::profile::aem::author::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -63,12 +63,12 @@ site::profile::aem::author::install_files:
       tarmk.size=256
       pauseCompaction=B"false"
 
-site::profile::aem::publish::install_mode: 'quickstart'
-site::profile::aem::publish::instance_name: publish
-site::profile::aem::publish::install_options:
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-site::profile::aem::publish::install_files:
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
     content: |
       path=./crx-quickstart/repository/datastore
@@ -197,15 +197,15 @@ aem::packages:
     artifactid: 'sirona-initialcontent'
     version: 'LATEST'
 
-site::profile::aem::author::jvm_heap_min: 12g
-site::profile::aem::author::jvm_heap_max: 14g
+infra::profile::aem::author::jvm_heap_min: 12g
+infra::profile::aem::author::jvm_heap_max: 14g
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAC6UHVr2KCcP2R0AcXYupc1zdKkh7YXJ/xINkSpTyYRYBWw29eQ6JUa/mx4eYqRjqz0x37w6wqsTqLIcizJMdGVKpQipBXLuLQ5hA3YOWRST+bupvG0JoCEaQVczj/AikRE3Mf+QzOBaQMwEo4e/exCLKNZEuDfnIspJb5oTPbi2vaNJgEHWNJS6hTLf1ZonzvOXe4Mtqw+5B8xAosLDVGvWM1Zb7Hrb/8tUjG1xsaJ9YqLzVF1qH5ytmPmEfhImPMN9u490VzTMObYt6XivSuIpA/0q9tBfH12rz4A1yZPbnpX4iDlFHRDcJiVWyNgZp7IrFovDSlmS2OQHMgOMvRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwKyXhMzA7p/9rpHf1H+MNgCBbwv2GdbEw958QxRxezuECS1fkS97ZUkydQI9NuOoQeA==]
 
 # Apache Publisher
-site::profile::aem::publish::pp_vhosts:
+infra::profile::aem::publish::pp_vhosts:
   sirona:
     docroot: '/var/www/html/cache'
     serveraliases:
@@ -248,8 +248,8 @@ site::profile::aem::publish::pp_vhosts:
           - 'env AccessControlAllowOrigin'
 
 # Apache Author
-site::profile::aem::author::enable_apache: true
-site::profile::aem::author::pp_vhosts:
+infra::profile::aem::author::enable_apache: true
+infra::profile::aem::author::pp_vhosts:
   sirona-author:
     docroot: '/var/www'
     servername: int-sirona-author.pixelpark.net
index 86c0dfd7ceccf026eaf43aa973cfdc9cf55c1349..52dbda68c904bdf8266b20342545159b02ea293d 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neo4j
 neo4j::dbms_connector_bolt_accept_non_local_connections: true
\ No newline at end of file
index b57d7c1a61a7ebf24be9f684d126fddb08fb4812..639cb50c5e4a0ef50c9784b5693b074fdc266b6d 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neo4j
\ No newline at end of file
index b57d7c1a61a7ebf24be9f684d126fddb08fb4812..639cb50c5e4a0ef50c9784b5693b074fdc266b6d 100644 (file)
@@ -1,4 +1,4 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neo4j
\ No newline at end of file
index de0eef244d0e41ee39cbcd4706b4acfcdf029928..a695d942085b5d0df8281402da95bd88f6e45520 100644 (file)
@@ -1,16 +1,16 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbcQUj4XRRBd4alnF7B3DBILrE5iosiFndOTLHDuqCDrCB5pDZ7ibSDn/bn6cfAMj0qjVlf8Rkg4BfJnV9lRq2sCX1nArCIRK5JE6o+1KofYTMFoGZm/BPebfSYNV58RLGM6bLmuxNbrAbqkaurBqDK/gOguLOk/stnKVFxWczvv0XKZzFUiRMGUNy+saH1OGl6SGu456kMrc00HMvz+ureZ6SeIGx3rp9qWXq/1yF0rlZJWwSfeHMn5Aux9Clkq4zSABR+QDNqZfLjdvSJxNqfqKO26DeNss3RZpRfghOvs79r9R+mECeCMZwFHsE6UJWMuPVwu6hZbQHu4LaNTAsTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCuvKnwPS6BIyghREjSXb0UgCBB16IivO69e3+d8YMKUpHCm/o/AE8m5sUFydu9LOfHqg==]
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIcowB5Ck/5DaBrNZOqTevgJx3Pa+G49Z6CE59Y0GbnlL7dOfdIu94mH7sNZrwbahu4yEBMnZZZMCpSX/QdNR+thUtzweGX6wxQ4EsYb6aGUUQ5qb40nW2h4Hiwuml38DxR+msCzT5yJ4r787yRjr5nPCiYUV+rdcw3+qATLRyeOwnDuVsIyF0Q6XycUCy3krbTscPjSP9LIoASW0Fc6T2GZgHWIbgMPWYgS4EJJ+Tt1yj/rvk9Y0A3qAFAEPvtiMaBWGOHSET98eBAxI+Gpsp7vpl+SJQpAO3WwCji88vKhoMkaHeDJPACArZSTszWjoWBg/3DCGrDQlaI9Zptyu8DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8oH+jlRtLcKKkmFCXsMdbgCB91phapBvBrHwe6sH+iQkrVfO6pCrVESp9iEiXtuuVEg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAI8qIdiPWXVE/9Almes/BB/QEjaDxUshwSJiZBqCPradCpAxjGWlTr6M3gzYmpl0leVq2pFgGddHLYhK9Ke5Z9EpJLbqNwmdUnaT8TYXyJdlHP0mnv2+xINh9144nehlVgX3M7VPCnYyQ/Ruk2uF3L4X4xMLdKmE8Kk5IXr/7Ksib1OwxQ+Y6VdZjluw1ypViNr98FwQ5dwSbs0b098ts2HeDQ+h5YC5cysdQWBDr0z6w9HtWM6BYkcDwc0j4e2fpekEbykXxidFMSE5G9pCPZVL6dBSqjtzCzgRq4vd0Uv53H5j6FWLxYKtyUA3jNwN03ukgL3MzOMKEZDwUXhgyGDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCK1dleAlyWdS9NNC2w4V5AgCCJytEyoEG1Bzae1ySal+BniCi3U/h7l99QCZcAqFHNDQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   urlshorter:
     user: urlshorter
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr+bfJHHKXd9UOoo/5Q+cfvxNUkbkNXL358DJ0u+Jeve3YX11SVKiunHfHTz0LQYI9p7CM7DVmqMNHyihtNfzcH49zkd82YvZjR+bTuuwFQW9PHKfI4Gq8ISwvFmsRq09XzaHGRyIx2xkCfhYoslrJ9pzxBl+ewfzv+gFRa0X4alUFwm76iRoR+IYldHqePTTgkm9D0hxZ1DVzK2Z7R1L05gaeeRWDN0GDYc9ISE3qAApQ1HmieyUH1dTV01QywmiZDEpv5qhzGjofO3EdEMdGfyvPR/Lkl2sSmc9x4RzlKiN0bz4gYD+LAY7RpyPoJGjrqN+0Rvogu6/l/5UZAtqnDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCaIp9a1ZgYLSAEPnpS+/7/gCCuT6XE3ZyS5my/6EOmECd7W0gZDpkljA2OiU75nmIytw==]
@@ -19,7 +19,7 @@ php::extensions:
   opcache: {}
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   url-shorter:
     servername: www.siro.na
     serveraliases:
@@ -102,7 +102,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   url-shorter:
     listen_owner: apache
     listen_group: apache
index 9d8991ffa3c905803c23a4d5ba16177147a05590..160445b904a6a0327360124d3c7d0dcd494bf338 100644 (file)
@@ -1,9 +1,9 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - apache::mod::headers
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
+  - infra::profile::ruby_passenger
+  - infra::profile::mysql_server
 
 accounts::users:
   jan.paki:
@@ -26,12 +26,12 @@ sudo::configs:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQbw5M8tG9ihcai4Wz1VlgwCMajeQ6G4mJDQnOLQRcduEjYAzU/tQRpFOknSMt9geUK8bTss+feRs5FFShoEXNsKaKMNK7urdsfm6Ck0v3/+crb91P4cixLuWIj3eKlLvbNnhSUTtKfoL+88dkpoO304loSznfH2JRf1zjwsQAhwJXEPbK5Y8Ojrjdps4KI3CQRUB8SLKBn+r26mCB1+ZihouPlCF7BCMptWTShPisU6qMmcCRsouM+heyOllAdn7kS2On8z93xNIClxZNq5ONCKoekKKR/zZFFZk7g9CPhbSb5jvxFflfQsnlbcXLd2DSYQy8NnI635jnQyev62e5jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxGiSc23D99Nq60eBFCqI1gCCwbE2IiK1U6WNm71U2Z37FvsEUOZcuat97JDv4MHWAHg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAf0Nps0ENQdyuzmm/cxgfTNdXo99000BX9LtRbZE6qDwsOuiA/L1C7wMcnUK6C6ROAlIz7HcyB5oP279PGFHSExbubIzoAenXmh1NGVUlrINBAHqx3LS1XeUO9Ftf//5cJ6o8RjLiaS/1lPsRMTo1F0+RGgDQVBWYrC3JOBJpQGv/RQeKg5f9r/MwQI5Q3g3R81/daQOFk/oK0jaiB+VvNhj5IyOUcIrBnLrf2nZLtsAidCdYC4mNIpl4+FaPY1pOHfaTm8o6wFfiMmsUMY7uFJm1IqUFXZ5Orgn03Ufk0ywXAKUSoTQH6DxUiqoOiiKS/Q7pWtgn2IwJWoxTW+JMGDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD9GZ5Cg04+ZsXtF/iozSgHgCCIIjEqHNZBHUwOblfjUgiIwuj9bQf6f0RQrTtntKtCnQ==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   agmv:
     user: agmv
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqOSB66ks8e2apv9b1flLNPRTdplELbZNJBhwFOiS2O0wIb/qCZDccBOJ6LGM0bvIxSwX9C3HaVot7Xis6pW3+Y7RQgoWiDuSpq0XGzlhqDt2znPVC0dYjW7OX+JtpEljtDzM2xLtqu9fW+1kwGTwTC7SJtGguvBiuF4kdLD8ZrpTtBOWteoTzrlAGv135fOSh0W31EiqsXlDC10zkYWSAJvG/OiR7ev3nlDBllKtmVMbOP0MjGdpgsOw5JfvfsBHEXZ9ESrx+RTjlpvIKmRRmDn9nnGH2NgparzK0WSAinKytu2oFFvRtUHXHA41bsDvGwP5fQDqofCiIfsRENsDsDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDqLWo0iGgwuRUTpa7ZdW9FgBAJszMVmBkQatTzQqggFI7m]
 
-site::profile::ruby_passenger::projects:
+infra::profile::ruby_passenger::projects:
   agmv:
     servername: agmv-sparkasse-de.pixelpark.net
     serveraliases:
index fbb083ea1cd28bad61616a36c6fb4805304b428f..7b9a9e2b1689e1d2bda460dae30d34dd159f3565 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   christian.stoehr:
@@ -21,8 +21,8 @@ sudo::configs:
     content: |
       Cmnd_Alias SYNC2LIVE = /usr/local/bin/sync_to_live
 
-site::additional_classes:
-  - site::profile::wordpress
+infra::additional_classes:
+  - infra::profile::wordpress
   - apache::mod::headers
 
 repo::remi_php70: true
@@ -39,7 +39,7 @@ php::extensions:
   mbstring: {}
   xml: {}
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   sparkasseblog:
     listen_owner: apache
     listen_group: apache
@@ -51,13 +51,13 @@ php::fpm::pools:
 apache::default_vhost: false
 
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADEBQNLo9VA84SyngSPaUdnI66OlUpUUGQn6LKYQPNtKAtt2Ff2l76Vrt4saukgDjr26hR6xsV8lGye/WP6PAGeereAHw0PZnAV4VG6GGqzWBEprmAJTdeT23a13R8y5aTRhvqbunPPPe0lngSbZ8RV3i+A1wMVqpZijth5LpbgSKKVdGwfaNn32QQsboB2kP/A0HP1XpyywCiA9/Apjmx9wAX+TgMaIIwTJeekRe/I/+GArMSFtIbuUDu+7Vg5qSzXu2rB8GvUs0A5ZJAL5p0+EocZOnKl1nliJwLC5Br8fqQp9rMB5DJ0kLuR5SMNmu1p3YpxrOo7SsbNqj3hAqVTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCZtQrR3wtaUfVQuAK2EodtgBB4Lv6RVYc9fe5tYSFaC8LY]
   server2:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADEBQNLo9VA84SyngSPaUdnI66OlUpUUGQn6LKYQPNtKAtt2Ff2l76Vrt4saukgDjr26hR6xsV8lGye/WP6PAGeereAHw0PZnAV4VG6GGqzWBEprmAJTdeT23a13R8y5aTRhvqbunPPPe0lngSbZ8RV3i+A1wMVqpZijth5LpbgSKKVdGwfaNn32QQsboB2kP/A0HP1XpyywCiA9/Apjmx9wAX+TgMaIIwTJeekRe/I/+GArMSFtIbuUDu+7Vg5qSzXu2rB8GvUs0A5ZJAL5p0+EocZOnKl1nliJwLC5Br8fqQp9rMB5DJ0kLuR5SMNmu1p3YpxrOo7SsbNqj3hAqVTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCZtQrR3wtaUfVQuAK2EodtgBB4Lv6RVYc9fe5tYSFaC8LY]
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   sparkasseblog:
     docroot: /var/www/sparkasseblog
     servername: dev-sparkasseblog01.sparkasse.local
index 1dc44a9d3ffd8656d44c83c621af7ace1fddac27..d2935b6751fc7312242f8bb6f84c9c86210bbadf 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::role: base
+infra::role: base
 
 accounts::users:
   christian.stoehr:
@@ -13,8 +13,8 @@ accounts::users:
     groups:
       - pixel
 
-site::additional_classes:
-  - site::profile::wordpress
+infra::additional_classes:
+  - infra::profile::wordpress
   - apache::mod::headers
 
 repo::remi_php70: true
@@ -31,7 +31,7 @@ php::extensions:
   mbstring: {}
   xml: {}
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   sparkasseblog:
     listen_owner: apache
     listen_group: apache
@@ -43,13 +43,13 @@ php::fpm::pools:
 apache::default_vhost: false
 
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATnMDG44/ZnCilRCobmITdZSUkJagJL7roY49X1ZlAqV0aWGkIaJa7oJSVBB54StuIfBWmJhFHPlLEiUbpM0f/8D5B5IfHjwgdxy1fwNmt+8RIFt7mvwdOz+BK7qDH47SIY5y1X1eDrNFkpsrXLbL6DDfPEWdgPU0yujRZQmDGogNmO4hxhYbHbyx7uBAxgtEbgktsp5iPf1pegAdvrR9xdARI6I/RCb/WEjvrc4zp+bHAVcepApaW+BiqvszqYkH/EmEPQN947gqQXpGlwGLhBvlb9wcuERl0fzfXL2xYrecsQA6jHaRZ6fMexIRBOOLDb0RREfhs6aYUDk2/vQkSTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBx4KctmFfHVgZ+hgfY5Y3KgBDWskWdN0LXoA4hom6wevWO]
   server2:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATnMDG44/ZnCilRCobmITdZSUkJagJL7roY49X1ZlAqV0aWGkIaJa7oJSVBB54StuIfBWmJhFHPlLEiUbpM0f/8D5B5IfHjwgdxy1fwNmt+8RIFt7mvwdOz+BK7qDH47SIY5y1X1eDrNFkpsrXLbL6DDfPEWdgPU0yujRZQmDGogNmO4hxhYbHbyx7uBAxgtEbgktsp5iPf1pegAdvrR9xdARI6I/RCb/WEjvrc4zp+bHAVcepApaW+BiqvszqYkH/EmEPQN947gqQXpGlwGLhBvlb9wcuERl0fzfXL2xYrecsQA6jHaRZ6fMexIRBOOLDb0RREfhs6aYUDk2/vQkSTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBx4KctmFfHVgZ+hgfY5Y3KgBDWskWdN0LXoA4hom6wevWO]
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   sparkasseblog:
     docroot: /var/www/sparkasseblog
     servername: sparkasseblog01.sparkasse.local
index f8bd59de1e7acda3f2a18193ca1cc86c99ddfc53..3a29b0c89df078216ed84d6e29af7f649fad4be1 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_classes:
+infra::additional_classes:
   - repo
 
 install_web_app::params::version: "rel-1-0-74"
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index e1ea13786ceebe3d9cef2c012fbdd293e7959fe8..d6dfe1e42d1c1d951e9d572badbb7f337e2cde8a 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::mysql_server
-  - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::mysql_server
+  - infra::profile::wordpress
   - logstash
 
 accounts::users:
@@ -15,7 +15,7 @@ accounts::users:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASqZfnt59mey8HLkeQphdebiA0n+wmo7NdvuBCDN6YsQ8A+tm2+X2w6ZEWv/PPY3SMbJcOTyCikeTqn9MIAn0tbwCpNWDcH1tRxqExyQpyhR/EgsrU/pN01UdK83eLkuVrqBdmM1GycBMPqOXYhk1Iku+E4cIBIzTxgYULiGLRIBEM4OmijI3zQCDFjJz1i9Tc5en3N88HH3IGE7Fc0NI4F4QNt5JexeZeJdyYI/GdVAVirLACsyC1dlufnvRLpUc6fxlfxR/JH/CRABKPZ7kOWvxDYJcowvtK+awngrqHjinsLIsl1aclGZctpMONJkCLGSgvU4V2LPmk+m1ZdbJ3DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBq8DBveIPcyyzrlMGPlVEPgCBYw+kQvlMfC/PcjOPG5q7gE2UIvex7fq//ix7T6hf8DA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAt1mAc2+JrfVtj4N5gYF8Z1rngl/IrHTRcFjKsslqDQvKbOkZax+jURg6QvmbWwsUh/gP0L21wDJHKXhoj6SQ9hNx7ofxmAa1gHx4AHBQBOahVXRsKuEWtls+nr2UfDaAkokfDsCx/wpAWLE0PPOnx2K9xVk2FlK7Ln6neapwbK6t06rGyQlFEaDT5Ymt34Erd58st2jBkytsyoC/Uc7d1hRp/vpb/l3cfyJNhcPhls546pw2u/2f2hGNdFLrJtA1Kkuk0PvOXG99BUVsVSxLMmtHvds3PY8nY1uXE36ZNpWb9h8fWxGphIFAQYi5vkKKiDE4TSM9PXGpiK+iajAd7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAra20b8e9QIr5oTqC4KjITgCA3TZFO60ZSW75emlmmzslm+8w6DBvvtNrZ2d01jTHltg==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   wordpress:
     user: wordpress
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc2YahBpu6Q6bBLUu0pl8/EGtzjpIpyXfxYUat3fvToMnvTlCrD55Sn9cB1QavAqihOidBG7jObvwgCUAKvg+Jfh1Y9MAO21mP6RHX4EMPsxPC9LfNvJXI6b4JbR6Ygdsom2LAf09UCsCtNRWADBWxXq5GglvpXRZoa0QT/Icrwv1RW99IVJFDSb7Il56awyLyLUQqoySpfbRzpcGzZPUbyNSanALY7/uSmGVpqJ+ToWvZDCpLGWleT2J/87DMvqQu5FSkJGOMOsl6rxhJC1YoT2slRwFGvcb+IKh0Gnw0geoGCz4VHnnirVtQ0yfTXbcltNDiddQHi3on2Iv0KQAkzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBUdF+vmXAMuWXV/cSllnN1gCCSSj0KXMWghCAeyYYKtnnXl2/wnnJUQYH/sHfy126ULw==]
@@ -25,7 +25,7 @@ mysql::server::remove_default_accounts: true
 
 apache::default_vhost: false
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   'dev-microsites01-sparkasse-de.pixelpark.net':
     servername: dev-microsites01-sparkasse-de.pixelpark.net
     docroot: '/var/www/html/wordpress'
index e18b02bbf5e65193b759e7f03cae1481a11e7a28..bd0e0062e25abd07293e4d1a34ab7e802631abf6 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::wordpress
+infra::role: base
+infra::additional_classes:
+  - infra::profile::wordpress
 
 apache::default_vhost: false
 
-site::profile::wordpress::projects:
+infra::profile::wordpress::projects:
   'das-geht-einfacher.sparkasse.de':
     servername: das-geht-einfacher.de
     serveraliases:
index 608a748bc90d239d0ff1b96e9c5d8f8e9f18287d..023097f5d00c831e80029726f79ca3012359a31b 100644 (file)
@@ -1,6 +1,6 @@
 repo::remi_php56: true
 
-site::additional_packages:
+infra::additional_packages:
   GraphicsMagick: {}
   git: {}
   python-httplib2: {}
index d3be8a606754c35560b7dc8209ddebe99ece5858..536d4de4c01059abbffa69a142b1aecaab2eb129 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
-  - site::profile::apache_php
-  - site::profile::mysql_server
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGt1nfsD7dRELG2SxIXXJzQp5RNhKPyLnw8FZN49ay3AyQd3Waal8XyOgUF0Xrkg3iWnhRKsikTUh9n+kdsM9vZgSe0Baheru36dN+87kHrw2UdHAKK+8ZBL1SXGy33f55UFlZZ29DVxC0MHw0uZDfTR+tJvaNmzTs6EVfh5ed1wAmUq8IGc0pvxazku1kySQ8WKMlGd8e5gBeV6w6wfu35te9sdJdcQjtEY0dUdZCIXunDsnve+Zle8qfFHOkAB6dCm/7ZddKvStxCNI7MiwZ8AZdS9+UH1uye0EevIwk7R5I5qSwMdBOz73Gkq2RwtV6NAJm+uy1nKkkEyFrL068DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCzkeQnbjMP4SzWF76ofX6tgCCvd3x/kMaHU1EAZYJsTO9h5o4z54F/osjTEDiownVwAA==]
     www2: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgYgqbAh0RrzYdiXUw8z/RZsqlIJWcTCqKINEZHI/uvoxx6iGVJNoy3JDCqcrE4A8syCGOsZ2X8xzeVFyjPXI3iMMZZAO0mpt5cweBK8z9Z2CXtrvyHH05ja2k+SfEudzVMT/+vuhaH3cZrSvkhGPvGwmirhcLs2uut07f8bMpXyN8gWftPT4a3EeEm1hPHz/61Q+d55J33uZW6uIt973fNOaH0ekN9A8J7TV6JfJUcAxj4muT8q1T16AsAHV8gy/t3mQd9f6vjJ2kObMAD+c7Ot1gRjrSRKFe2tqAKQ19d2GveNZjL/bgE1EKegLwOr0DdkxAu43q4erxP+WqMGpBDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCsayaF1ZpPuR0WE68CvJ/EgCCGsIwZ27quP+ChZdmFkTs74jr6z5V0ZepnxbGrZEb0tw==]
@@ -37,13 +37,13 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   paydirekt:
     user: paydirekt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABCMxW5PSlUOZkKL5JqcPWbEpUA1THxzsj/3FgTgrKjUCv2xklDYcdRL+S3D84PF8OAl3VLgDCjhcWixqDMCte59W8F2x/Fjaiu9Olz1Vz+KO5bhME9fJFRZhP4ug0QEySTRRHnlJOMqiyd0FIB0hQ+48HhXp9slxb6LV7KogUfV19Qd7opUDfbLpsION6QbcYpMXZ4GcPDfo3wr2mcvxL6cWkidJi5MMYosx79MznEjQoMOojQPzhP0i8hJEnaa39P99EtHKzNSZV5Qoku31r5dl1D7I4o5j2WdkrBrMtkaxs18MV9MAvPpRppxOvn8GXt6TJ2AqhPg+VEzXuVOxCTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCg6PbdraoTzdjYF4IzUIXFgCCaVYkYJ2ktgjDvnZHwejBkD48oz7+wIXQNB+heCW6JOA==]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   paydirekt:
     servername: dev-paydirekt.sparkasse.de
     serveraliases:
@@ -86,7 +86,7 @@ site::profile::apache::pp_vhosts:
           - '^\/?(.*)$ https://paydirekt.sparkasse.de/$1 [R=301,L]'
 
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   paydirekt:
     listen_owner: apache
     listen_group: apache
index 1d927552abd81c8ec893ac2d5e47f73e170e6793..7a031b3f573f2b988ede59b36095e1433e365c93 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
-  - site::profile::apache_php
-  - site::profile::mysql_server
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGt1nfsD7dRELG2SxIXXJzQp5RNhKPyLnw8FZN49ay3AyQd3Waal8XyOgUF0Xrkg3iWnhRKsikTUh9n+kdsM9vZgSe0Baheru36dN+87kHrw2UdHAKK+8ZBL1SXGy33f55UFlZZ29DVxC0MHw0uZDfTR+tJvaNmzTs6EVfh5ed1wAmUq8IGc0pvxazku1kySQ8WKMlGd8e5gBeV6w6wfu35te9sdJdcQjtEY0dUdZCIXunDsnve+Zle8qfFHOkAB6dCm/7ZddKvStxCNI7MiwZ8AZdS9+UH1uye0EevIwk7R5I5qSwMdBOz73Gkq2RwtV6NAJm+uy1nKkkEyFrL068DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCzkeQnbjMP4SzWF76ofX6tgCCvd3x/kMaHU1EAZYJsTO9h5o4z54F/osjTEDiownVwAA==]
     www2: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgYgqbAh0RrzYdiXUw8z/RZsqlIJWcTCqKINEZHI/uvoxx6iGVJNoy3JDCqcrE4A8syCGOsZ2X8xzeVFyjPXI3iMMZZAO0mpt5cweBK8z9Z2CXtrvyHH05ja2k+SfEudzVMT/+vuhaH3cZrSvkhGPvGwmirhcLs2uut07f8bMpXyN8gWftPT4a3EeEm1hPHz/61Q+d55J33uZW6uIt973fNOaH0ekN9A8J7TV6JfJUcAxj4muT8q1T16AsAHV8gy/t3mQd9f6vjJ2kObMAD+c7Ot1gRjrSRKFe2tqAKQ19d2GveNZjL/bgE1EKegLwOr0DdkxAu43q4erxP+WqMGpBDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCsayaF1ZpPuR0WE68CvJ/EgCCGsIwZ27quP+ChZdmFkTs74jr6z5V0ZepnxbGrZEb0tw==]
@@ -36,13 +36,13 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   paydirekt:
     user: paydirekt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABCMxW5PSlUOZkKL5JqcPWbEpUA1THxzsj/3FgTgrKjUCv2xklDYcdRL+S3D84PF8OAl3VLgDCjhcWixqDMCte59W8F2x/Fjaiu9Olz1Vz+KO5bhME9fJFRZhP4ug0QEySTRRHnlJOMqiyd0FIB0hQ+48HhXp9slxb6LV7KogUfV19Qd7opUDfbLpsION6QbcYpMXZ4GcPDfo3wr2mcvxL6cWkidJi5MMYosx79MznEjQoMOojQPzhP0i8hJEnaa39P99EtHKzNSZV5Qoku31r5dl1D7I4o5j2WdkrBrMtkaxs18MV9MAvPpRppxOvn8GXt6TJ2AqhPg+VEzXuVOxCTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCg6PbdraoTzdjYF4IzUIXFgCCaVYkYJ2ktgjDvnZHwejBkD48oz7+wIXQNB+heCW6JOA==]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   paydirekt:
     servername: dev-paydirekt.sparkasse.de
     serveraliases:
@@ -76,7 +76,7 @@ site::profile::apache::pp_vhosts:
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   paydirekt:
     listen_owner: apache
     listen_group: apache
index 7f0286672d19778716e6008c11cb27ca1c4a9b8e..78f56e25cff3713f5d416381763bb6d7ad127411 100644 (file)
@@ -1,5 +1,5 @@
 ---
-site::additional_files:
+infra::additional_files:
   'pre_docroot':
     owner: apache
     group: sparkasse
index 38dea1666d00daac7bd9fe5b9ff8c6b016827a00..6024a5bdef689c373915e62e910f2f7d95fcf774 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
-  - site::profile::apache_php
-  - site::profile::mysql_server
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATbrKE5PWYZsE5ncmTjKWPHLpqHkoe0gAt6HEqhlA7D2G76L2bVRS6ze/kbl7jJnfe0gVXcmVvfUYdBzhe1vWL2ohZdueAX/UTdBjkLqyfaQfhwQyDn1aKDjph+XQsfwHpJCLl/3UYaTgiFns1DfVvFNvx8fWc+UQSk1PtA2ySjyV+pP6zF5zSxP8hfsnU+c4L37x6pJCjxtjbD7/YYQ07dW0ZJ7vBdcCO+2igXBUN3gTXqiuLZlqd+/ox8LZpRJBQdDBX2rXBZagqlaOK2vLUGNEwXFIHcKtLCBHR4fwx1fSB95WZsLJB81C58C8xnXe0BrisVD8kQmHm5WLFIf0mDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCx7aPee8oXOn5CDQ6niF17gBBmr2Z2C8FZCIzgu+Du0C3D]
 
@@ -34,13 +34,13 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   paydirekt:
     user: paydirekt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr53BVmxG4NzFnWnwjz6vHPlVAwy49fYxyJoXY5JythkzTEBtCp85OzA29TFQ3BZ2htqKhbUstRyHPrP6hTztWBrYJtqj3vXO1KWbRLecQ8upeICeRedUxiPPhaqB/XYjL1xzKpG2W6REsEAl3+2YSPpMjueYLUK4zDMgpiCQ5yq+hDOXXEI7a8b/cZObUwx9NqZdPxXugc71E1FymeYRRwa8snVMZrIyi33Cv9fT6Qc2saeCRZIAXhy8Aqnz8a5D5z3ivzavf8HUCelaXyQbkJpOjGY+f6Ywyq5NxLkUJLdl9RqJ5ABfFLchWBlqbDLUEm0yN6m2BnEJ/4H/6XwnADBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDbtDUxYBwfQ/x384DoXoYngCCvnqXEf0Ob+0iAi6cxgdilhLse9Kuz3ferxExlHTt0KA==]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   paydirekt:
     servername: paydirekt.sparkasse.de
     serveraliases:
@@ -74,7 +74,7 @@ site::profile::apache::pp_vhosts:
           - '^\/?(.*)$ https://paydirekt.sparkasse.de/$1 [R=301,L]'
 
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   paydirekt:
     listen_owner: apache
     listen_group: apache
index c7f67239568fc8cb6e926699055978ab71a4be35..3889e7676a4e76fb8a3bea19721d8bc34b5961b4 100644 (file)
@@ -1,11 +1,11 @@
 ---
-site::role: base_for_old_systems
-site::additional_classes:
+infra::role: base_for_old_systems
+infra::additional_classes:
   - accounts
-  - site::profile::apache_php
-  - site::profile::mysql_server
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATbrKE5PWYZsE5ncmTjKWPHLpqHkoe0gAt6HEqhlA7D2G76L2bVRS6ze/kbl7jJnfe0gVXcmVvfUYdBzhe1vWL2ohZdueAX/UTdBjkLqyfaQfhwQyDn1aKDjph+XQsfwHpJCLl/3UYaTgiFns1DfVvFNvx8fWc+UQSk1PtA2ySjyV+pP6zF5zSxP8hfsnU+c4L37x6pJCjxtjbD7/YYQ07dW0ZJ7vBdcCO+2igXBUN3gTXqiuLZlqd+/ox8LZpRJBQdDBX2rXBZagqlaOK2vLUGNEwXFIHcKtLCBHR4fwx1fSB95WZsLJB81C58C8xnXe0BrisVD8kQmHm5WLFIf0mDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCx7aPee8oXOn5CDQ6niF17gBBmr2Z2C8FZCIzgu+Du0C3D]
 
@@ -34,13 +34,13 @@ mysql::server::grants:
     table: '*.*'
     user: 'replication@%'
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   paydirekt:
     user: paydirekt
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr53BVmxG4NzFnWnwjz6vHPlVAwy49fYxyJoXY5JythkzTEBtCp85OzA29TFQ3BZ2htqKhbUstRyHPrP6hTztWBrYJtqj3vXO1KWbRLecQ8upeICeRedUxiPPhaqB/XYjL1xzKpG2W6REsEAl3+2YSPpMjueYLUK4zDMgpiCQ5yq+hDOXXEI7a8b/cZObUwx9NqZdPxXugc71E1FymeYRRwa8snVMZrIyi33Cv9fT6Qc2saeCRZIAXhy8Aqnz8a5D5z3ivzavf8HUCelaXyQbkJpOjGY+f6Ywyq5NxLkUJLdl9RqJ5ABfFLchWBlqbDLUEm0yN6m2BnEJ/4H/6XwnADBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDbtDUxYBwfQ/x384DoXoYngCCvnqXEf0Ob+0iAi6cxgdilhLse9Kuz3ferxExlHTt0KA==]
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   paydirekt:
     servername: paydirekt.sparkasse.de
     serveraliases:
@@ -74,7 +74,7 @@ site::profile::apache::pp_vhosts:
           - '^\/?(.*)$ https://paydirekt.sparkasse.de/$1 [R=301,L]'          
 
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   paydirekt:
     listen_owner: apache
     listen_group: apache
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 88a5e2ae7518728f7cb1c11b70bac316901a07d7..d46bcb8b43bb4c02bea17383c124fb327f31376b 100644 (file)
@@ -1,14 +1,14 @@
 ---
 apache::default_mods: false
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - apache::mod::headers
-  - site::profile::apache
+  - infra::profile::apache
   - postgresql::globals
-  - site::profile::postgresql_server
-  - site::profile::cron
+  - infra::profile::postgresql_server
+  - infra::profile::cron
 
-site::additional_packages:
+infra::additional_packages:
   autoconf: {}
   automake: {}
   binutils: {}
@@ -57,7 +57,7 @@ accounts::users:
     apply: true
     sudo: true
 
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   taiga:
     servername: taiga.sparkasse.de
     serveraliases:
@@ -137,12 +137,12 @@ postgresql::globals::version: '9.5'
 postgresql::globals::postgis_version: '2.1'
 
 postgresql::server::postgres_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAG33lVLR/WrnJVI0vP8+r6e8hWOVG6B5kyR/5PgXN0tHCyFDKdVqxv14gCXYLiXbmi2n5YQyXY8MJhskG0PWQNg9bLU1jUFE5mSmmpMck9oxoxittKH2fiOlkdYZaeEH+JG0XcejpGaLqkOnlPV5GNtihBFv317WXlEfgfs/a1i80wMzumM61xv4cQPxtkJoHPjIZ0Ha+RtKhcmugOHEy5DM5AqdPQYHKzU85FVOuiBwCfkFMYDDFW5IFK+3ZVZ1wxwpDuEu26YgkDuNvdsv3W2aRVT8p0rsM0/P084X4LHIP29r7h1DijGzIyawxPlEKz12v5+htd0Amc5Asmc8hizBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDZjVKpZr3Zq3T9YB2P2pDOgCAAf7joWnEqGQ73vDTGARjFNIxIWvf4wJ2zuHfNciok5w==]
-site::profile::postgresql_server::databases:
+infra::profile::postgresql_server::databases:
   taiga:
     user: taiga
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApUqZw7pGOPLIgAdPwPWpVCL6mCVciZdjrP1AcK7uVIFZ8y43Ce0QmrD9JWYyUnM+IdAHZRS8HR5XUSuSiDnx5+UOPW5VSVuJIWLmp5x+V022RFYqDgS+lz6Qtj0CLEIbuchjpcNA+tsA8eI64UZgCdEjkIvxFd4HumkjOWElYZ0mCDDAJKo+qxfZg5hGCd0N9Z8i2jm/rMoZ5UqL3P1BFPEr07j35GpP5rsLROGYe+hKzpLJYsO6uZowYRSM5KsTbx1MafxAY7lwp5F+BwU4sEU6QBCw4gBzPm5iEXuiU/ItDDG+Jf+0/Y0qEMucwX1iHpUqu2LISX7oMYNslcx4sjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCRXWs77ceTsvr+3MQvqvBugBA0TTwvAPrFUcKf5ZwlVoek]
 
-site::profile::cron::cronjobs:
+infra::profile::cron::cronjobs:
   postgres_backup_create:
     ensure: present
     command: /usr/pgsql-9.5/bin/pg_dump taiga > /var/backup/taiga-$(date +%Y-%m-%d).sql
index d52bdbfdf00cc049353851a5076a148dd484847c..7e32b1e76cf1b1fa272735322ed871aa9e2aca51 100644 (file)
@@ -1,8 +1,8 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::typo3
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
 
 accounts::users:
   service.typo3:
@@ -52,7 +52,7 @@ php::extensions:
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOV/q2m7T/VKKPwSSm7dHSw7GRy01USrjhtVT32jiCTw7vX2xktoLGvdr9aQYR3QSpI/MRc+k0Ygih4FMETDedOS3nqVuStnNX65MNg7PvH6Bs4GT9S7sxrDjCUm8PDpcKGmFoWXJN1rWLpxyqc3ZexZhZXo4Ml4DPVZcggybykzIDOnpElbtoZUtPC6Tz9DRpBH1v3TyNvmxics2MZmBPy9bsxB3FCzdxjV4qTdcs8bshgi8s4w+XqHa/fXsjmpQ6VnXwdwArc34c/XFSFlmBDEDG7PN31iQ8XGH79MtXO+5ZBTdVW5SAsWaTg7ShoUsBMajixeg3pUxEppgTxPc0DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDPKPWDCtaRiQ4UqNilZmHogCBbdXApOiGaXS9BeS8utOSa9H+LPMf+IgK2XfzdDvWYRw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfB7eGzphuQz8cnqk+sRmlpeXybPmQ8kfz0kB9N81CCJP3pXIn9xGIgAZ1EajkwhE8H2Bd3ekxyYQcnw75ulJ8sgLPV/fwAOEmVdPr3ffWgx3jQQxPaQ5YA8S/R7X5ZDwGPC5nRq96qQYDMQNvIIPxaOPPuoasnsuoGsAg2RwsfC9nLl50/vAhzb8Kv4I2f/GWGr46Ivo1VnNJ2O5EBXvzbEXwsEJHutsFURDBr20IrQgACNMeaziD7RA2pBcRfnid6tbriPvP7qi9HzS3BayCeZKalOy4STY6muIspwZIZ0m444YCO8bMGwXRmOXreaJ6hT8UvbT4fMMxVFgWKIUFzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB97Ii9s26/NX4WwkMnc58SgCBzlLJUp9+2KH0MFudlMne+jlcsWNZYcBWW8sqTZQvI1w==]
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   haushaltsplan:
     user: haushaltsplan
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADJkBdSyvOuYdzlhPKaZh9EikYk3AqsNsviBunH2b7AictlKUa3Emf5KYPKBgiBlIlMitmePaNSLm3jZ5vC0o1InQRCY5tooMmmSFl+XbfUmq/yhJA+INmRXSDue/YLl6U3v60WCm2xSBeB0Vsn3f4FGF3EkZUNdmvQyFsgLQg4gYOfRzSWmLfWkeVByL170wciXTZfF4rwxcmxNwV0DHAN3QRmAA8d6P6faElPwFM2DwYojNaadonW/t1XWKC7Jebz/62qxICJGjZO621yzpH/oeFq7S4Pfb7ccox+lprKQNr8lljDObdMolOVu7UAU/dTJ7P0bJhDJfjrYuvQGuTzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA4fl0NBLJGfQug8lHbCP1bgBCPOqrrM3qukXQMLKIxXWr5]
@@ -60,11 +60,11 @@ site::profile::mysql_server::databases:
     user: testhaushalt
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWklRGHViiwUluYdkZ0h70pO2PnVNtw2DXmV6ETWFThFvmD/eptXtMiyayxWM130Ab1lHBXvo2LfBJsUaTp/+RLhkzlyTcD7RDQJTCcaANLACYXhatOsXQbSLZy6LBqGax30uzU9eV9ub0FEULLjIFgNmmvP70Tyr/xptCr6M7+eK6hfvgwhzbAWqn/NbXDDLdMpFNGpmxCCGFowoFkfN6M5FHF7aOC0TDgPoMQBQn2NmXAkRHmGktvQc7ZZ6MUGbRvKItLdWTFPOtAdMqrcJhP47SxiGHmnd+Ad0VqsBjqGBxv9XVUYKx/h+MlKHnq7RZ8OwJUw3H/hpnALG78dZTzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGkhQTSGbcRlFACcYdENnqgBBti6pSW14lTShwyjD0eYw1]
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAtBYmPnL7SEPE9gqlHF2rzJ7yhvCQdOFF84J2E8/71Iz1Ay+oeFqFrmvzoUEVtcwmmQniB2reDQ2f7DhLoP1f8bs8Dzk41x+bJ4+qeSkOblUQBMACLEuaGon3/m1LnXswZoCpzOjY97qDJEKK9PcqiCuNLYHUKZN3/kAr5S+P28eDkZNNrJ+Og377pgtOQ9d0QS54F9upDLYvPCnd4rol29F13JtzT7ZNvr6RpfYjIPn1TJ/t5xOZUJAvFKWA4zOgWVBsjO5HJ6G6wRCKPtDTzWu+X1UOvx7AC/GvPrG+5lxyki7FEDUliQUcYZDQC4PD0Yjaf4owRXoDjtdlBYEBJzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAyLXgmKhzVjYcqwNg5u26KgBA28+N7rkr/qFJYx4/KR9UE]
 
-site::profile::typo3::projects:
+infra::profile::typo3::projects:
   haushaltsplan:
     version: '7.6.15'
     db_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADJkBdSyvOuYdzlhPKaZh9EikYk3AqsNsviBunH2b7AictlKUa3Emf5KYPKBgiBlIlMitmePaNSLm3jZ5vC0o1InQRCY5tooMmmSFl+XbfUmq/yhJA+INmRXSDue/YLl6U3v60WCm2xSBeB0Vsn3f4FGF3EkZUNdmvQyFsgLQg4gYOfRzSWmLfWkeVByL170wciXTZfF4rwxcmxNwV0DHAN3QRmAA8d6P6faElPwFM2DwYojNaadonW/t1XWKC7Jebz/62qxICJGjZO621yzpH/oeFq7S4Pfb7ccox+lprKQNr8lljDObdMolOVu7UAU/dTJ7P0bJhDJfjrYuvQGuTzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA4fl0NBLJGfQug8lHbCP1bgBCPOqrrM3qukXQMLKIxXWr5]
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index 05411c204431d08e99d8eaf7f3028f3826fc2fbb..abd6f2399bab032fc8ee818006fe856bb460bf09 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-#site::additional_classes:
+infra::role: base
+#infra::additional_classes:
 #  - solr
 #solr::version: 6.3.0
 #solr::port: 8984
\ No newline at end of file
index c7bfbb18bd1c8d48f80fa002be7a73bb7b5d599c..03c8a63aa9efcaaaf8dc2eebbf9880b15aedc8b9 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neutron::agents::vpnaas
   - zabbix::agent
   - neutron::agents::lbaas
index 49c0dcdf184f2aa64562e9c8d24ca7bb297f6938..00683d65bca4df36844636b2c8a0089424310884 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - galera
   - nova::conductor
   - nova::config
index b294c96f27226c64d51db057cb65241cec413967..ccfce0c7507061e45b26958bc2bc65ff3fa307ae 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - neutron::agents::vpnaas
   - zabbix::agent
   - neutron::agents::lbaas
index bd8df8469c45e7d285265857ea46aee13e67a76e..a5a6fe7f2f2590d2d1d8c82b4ea5369b4fa28b46 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - zabbix::agent
 
 xymon::modules:
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-site::role: base
+infra::role: base
index dd252681ede55e1e4c3b095ef83d0988af174f45..6d68042d3d70c79a03b7b98d45bb7227b9fcf5c1 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - ceilometer::config
   - zabbix::agent
   - nova::network::neutron
index 6ea78873e49ea81c76a92617c9ecbbd24a9c0b67..058ad88ef024cc451da7ebc672f2bbfa9882783b 100644 (file)
@@ -1,6 +1,6 @@
 ---
-site::role: base
-site::additional_classes:
+infra::role: base
+infra::additional_classes:
   - galera
   - nova::conductor
   - nova::config
index 7514295b4dcf28dc626388c12cae3766f8bfe084..7cc0432a518b27c9fdfbd350d9de5a1a53809328 100644 (file)
@@ -21,11 +21,11 @@ accounts::users:
     sudo: true
     shell: bash
 
-site::role: base
-site::additional_classes:
-#  - site::profile::apache_php
+infra::role: base
+infra::additional_classes:
+#  - infra::profile::apache_php
   - java
-site::additional_packages:
+infra::additional_packages:
   ImageMagick: {}
   tomcat: {}
 repo::remi_php56: true
index 3b8739a3edfe5b52a7a3398a2daf9be8a203624c..1e7c889631c791d14336ac60880621f86ae9ef94 100644 (file)
@@ -1,7 +1,7 @@
 ---
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   - www|server|u6RvgE0OqOfP
-site::profile::apache_php::vhosts:
+infra::profile::apache_php::vhosts:
   dev-www-vrr-de:
     docroot: /srv/www/dev-www-vrr-de
     port: 80
index d1d60b4f648a5f83cfe9d8c9f594a90eef4190d9..bb45d476d927c9dd102156939b7beb1e29441ab6 100644 (file)
@@ -1,18 +1,18 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::apache_php
-  - site::profile::mysql_server
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
   - memcached
 
-site::profile::apache::htdigest:
+infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM7eG4IR8OHr5pMhKdUh437MEyhJyOPuzUeIFtYGrswRgVvTgSOVJ7NDEOHrausvhd8urzyhLbM+gwKWXLBac7hKap01SOVFvus/3rF2xpxbuCG7qKC23mTvRTZ0BNMHC7B11XCeTvdR86QzYbS5HMFd0QU69+jSC6ODug/DW81Gd20CmDn236cnPBFG7vSJKvo4UiEsQyGMQCQyjDNSBN+IRDWmr+P45dO9T82EXjsiTMWK006UkwUxZ5r+RR23PpFM0piUiKOWaEKOxNW94AQjUsA6RpsBmuRyDkChktNJiYr1AXPl3fo2cah6aJkbjkYD5WHsLrqjqeACRmk2C2DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCy50+XXXFsnUuvknUHJ1aQgBBvU2ZwtAu/kd60paItSeeO]
 
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM1NYknTJPsi0yLRaCSD9XV2TVXiU2/kU9ljL8wDUm6jMb+4eK9vhlIbY3aweCfDyjGvi5+s0KI83DIF9KztVS7K8v/eYU1QqoFcSF0HkEymZxb7/RHSzK4Av27rzKRdgc9jQLCC1F3gUhZniaSB4uhmy+//cKnJOgl2oQfgH4JieWlhONISGnIPw01Ogz592vYqxyi3OhuRF1TihjLiZokU5CcUqNNl59ShHPgfKaZ2AsW/+zbIMhRJB3c3sosWeupHF3ifgWtF1YpZIklcWiboiN+1ww8B7vwOtjPqgm/O2sIS9cuFTf4djQu/dXUt6A6Oq5tSGWcGAxOnCMxlDNTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDurk+hzonABfDsSIGgJ2A1gBDIbvCa44LzAUyQDNb2RmO9]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbziCz2VVBeiBDA8ij01kU67xUx7010YlG112uTByackTL7jsnoycy2MOyzprbNURWxbUiQYt3ZAxMRG98Kj4OqBMGs/T6KA60uMqh+HCtq82nbknpLny7U9bEMzkRIrT5Q1xYIcvNM54iJuvcUzbc2xzwkSIRmRp525Z1tynQnjSPzaIyweIlkcC4L52gFpX88bkAmkM36vTKxJPukIRncXXABAdJKO0Q5omnsdTTztZbcas6+IDuDrTNCQWsg6mpz04iKQWLYKFRYxu9xu6EU5HsnuzwjrdlzSWa5wMsAVu+mau2HI1oB25CJOCQcvjMNcaYxtGnjwOwH/H25HAyTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDfWTe9PI7B4lTMSwtFfFv5gBDHqbvobJIKyggiWh48ksAt]
 
-site::profile::mysql_server::databases:
+infra::profile::mysql_server::databases:
   webstats:
     user: webstats
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE0vI25Nd5xH9asWV2KLdCGFdBIIS8OrzNg6mqwnFcGZ4633MfhY1blRcXkG9VqE2KgZIWWUTh18Z+Z1dh0EuCR1kMPO2dqlX0vj3t5JiqTPng4gbSM/gkHYKdpXiI1syVPwt7VNBXm72ViSghwEuvXtcOObn3IdFhwl98k394dBEaGbQtRTRI/5/5j91pv3EjRghHk4gqrIBAW1Jqk9fGUXs83OaHGiXiYRHvDWPwzxO1svWGao6B/u6th99wG+HiC7hmcw7xQnsHzpauYszOSDfz1C803+29HOJcfnI28gh73XJo4JAxd3wruOshyTSD/t6mnwlexdegktsDnhjaDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCV5aXjd7aEYzOcP6zzCBWZgBAlbv5lNbUdZ0eMzCUC232G]
@@ -43,7 +43,7 @@ php::settings:
   PHP/expose_php: 'Off'
 
 apache::mpm_module: event
-site::profile::apache::pp_vhosts:
+infra::profile::apache::pp_vhosts:
   webstats:
     servername: test-webstats.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard-pixelpark-net.pem'
@@ -67,7 +67,7 @@ site::profile::apache::pp_vhosts:
           - All
         directoryindex: 'index.php'
 
-site::profile::apache_php::fpm_pool:
+infra::profile::apache_php::fpm_pool:
   webstats:
     listen_owner: apache
     listen_group: apache
index 29ef3bd395d7b7a9fc4552f8ad7e88eb73ab863a..1ff9c419b7f7bf6d0f6561e507862d3ff7fc44a0 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::role: base
+infra::role: base
 repo::remi_php56: true
index 29ef3bd395d7b7a9fc4552f8ad7e88eb73ab863a..1ff9c419b7f7bf6d0f6561e507862d3ff7fc44a0 100644 (file)
@@ -1,3 +1,3 @@
 ---
-site::role: base
+infra::role: base
 repo::remi_php56: true