summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-01-31 04:32:13 -0800
committerelijah <elijah@riseup.net>2013-01-31 04:32:13 -0800
commitefed0453a754ca1c1725192546c10ccc4fb3ebe1 (patch)
tree6b2b568fd39f72d814ddee1a115e7fdf3d7c143a /puppet/modules/site_config/manifests
parent3c3ed940466eabf9cb56a47614133b5bc90d4ad7 (diff)
parent5d54af627590acd9606e570fbb1ccb87e1237a76 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/default.pp (renamed from puppet/modules/site_config/manifests/init.pp)7
-rw-r--r--puppet/modules/site_config/manifests/hosts.pp2
-rw-r--r--puppet/modules/site_config/manifests/resolvconf.pp2
-rw-r--r--puppet/modules/site_config/manifests/slow.pp6
4 files changed, 11 insertions, 6 deletions
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/default.pp
index f0ce9856..577970ca 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,4 +1,6 @@
-class site_config {
+class site_config::default {
+ tag 'base'
+
$domain_hash = hiera('domain')
# default class, used by all hosts
@@ -23,7 +25,4 @@ class site_config {
stage => initial,
}
- class { 'site_apt::dist_upgrade':
- stage => initial,
- }
}
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index a5f1b105..6c00f3b6 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -3,7 +3,7 @@ class site_config::hosts() {
$hosts = hiera('hosts','')
$hostname = hiera('name')
- $domain_public = $site_config::domain_hash['full_suffix']
+ $domain_public = $site_config::default::domain_hash['full_suffix']
file { "/etc/hostname":
ensure => present,
diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp
index b803f17e..d73f0b78 100644
--- a/puppet/modules/site_config/manifests/resolvconf.pp
+++ b/puppet/modules/site_config/manifests/resolvconf.pp
@@ -11,7 +11,7 @@ class site_config::resolvconf {
ensure => absent;
}
- $domain_public = $site_config::domain_hash['full_suffix']
+ $domain_public = $site_config::default::domain_hash['full_suffix']
# 127.0.0.1: caching-only local bind
# 87.118.100.175: http://server.privacyfoundation.de
diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp
new file mode 100644
index 00000000..a4a9f19f
--- /dev/null
+++ b/puppet/modules/site_config/manifests/slow.pp
@@ -0,0 +1,6 @@
+class site_config::slow {
+
+ class { 'site_apt::dist_upgrade':
+ stage => initial,
+ }
+}