tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Johannes Meyer 2015-03-06 09:50:48 +01:00
parent 886cc863f0 2df7c60a19
commit 9ca0d6a32e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.puppet/profiles/icingaweb2_dev/manifests/init.pp
View File

@ -90,7 +90,7 @@ class icingaweb2_dev (
source => $name, source => $name,
} }
icingaweb2::config::general { [ 'config', 'resources' ]: icingaweb2::config::general { [ 'config', 'resources', 'roles' ]:
source => $name, source => $name,
replace => false, replace => false,
} }

3
.puppet/profiles/icingaweb2_dev/templates/roles.ini.erb Normal file
View File

@ -0,0 +1,3 @@
[admins]
users = icingaadmin
permissions = *