Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352112 )
Change subject: Remove create of librenms directory
......................................................................
Remove create of librenms directory
We expect scap to create the directory, creating it via puppet is wrong,
remove it. Also set a dependency for scap to run before the librenms
class so that we are sure that the creation is going to happen before
configuration happens
Change-Id: Ice41e29530e60527a08c1bd6b19149050b115910
---
M modules/librenms/manifests/init.pp
M modules/role/manifests/librenms.pp
2 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 30ede45..8c7bf9c 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -32,14 +32,6 @@
managehome => false,
}
- file { $install_dir:
- ensure => directory,
- owner => 'www-data',
- group => 'librenms',
- mode => '0555',
- require => Group['librenms'],
- }
-
file { "${install_dir}/config.php":
ensure => present,
owner => 'www-data',
diff --git a/modules/role/manifests/librenms.pp
b/modules/role/manifests/librenms.pp
index d3ec469..44f087a 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -12,6 +12,7 @@
# NOTE: scap will manage the deploy user
scap::target { 'librenms/librenms':
deploy_user => 'deploy-librenms',
+ before => Class['::librenms'],
}
package { 'php5-ldap':
--
To view, visit https://gerrit.wikimedia.org/r/352112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice41e29530e60527a08c1bd6b19149050b115910
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
