X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdgit_browse.pp;h=ab29f0401d42dc13b27f94c936cce8a4bc58765f;hb=add63b4edd7236df5114ae7fc84c3ff984cc0de0;hp=0d2ea14ea6ed544c61619067d745f74059e30643;hpb=f0592778e175dd64df69a349a716fe8ca89ad66f;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp index 0d2ea14ea..ab29f0401 100644 --- a/modules/roles/manifests/dgit_browse.pp +++ b/modules/roles/manifests/dgit_browse.pp @@ -1,24 +1,26 @@ class roles::dgit_browse { - ssl::service { 'browse.dgit.debian.org': - notify => Service['apache2'], - key => true, - } + include apache2 + include roles::dgit_sync_target - package { 'cgit': ensure => installed, } - package { 'python-pygments': ensure => installed, } - package { 'python-chardet': ensure => installed, } + ssl::service { 'browse.dgit.debian.org': + notify => Exec['service apache2 reload'], + key => true, + } - file { '/etc/cgitrc': - source => 'puppet:///modules/roles/dgit/cgitrc', - } - file { '/etc/apache2/conf-enabled/cgit.conf': - ensure => absent, - notify => Service['apache2'], - } + package { 'cgit': ensure => installed, } + package { 'python-pygments': ensure => installed, } + package { 'python-chardet': ensure => installed, } - apache2::site { '010-browse.dgit.debian.org': - site => 'browse.dgit.debian.org', - source => 'puppet:///modules/roles/dgit/browse.dgit.debian.org', - } + file { '/etc/cgitrc': + source => 'puppet:///modules/roles/dgit/cgitrc', + } + file { '/etc/apache2/conf-enabled/cgit.conf': + ensure => absent, + notify => Exec['service apache2 reload'], + } + apache2::site { '010-browse.dgit.debian.org': + site => 'browse.dgit.debian.org', + source => 'puppet:///modules/roles/dgit/browse.dgit.debian.org', + } }