summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 18:31:51 +0200
committervarac <varacanero@zeromail.org>2013-09-20 19:02:02 +0200
commit98d8a337930d5afaf78d88c23adb985a7060f66b (patch)
treeaf9a6a62a06b4ba9f4c8d8bcbe2fe69d2c9b6d2c /puppet/manifests/site.pp
parente182d12c72743491805a3873e8b6cd804fe5394c (diff)
move all resources that are applied on every node into site_config::default (#3782)
in commit 338833, we established a relationship between all resources that have a leap_service tag, that are called in site.pp. But we had some resources as default on every node in site.pp (apt::update, Package { require => Exec['apt_updated'] }, site_config::slow and stdlib), that were still lacking any relationship to the leap_service tag. By moving them into default.pp they automatically are executed before resources with a leap_service tag.
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index bce3a08b..9f5d82d8 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -5,15 +5,7 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
$services=join(hiera_array('services', ['']), ' ')
notice("Services for ${fqdn}: ${services}")
-# make sure apt is updated before any packages are installed
-include apt::update
-Package { require => Exec['apt_updated'] }
-
-include stdlib
-
include site_config::default
-include site_config::slow
-
# configure eip
if $services =~ /\bopenvpn\b/ {