Dzahn has submitted this change and it was merged.
Change subject: Remove some long-since-gone SVN stuff
......................................................................
Remove some long-since-gone SVN stuff
Change-Id: I7ea79b2f4904db899c9c730720662371623b153f
---
M files/apache/sites/svn.wikimedia.org
M manifests/site.pp
M manifests/svn.pp
3 files changed, 1 insertion(+), 74 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/apache/sites/svn.wikimedia.org
b/files/apache/sites/svn.wikimedia.org
index 09b9848..4c19a81 100644
--- a/files/apache/sites/svn.wikimedia.org
+++ b/files/apache/sites/svn.wikimedia.org
@@ -42,12 +42,6 @@
ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
Redirect permanent /doc
http://doc.wikimedia.org/mediawiki-core/master/php/html
-
- # FIXME: What is this for??
- Alias /stats /var/statsvn/html
- <Directory /var/statsvn/html>
- Allow from all
- </Directory>
</VirtualHost>
NameVirtualHost *:443
diff --git a/manifests/site.pp b/manifests/site.pp
index 8f20626..f80f298 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -870,7 +870,6 @@
$ssh_tcp_forwarding = "no"
$ssh_x11_forwarding = "no"
include standard,
- role::gerrit::production::replicationdest,
svn::server,
backup::client
diff --git a/manifests/svn.pp b/manifests/svn.pp
index 6541232..433fead 100644
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -1,7 +1,6 @@
class svn::server {
system_role { "svn::server": description => "public SVN server" }
- require "svn::users::mwdocs"
require "svn::groups::svn"
include webserver::php5
@@ -40,18 +39,6 @@
owner => 'root',
group => 'svn',
mode => '0775';
- }
-
- # hooks
- file {
- "/svnroot/mediawiki/hooks/pre-commit":
- ensure => absent;
- "/svnroot/mediawiki/hooks/post-commit":
- ensure => absent;
- "/svnroot/mediawiki/hooks/HooksCommon.inc":
- ensure => absent;
- "/svnroot/mediawiki/hooks/deferred-updates.sh":
- ensure => absent;
}
apache_site { "svn": name => "svn", prefix => "000-" }
@@ -133,63 +120,13 @@
}
}
- class cia {
- file { "/usr/local/bin/ciabot_svn.py":
- ensure => absent;
- }
- }
-
class conversion {
package { ['libqt4-dev', 'libsvn-dev', 'g++']:
ensure => latest;
}
}
- include viewvc, hooks, dumps, cia, conversion
-
-
- # Ensure doxygen is disabled on svn.wikimedia.org (bug 35663)
- # @{
-
- file {
- "/var/log/mwdocs.log":
- owner => mwdocs,
- ensure => absent,
- group => 'svn',
- mode => '0644';
- "/var/mwdocs":
- owner => mwdocs,
- #ensure => directory,
- ensure => absent,
- group => 'svn',
- mode => '0755';
- "/home/mwdocs/phase3":
- #ensure => link,
- ensure => absent,
- target => "/var/mwdocs/phase3";
- }
-
- cron { "doc_generation":
- ensure => absent,
- }
-}
-
-class svn::users {
- class mwdocs {
- user { "mwdocs":
- name => "mwdocs",
- uid => 108,
- gid => 550,
- comment => "mwdocs",
- shell => "/bin/bash",
- ensure => "absent",
- managehome => true,
- allowdupe => false,
- require => Group[550],
- }
- }
-
- # @}
+ include viewvc, hooks, dumps, conversion
}
class svn::groups {
@@ -202,13 +139,10 @@
allowdupe => false;
}
}
-
}
class svn::client {
-
package { 'subversion':
ensure => latest;
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/63864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ea79b2f4904db899c9c730720662371623b153f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
