Merge tag '0.8.0'

Release 0.8.0

1 files changed, 14 insertions, 9 deletions

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 912234ac..ecda4012 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -2,30 +2,37 @@
 # the logoutput exec parameter defaults to "on_error" in puppet 3,
 # but to "false" in puppet 2.7, so we need to set this globally here
 Exec {
-    logoutput => on_failure,
-      path    => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin'
+  logoutput => on_failure,
+  path      => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin'
 }
 
-include site_config::setup
-include site_config::default
+Package <| provider == 'apt' |>  {
+  install_options => ['--no-install-recommends'],
+}
 
 $services = hiera('services', [])
 $services_str = join($services, ', ')
 notice("Services for ${fqdn}: ${services_str}")
 
+# In the default deployment case, we want to run an 'apt-get dist-upgrade'
+# to ensure the latest packages are installed. This is done by including the
+# class 'site_config::slow' here. However, you only changed a small bit of
+# the platform and want to skip this slow part of deployment, you can do that
+# by using 'leap deploy --fast' which will only apply those resources that are
+# tagged with 'leap_base' or 'leap_service'.
+# See https://leap.se/en/docs/platform/details/under-the-hood#tags
+include site_config::slow
+
 if member($services, 'openvpn') {
   include site_openvpn
-  include site_obfsproxy
 }
 
 if member($services, 'couchdb') {
   include site_couchdb
-  include tapicero
 }
 
 if member($services, 'webapp') {
   include site_webapp
-  include site_nickserver
 }
 
 if member($services, 'soledad') {
@@ -51,5 +58,3 @@ if member($services, 'static') {
 if member($services, 'obfsproxy') {
   include site_obfsproxy
 }
-
-include site_config::packages::uninstall