X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fcdbuilder_local_mirror.pp;h=4b056a72b38994fb9c5484454b95228cd86f5481;hb=f29271d22a9f346a558cd70d2e6deb97c7900016;hp=9e9cc57fbc822df4d807da5d7bc8b9e0d342e8b8;hpb=208cac1321b9a101641ba7c9f1c2c5e550060a86;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/cdbuilder_local_mirror.pp b/modules/roles/manifests/cdbuilder_local_mirror.pp index 9e9cc57fb..4b056a72b 100644 --- a/modules/roles/manifests/cdbuilder_local_mirror.pp +++ b/modules/roles/manifests/cdbuilder_local_mirror.pp @@ -1,21 +1,22 @@ -class roles::cdbuilder_local_mirror { - include apache2 +class roles::cdbuilder_local_mirror ( + Stdlib::IP::Address $listen_address +) { + include apache2 - $apache_addr = "172.29.103.1" - $vhost_listen = "${apache_addr}:80" + $vhost_listen = "${listen_address}:80" - apache2::site { '010-local-mirror.cdbuilder.debian.org': - site => 'local-mirror.cdbuilder.debian.org', - content => template('roles/apache-local-mirror.cdbuilder.debian.org.erb'), - } + apache2::site { '010-local-mirror.cdbuilder.debian.org': + site => 'local-mirror.cdbuilder.debian.org', + content => template('roles/apache-local-mirror.cdbuilder.debian.org.erb'), + } - file { "/etc/apache2/ports.conf": - require => Package['apache2'], - content => @("EOF"), - # This file is maintained by puppet - Listen 127.0.0.1:80 - Listen $vhost_listen - | EOF - notify => Service['apache2'] - } + file { '/etc/apache2/ports.conf': + require => Package['apache2'], + content => @("EOF"), + # This file is maintained by puppet + Listen 127.0.0.1:80 + Listen ${vhost_listen} + | EOF + notify => Service['apache2'], + } }