Filippo Giunchedi has submitted this change and it was merged.
Change subject: Remove role::beta::bastion
......................................................................
Remove role::beta::bastion
deployment-bastion was replaced ages ago, this role has been unused since
AFAICT, ditch the syncsiteresources stuff that only ever ran on one wiki
anyway.
Bug: T86644
Change-Id: I1e9d4087c10f1cd3b51493edb7f5088e05ac5557
---
D modules/beta/files/sync-site-resources
D modules/beta/manifests/syncsiteresources.pp
D modules/role/manifests/beta/bastion.pp
3 files changed, 0 insertions(+), 58 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/beta/files/sync-site-resources
b/modules/beta/files/sync-site-resources
deleted file mode 100755
index 9fa6009..0000000
--- a/modules/beta/files/sync-site-resources
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -e
-
-RESOURCES=( 'Common.js Common.css Cologneblue.js Cologneblue.css Modern.js
Modern.css Monobook.js Monobook.css Vector.js Vector.css Mobile.js Mobile.css' )
-
-function sync_resource() {
- local resource=$1
- local dbname=$2
- local source=$3
-
- echo "Synchronizing $resource with $source"
- curl "https://$source/w/index.php?title=MediaWiki:$resource&action=raw";
| \
- mwscript edit.php --wiki=$dbname -b -s "Automatic
synchronization with $source" "MediaWiki:$resource"
-}
-
-function sync_wiki() {
- local dbname=$1
- local source=$2
-
- echo "== $dbname =="
- for resource in $RESOURCES
- do
- sync_resource $resource $dbname $source
- done
-}
-
-# TODO: other wikis?
-sync_wiki 'enwiki' 'en.wikipedia.org'
-
diff --git a/modules/beta/manifests/syncsiteresources.pp
b/modules/beta/manifests/syncsiteresources.pp
deleted file mode 100644
index 6ecd42f..0000000
--- a/modules/beta/manifests/syncsiteresources.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class beta::syncsiteresources ($user = 'apache'){
- file { '/usr/local/bin/sync-site-resources':
- ensure => 'present',
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/beta/sync-site-resources',
- }
-
- cron { 'sync-site-resources':
- ensure => 'present',
- command => '/usr/local/bin/sync-site-resources >/dev/null 2>&1',
- require => File['/usr/local/bin/sync-site-resources'],
- hour => '12',
- user => $user,
- }
-}
diff --git a/modules/role/manifests/beta/bastion.pp
b/modules/role/manifests/beta/bastion.pp
deleted file mode 100644
index 9a097ff..0000000
--- a/modules/role/manifests/beta/bastion.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# vim: set sw=4 ts=4 expandtab:
-
-class role::beta::bastion {
- system::role { 'role::beta::bastion':
- description => 'Bastion and work machine for beta cluster'
- }
-
- include beta::autoupdater
- include beta::syncsiteresources
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/322404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9d4087c10f1cd3b51493edb7f5088e05ac5557
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
