From 5723d22d0364e24d68125c9dba4a57ab70f1c336 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 16 Sep 2019 11:52:46 +0200 Subject: [PATCH] whitespace/quoting: modules/roles/manifests/static_mirror_web (make lint happy) --- modules/roles/manifests/static_mirror_web.pp | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/roles/manifests/static_mirror_web.pp b/modules/roles/manifests/static_mirror_web.pp index 8c04475b8..72f48157b 100644 --- a/modules/roles/manifests/static_mirror_web.pp +++ b/modules/roles/manifests/static_mirror_web.pp @@ -38,39 +38,39 @@ class roles::static_mirror_web( } apache2::site { '010-planet.debian.org': - site => 'planet.debian.org', ensure => has_static_component('planet.debian.org') ? { true => 'present', false => 'absent' }, + site => 'planet.debian.org', content => template('roles/static-mirroring/vhost/planet.debian.org.erb'), } apache2::site { '010-lintian.debian.org': - site => 'lintian.debian.org', - ensure => absent, + ensure => absent, + site => 'lintian.debian.org', } apache2::site { '010-static-vhosts-00-manpages': - site => 'static-manpages.debian.org', ensure => has_static_component('manpages.debian.org') ? { true => 'present', false => 'absent' }, + site => 'static-manpages.debian.org', content => template('roles/static-mirroring/vhost/manpages.debian.org.erb'), } apache2::site { '010-static-vhosts-simple': - site => 'static-vhosts-simple', + site => 'static-vhosts-simple', content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'), } $wwwdo_server_name = 'www.debian.org' $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur' apache2::site { '005-www.debian.org': - site => 'www.debian.org', ensure => has_static_component('www.debian.org') ? { true => 'present', false => 'absent' }, + site => 'www.debian.org', content => template('roles/apache-www.debian.org.erb'), } ssl::service { 'www.debian.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debian.org' : - ensure => has_static_component('www.debian.org') ? { true => 'present', false => 'absent' }, - notify => Exec['service apache2 reload'], - key => true, + ensure => has_static_component('www.debian.org') ? { true => 'present', false => 'absent' }, + notify => Exec['service apache2 reload'], + key => true, } # do @@ -90,8 +90,8 @@ class roles::static_mirror_web( ssl::service { 'manpages.debian.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'metadata-backend.ftp-master.debian.org': ensure => has_static_component('metadata.ftp-master.debian.org') ? { true => 'present', false => 'absent' }, - notify => Exec['service apache2 reload'], - key => true, + notify => Exec['service apache2 reload'], + key => true, } ssl::service { 'mirror-master.debian.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'onion.debian.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } @@ -170,7 +170,7 @@ class roles::static_mirror_web( onion::service { 'security-team.debian.org' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } onion::service { 'www.ports.debian.org' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } # dn - onion::service { 'bootstrap.debian.net' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } + onion::service { 'bootstrap.debian.net' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } onion::service { 'debaday.debian.net' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } onion::service { 'debdeltas.debian.net' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } onion::service { 'micronews.debian.org' : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr } @@ -202,11 +202,11 @@ class roles::static_mirror_web( file { '/srv/static.debian.org/puppet': ensure => directory, - mode => '02755' + mode => '2755' } file { '/srv/static.debian.org/puppet/disabled-service': ensure => directory, - mode => '02755' + mode => '2755' } file { '/srv/static.debian.org/puppet/disabled-service/503.html': source => 'puppet:///modules/roles/static-htdocs/disabled-service/503.html', -- 2.20.1