From a53317b63f46e39c3bf6404d9e134b7ea79a3fd2 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 14 Sep 2018 17:06:13 +0200 Subject: [PATCH] fix lint for spk-microsites --- customer/spk-microsites/common.yaml | 3 +- ...crosites01-sparkasse-de.pixelpark.net.yaml | 2 +- ...crosites01-sparkasse-de.pixelpark.net.yaml | 90 +++++++++---------- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/customer/spk-microsites/common.yaml b/customer/spk-microsites/common.yaml index e4491770..83d2cdde 100644 --- a/customer/spk-microsites/common.yaml +++ b/customer/spk-microsites/common.yaml @@ -1,3 +1,4 @@ +--- accounts::users: christian.stoehr: apply: true @@ -11,7 +12,7 @@ accounts::users: apply: true sudo: false shell: "bash" - + php::dev: true php::pear: true diff --git a/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml b/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml index 3806924f..2f8a699e 100644 --- a/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml +++ b/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml @@ -3,7 +3,7 @@ infra::role: base infra::additional_classes: - infra::profile::mysql_server - infra::profile::wordpress - + accounts::users: deploy.vogel: apply: true diff --git a/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml b/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml index f4c8709c..093a50de 100644 --- a/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml +++ b/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml @@ -1,7 +1,7 @@ --- infra::role: base -#infra::additional_classes: -# - infra::profile::wordpress +# infra::additional_classes: +# - infra::profile::wordpress # ----------------------------------------------------------------------------------- # ACHTUNG! In der VM läuft noch www.deutscher-buergerpreis.de im alten mk_site2 style @@ -10,48 +10,48 @@ infra::role: base apache::default_vhost: false -#infra::profile::wordpress::projects: -# 'das-geht-einfacher.sparkasse.de': -# servername: das-geht-einfacher.de -# serveraliases: -# - www.das-geht-einfacher.de -# docroot: /var/www/html/das-geht-einfacher.sparkasse.de/ -# ip: 77.74.234.178 -# cert_servername: 'www.das-geht-einfacher.de' -# cert_customer: 'sparkasse' -# ssl_cert: '/etc/pki/tls/certs/www.das-geht-einfacher.de-cert.pem' -# ssl_key: '/etc/pki/tls/private/www.das-geht-einfacher.de-key.pem' -# ssl_chain: '/etc/pki/tls/certs/www.das-geht-einfacher.de-cert.pem' -# group: httpd -# directories: -# - directory1: -# provider: directory -# path: '/var/www/html/das-geht-einfacher.sparkasse.de/' -# options: -# - FollowSymLinks -# allow_override: -# - None -# - location_root: -# provider: location -# path: '/wp-admin' -# auth_type: Digest -# auth_name: www -# auth_digest_provider: file -# auth_digest_algorithm: MD5 -# auth_user_file: '/etc/httpd/htdigest' -# auth_require: 'valid-user' -# - location_ajax: -# provider: location -# path: '/wp-admin/admin-ajax.php' -# php_admin_value: -# memory_limit: 64M -# upload_max_filesize: 40M -# post_max_size: 40M -# max_execution_time: '30' +# infra::profile::wordpress::projects: +# 'das-geht-einfacher.sparkasse.de': +# servername: das-geht-einfacher.de +# serveraliases: +# - www.das-geht-einfacher.de +# docroot: /var/www/html/das-geht-einfacher.sparkasse.de/ +# ip: 77.74.234.178 +# cert_servername: 'www.das-geht-einfacher.de' +# cert_customer: 'sparkasse' +# ssl_cert: '/etc/pki/tls/certs/www.das-geht-einfacher.de-cert.pem' +# ssl_key: '/etc/pki/tls/private/www.das-geht-einfacher.de-key.pem' +# ssl_chain: '/etc/pki/tls/certs/www.das-geht-einfacher.de-cert.pem' +# group: httpd +# directories: +# - directory1: +# provider: directory +# path: '/var/www/html/das-geht-einfacher.sparkasse.de/' +# options: +# - FollowSymLinks +# allow_override: +# - None +# - location_root: +# provider: location +# path: '/wp-admin' +# auth_type: Digest +# auth_name: www +# auth_digest_provider: file +# auth_digest_algorithm: MD5 +# auth_user_file: '/etc/httpd/htdigest' +# auth_require: 'valid-user' +# - location_ajax: +# provider: location +# path: '/wp-admin/admin-ajax.php' +# php_admin_value: +# memory_limit: 64M +# upload_max_filesize: 40M +# post_max_size: 40M +# max_execution_time: '30' -#php::fpm::pools: -# www: -# ensure: absent +# php::fpm::pools: +# www: +# ensure: absent -#php::extensions: -# mysqlnd: {} +# php::extensions: +# mysqlnd: {} -- 2.39.5