From 0202ca3944a94eb3e65bcac5ea83d14693d68e3f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 9 Dec 2012 12:55:11 +0100 Subject: [PATCH] Try this instead --- .../files/static-mirroring/vhost/planet.debian.org | 2 +- modules/roles/manifests/static_mirror.pp | 10 ++++++---- ...r-macros.erb => apache-inc-static-mirror-vhost.erb} | 0 3 files changed, 7 insertions(+), 5 deletions(-) rename modules/roles/templates/static-mirroring/{apache-conf-static-mirror-macros.erb => apache-inc-static-mirror-vhost.erb} (100%) diff --git a/modules/roles/files/static-mirroring/vhost/planet.debian.org b/modules/roles/files/static-mirroring/vhost/planet.debian.org index 22bf348b5..8bda41fb1 100644 --- a/modules/roles/files/static-mirroring/vhost/planet.debian.org +++ b/modules/roles/files/static-mirroring/vhost/planet.debian.org @@ -1,4 +1,4 @@ -Use DebianStaticMirrorVhostLine +Include /etc/apache2/inc/static-mirror-vhost ServerName planet.debian.org ServerAlias planet.debian.net planeta.debian.net ServerAdmin planet@debian.org diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 390e56338..8ba0fe91c 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -25,10 +25,12 @@ class roles::static_mirror inherits roles::static_source { content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; static-mirror-run --one-stage /srv/static.debian.org bizet.debian.org:-live- > /dev/null\n", ; - } - - apache2::config { 'static-mirror-macros': - content => template('roles/static-mirroring/apache-conf-static-mirror-macros.erb'), + '/etc/apache2/inc': + ensure => directory, + ; + '/etc/apache2/inc/static-mirror-vhost': + content => template('roles/static-mirroring/apache-inc-static-mirror-vhost.erb'), + ; } apache2::site { '010-planet.debian.org': diff --git a/modules/roles/templates/static-mirroring/apache-conf-static-mirror-macros.erb b/modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb similarity index 100% rename from modules/roles/templates/static-mirroring/apache-conf-static-mirror-macros.erb rename to modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb -- 2.20.1