projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror-anu must not be in apache2_www_mirror if it is in static
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
manifests
/
init.pp
diff --git
a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index
8533a68
..
b60e0b7
100644
(file)
--- a/
modules/puppetmaster/manifests/init.pp
+++ b/
modules/puppetmaster/manifests/init.pp
@@
-1,15
+1,8
@@
class puppetmaster {
class puppetmaster {
- include site::params
-
package { 'puppetmaster':
package { 'puppetmaster':
- ensure => $site::params::puppetversion,
- notify => Service['puppetmaster']
- }
- service { 'puppetmaster':
- ensure => running,
+ ensure => installed,
}
}
-
file { '/etc/puppet/hiera.yaml':
source => 'puppet:///modules/puppetmaster/hiera.yaml'
}
file { '/etc/puppet/hiera.yaml':
source => 'puppet:///modules/puppetmaster/hiera.yaml'
}
@@
-23,4
+16,8
@@
class puppetmaster {
description => 'Allow puppet access',
rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
}
description => 'Allow puppet access',
rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
}
+
+ ssl::service { 'puppet-dashboard.debian.org':
+ notify => Service['apache2'],
+ }
}
}