Merge branch 'master' into feature/exhaustive-form-descriptions-7947

2015-03-06 09:50:48 +01:00 · 2015-03-06 09:50:48 +01:00 · 9ca0d6a32e
parent 886cc863f0 2df7c60a19
commit 9ca0d6a32e
2 changed files with 4 additions and 1 deletions
--- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
@ -90,7 +90,7 @@ class icingaweb2_dev (
    source => $name,
  }

-  icingaweb2::config::general { [ 'config', 'resources' ]:
+  icingaweb2::config::general { [ 'config', 'resources', 'roles' ]:
    source  => $name,
    replace => false,
  }
--- a/.puppet/profiles/icingaweb2_dev/templates/roles.ini.erb
+++ b/.puppet/profiles/icingaweb2_dev/templates/roles.ini.erb
@ -0,0 +1,3 @@
+[admins]
+users = icingaadmin
+permissions = *