From 941c065d4d0f8b4c00400e5b4103588758ac4982 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 17 Sep 2019 20:00:20 +0200 Subject: [PATCH] debconf19 is not static just yet --- modules/roles/manifests/static_mirror_web.pp | 1 - modules/roles/misc/static-components.yaml | 1 - .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 1 - modules/sudo/files/sudoers | 1 - 4 files changed, 4 deletions(-) diff --git a/modules/roles/manifests/static_mirror_web.pp b/modules/roles/manifests/static_mirror_web.pp index 58472520d..53ca839f8 100644 --- a/modules/roles/manifests/static_mirror_web.pp +++ b/modules/roles/manifests/static_mirror_web.pp @@ -125,7 +125,6 @@ class roles::static_mirror_web( ssl::service { 'debconf16.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf17.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf18.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } - ssl::service { 'debconf19.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf2.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf3.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debconf4.debconf.org' : ensure => 'ifstatic', notify => Exec['service apache2 reload'], key => true, } diff --git a/modules/roles/misc/static-components.yaml b/modules/roles/misc/static-components.yaml index 4a4d7edda..e89a2c0e7 100644 --- a/modules/roles/misc/static-components.yaml +++ b/modules/roles/misc/static-components.yaml @@ -130,7 +130,6 @@ components: debconf16.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf16.debconf.org' } debconf17.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf17.debconf.org' } debconf18.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf18.debconf.org' } - debconf19.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/debconf19.debconf.org' } es.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/es.debconf.org' } fr.debconf.org : { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/fr.debconf.org' } miniconf10.debconf.org: { master: 'dillon.debian.org', source: 'dillon.debian.org:/srv/debconf-webpages/web/miniconf10.debconf.org' } diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb index f1e95f688..adddd55b9 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -315,7 +315,6 @@ vhost(lines, "debconf7.debconf.org" , :ssl => true) vhost(lines, "debconf16.debconf.org" , :ssl => true) vhost(lines, "debconf17.debconf.org" , :ssl => true) vhost(lines, "debconf18.debconf.org" , :ssl => true) -vhost(lines, "debconf19.debconf.org" , :ssl => true) vhost(lines, "es.debconf.org" , :ssl => true) vhost(lines, "fr.debconf.org" , :ssl => true) vhost(lines, "miniconf10.debconf.org" , :ssl => true) diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 258f64be8..6be418976 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -241,7 +241,6 @@ pabs dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component time %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf16.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf17.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf18.debconf.org -%debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component debconf19.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component es.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component fr.debconf.org %debconfstatic dillon=(staticsync) NOPASSWD: /usr/local/bin/static-update-component miniconf10.debconf.org -- 2.20.1