Dzahn has submitted this change and it was merged.

Change subject: Revert "archiva: migration class to rsync data to new host"
......................................................................


Revert "archiva: migration class to rsync data to new host"

This reverts commit 582caa3e4aa7eded13df604eea58c93f2d029c42.

This is a reminder to me that i should revert this and also manually cleanup 
the rsyncd and config on the new host,
after we have shutdown the old host.

Bug: T123725
Change-Id: I90e3b04c4f1baaa6c6d3d980f00f8cd401c701df
---
M manifests/site.pp
D modules/role/manifests/archiva/migration.pp
2 files changed, 1 insertion(+), 20 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 66c7d2c..d2c81ce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1931,7 +1931,7 @@
 
 node 'meitnerium.wikimedia.org' {
     $cluster = 'misc'
-    role(archiva, archiva::migration)
+    role archiva
     include standard
 }
 
diff --git a/modules/role/manifests/archiva/migration.pp 
b/modules/role/manifests/archiva/migration.pp
deleted file mode 100644
index 855677d..0000000
--- a/modules/role/manifests/archiva/migration.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class role::archiva::migration {
-
-    $sourceip='208.80.154.154'
-
-    ferm::service { 'archiva-migration-rsync':
-        proto  => 'tcp',
-        port   => '873',
-        srange => "${sourceip}/32",
-    }
-
-    include rsync::server
-
-    rsync::server::module { 'var-lib-archiva':
-        path        => '/var/lib/archiva',
-        read_only   => 'no',
-        hosts_allow => $sourceip,
-    }
-
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/307900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I90e3b04c4f1baaa6c6d3d980f00f8cd401c701df
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to