summaryrefslogtreecommitdiff
path: root/puppet/manifests/setup.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-07-09 16:43:39 +0100
committerMicah Anderson <micah@riseup.net>2013-07-09 16:43:39 +0100
commitb4077083b971377636754b2988668a6ddd384da5 (patch)
treeb8e358b5f0f6dfa882d31d7446266111bc0d201b /puppet/manifests/setup.pp
parent625aaa11138bba365958391664299692402f8da4 (diff)
parent672154a8322901b86c9882854234eae53221a38e (diff)
Merge remote-tracking branch 'origin/develop'0.2.2
Conflicts: provider_base/services/webapp.json
Diffstat (limited to 'puppet/manifests/setup.pp')
-rw-r--r--puppet/manifests/setup.pp16
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
new file mode 100644
index 00000000..80e7ffc2
--- /dev/null
+++ b/puppet/manifests/setup.pp
@@ -0,0 +1,16 @@
+#
+# this is applied before each run of site.pp
+#
+$services = ''
+
+Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
+
+include site_config::hosts
+
+include site_apt
+
+package { 'facter':
+ ensure => latest,
+ require => Exec['refresh_apt']
+}
+