projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace change
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
dgit_browse.pp
diff --git
a/modules/roles/manifests/dgit_browse.pp
b/modules/roles/manifests/dgit_browse.pp
index
8a9a8ff
..
ab29f04
100644
(file)
--- a/
modules/roles/manifests/dgit_browse.pp
+++ b/
modules/roles/manifests/dgit_browse.pp
@@
-1,20
+1,26
@@
class roles::dgit_browse {
class roles::dgit_browse {
- #ssl::service { 'wiki.debian.org':
- # notify => Service['apache2'],
- #}
- #rsync::site { 'wiki':
- # source => 'puppet:///modules/roles/wiki/rsyncd.conf',
- #}
+ include apache2
+ include roles::dgit_sync_target
- package { 'cgit': ensure => installed, }
+ ssl::service { 'browse.dgit.debian.org':
+ notify => Exec['service apache2 reload'],
+ key => true,
+ }
- file { '/etc/cgitrc':
- source => 'puppet:///modules/roles/dgit/cgitrc',
-
}
+ 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',
+ }
}
}