Paladox has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374048 )
Change subject: Fix apt package
......................................................................
Fix apt package
Change-Id: I14810a769e160672ea770e23d8baf3babbca42d5
---
M manifests/web.pp
1 file changed, 18 insertions(+), 2 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/manifests/web.pp b/manifests/web.pp
index 0e78b19..55a9a2c 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -20,8 +20,7 @@
include ::icinga2
package { [ 'icingaweb2', 'icingaweb2-module-monitoring',
- 'icingaweb2-module-doc', 'icingaweb2-module-director',
- 'icingacli' ] :
+ 'icingaweb2-module-doc', 'icingacli' ] :
ensure => present,
require => Apt::Repository['icinga2'],
}
@@ -103,10 +102,17 @@
}
file { '/etc/icingaweb2/modules/director/config.ini':
+ ensure => 'directory',
+ owner => 'www-data',
+ group => 'icingaweb2',
+ }
+
+ file { '/etc/icingaweb2/modules/director/config.ini':
ensure => present,
content => template('icinga2/config.ini.erb'),
owner => 'www-data',
group => 'icingaweb2',
+ require => File['/etc/icingaweb2/modules/director/config.ini'],
}
file { '/etc/icingaweb2/modules/director/kickstart.ini':
@@ -114,6 +120,7 @@
content => template('icinga2/kickstart.ini.erb'),
owner => 'www-data',
group => 'icingaweb2',
+ require => File['/etc/icingaweb2/modules/director/config.ini'],
}
file { '/etc/icingaweb2/modules/monitoring/backends.ini':
@@ -137,6 +144,15 @@
group => 'icingaweb2',
}
+ #git::clone { 'beta-mediawiki-core':
+ # directory => "${stage_dir}/php-master",
+ # origin => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
+ # branch => 'master',
+ # owner => 'root',
+ # group => 'root',
+ # require => Package['icingaweb2'],
+ #}
+
# install the Icinga Apache site
include ::apache::mod::rewrite
include ::apache::mod::authnz_ldap
--
To view, visit https://gerrit.wikimedia.org/r/374048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14810a769e160672ea770e23d8baf3babbca42d5
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
