Pyoungmeister has submitted this change and it was merged.
Change subject: migration to mediawiki module done!
......................................................................
migration to mediawiki module done!
next to rename mediawiki_new to mediawiki
Change-Id: I29bb82073041c6b087a159ca39db93cacd3816ec
---
D manifests/mediawiki.pp
M manifests/site.pp
2 files changed, 0 insertions(+), 91 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mediawiki.pp b/manifests/mediawiki.pp
deleted file mode 100644
index e357ca1..0000000
--- a/manifests/mediawiki.pp
+++ /dev/null
@@ -1,89 +0,0 @@
-# mediawiki.pp
-
-class mediawiki::packages {
- package { [ 'wikimedia-task-appserver', 'php5-redis', 'php5-memcached',
'libmemcached10', 'php5-igbinary' ]:
- ensure => latest;
- }
-
- # Disable timidity-daemon
- # It's recommended by timidity and there's no simple way to avoid
installing it
- service { 'timidity':
- enable => false,
- ensure => stopped;
- }
-}
-
-class mediawiki::sync {
- # Include this for syncing mw installation
- # Include apache::apache-trigger-mw-sync to ensure that
- # the sync happens each time just before apache is started
- require mediawiki::packages
-
- exec { 'mw-sync':
- command => '/usr/bin/sync-common',
- cwd => '/tmp',
- user => root,
- group => root,
- path => '/usr/bin:/usr/sbin',
- refreshonly => true,
- timeout => 600,
- logoutput => on_failure;
- }
-
- # l10nupdate account required for syncing
- include accounts::l10nupdate
-
-}
-
-class mediawiki::refreshlinks {
- # Include this to add cron jobs calling refreshLinks.php on all
clusters. (RT-2355)
-
- file { '/home/mwdeploy/refreshLinks':
- ensure => directory,
- owner => mwdeploy,
- group => mwdeploy,
- mode => 0664,
- }
-
- define refreshlinks::cronjob() {
-
- $cluster = regsubst($name, '@.*', '\1')
- $monthday = regsubst($name, '.*@', '\1')
-
- cron { "cron-refreshlinks-${name}":
- command => "/usr/local/bin/mwscriptwikiset
refreshLinks.php ${cluster}.dblist --dfn-only >
/home/mwdeploy/refreshLinks/${name}.log 2>&1",
- user => mwdeploy,
- hour => 0,
- minute => 0,
- monthday => $monthday,
- ensure => present,
- }
- }
-
- # add cron jobs - usage: <cluster>@<day of month> (these are just
needed monthly) (note: s1 is temp. deactivated)
- refreshlinks::cronjob { ['s2@2', 's3@3', 's4@4', 's5@5', 's6@6',
's7@7']: }
-}
-
-class mediawiki::user {
- systemuser { 'mwdeploy': name => 'mwdeploy' }
-}
-
-class mediawiki::former-extdist-removesoon {
- package { xinetd:
- ensure => absent;
- }
-
- systemuser { extdist: name => "extdist", home => "/var/lib/extdist",
ensure => absent }
-
- file {
- "/etc/xinetd.d/svn_invoker":
- ensure => absent;
- "/etc/logrotate.d/svn-invoker":
- ensure => absent;
- }
-
- cron { extdist_updateall:
- ensure => absent;
- }
-}
-
diff --git a/manifests/site.pp b/manifests/site.pp
index 77688d8..74fb51f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,6 @@
import "lvs.pp"
import "mail.pp"
import "media-storage.pp"
-import "mediawiki.pp"
import "memcached.pp"
import "misc/*.pp"
import "mobile.pp"
@@ -676,7 +675,6 @@
misc::bastionhost,
misc::deployment,
misc::noc-wikimedia,
- mediawiki::former-extdist-removesoon,
misc::deployment::scap_scripts,
misc::ircecho,
misc::deployment::l10nupdate,
--
To view, visit https://gerrit.wikimedia.org/r/51691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29bb82073041c6b087a159ca39db93cacd3816ec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
