Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53954
Change subject: svn: Disable mwdocs and redirect to doc.wikimedia.org ...................................................................... svn: Disable mwdocs and redirect to doc.wikimedia.org Moved all related resources together and disabled them by ensuring absence. The only one not ensured absent is the "exec", as it (to my knowledge) doesn't support ensure absence, I instead commented out the resource and the require property of cron. Change-Id: I0f9a586202e8f3e7204bc303c3faaf698752916c --- M files/apache/sites/svn.wikimedia.org M manifests/svn.pp 2 files changed, 47 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/53954/1 diff --git a/files/apache/sites/svn.wikimedia.org b/files/apache/sites/svn.wikimedia.org index d4d6c04..09b9848 100644 --- a/files/apache/sites/svn.wikimedia.org +++ b/files/apache/sites/svn.wikimedia.org @@ -21,7 +21,7 @@ Allow from all Deny from 220.181.19.85 Deny from 221.115.95.197 - Deny from 81.208.25.37 + Deny from 81.208.25.37 Options Indexes FollowSymLinks </Directory> @@ -41,10 +41,7 @@ ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi - Alias /doc /var/mwdocs/phase3/docs/html - <Directory /var/mwdocs/phase3/docs/html> - Allow from all - </Directory> + Redirect permanent /doc http://doc.wikimedia.org/mediawiki-core/master/php/html # FIXME: What is this for?? Alias /stats /var/statsvn/html @@ -97,8 +94,5 @@ ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi - Alias /doc /var/mwdocs/phase3/docs/html - <Directory /var/mwdocs/phase3/docs/html> - Allow from all - </Directory> + Redirect permanent /doc https://doc.wikimedia.org/mediawiki-core/master/php/html </VirtualHost> diff --git a/manifests/svn.pp b/manifests/svn.pp index f160967..04d24c0 100644 --- a/manifests/svn.pp +++ b/manifests/svn.pp @@ -17,11 +17,6 @@ group => root, mode => 0555, source => "puppet:///files/svn/sillyshell"; - "/var/log/mwdocs.log": - owner => mwdocs, - group => svn, - mode => 0644, - ensure => present; "/etc/apache2/sites-available/svn": owner => root, group => root, @@ -35,14 +30,6 @@ group => svnadm, mode => 0664, recurse => true; - "/var/mwdocs": - owner => mwdocs, - group => svn, - mode => 0755, - ensure => directory; - "/home/mwdocs/phase3": - ensure => link, - target => "/var/mwdocs/phase3"; "/var/cache/svnusers": ensure => directory, owner => www-data, @@ -72,28 +59,12 @@ monitor_service { "https": description => "HTTPS", check_command => "check_ssl_cert!svn.wikimedia.org" } - cron { - doc_generation: - command => "(cd /var/mwdocs/phase3 && git pull && php maintenance/mwdocgen.php --all) >> /var/log/mwdocs.log 2>&1", - require => Exec["clone mediawiki for doc"], - user => "mwdocs", - hour => 0, - minute => 0; - svnuser_generation: + cron { "svnuser_generation": command => "(cd /var/cache/svnusers && svn up) > /dev/null 2>&1", require => Package[apache2], user => "www-data", hour => 0, minute => 0; - } - - exec { - "clone mediawiki for doc": - command => "/usr/bin/git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /var/mwdocs/phase3", - creates => "/var/mwdocs/phase3", - cwd => "/var/mwdocs", - user => "mwdocs", - require => File["/var/mwdocs"]; } exec { "/usr/bin/svn co file:///svnroot/mediawiki/USERINFO svnusers": @@ -177,6 +148,46 @@ } 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"; + } + + # exec { + # "clone mediawiki for doc": + # command => "/usr/bin/git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /var/mwdocs/phase3", + # creates => "/var/mwdocs/phase3", + # cwd => "/var/mwdocs", + # user => "mwdocs", + # require => File["/var/mwdocs"]; + # } + + cron { "doc_generation": + command => "(cd /var/mwdocs/phase3 && git pull && php maintenance/mwdocgen.php --all) >> /var/log/mwdocs.log 2>&1", + ensure => absent, + #require => Exec["clone mediawiki for doc"], + user => "mwdocs", + hour => 0, + minute => 0; + } } class svn::users { @@ -187,12 +198,14 @@ gid => 550, comment => "mwdocs", shell => "/bin/bash", - ensure => "present", + ensure => "absent", managehome => true, allowdupe => false, require => Group[550], } } + + # @} } class svn::groups { -- To view, visit https://gerrit.wikimedia.org/r/53954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f9a586202e8f3e7204bc303c3faaf698752916c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <ttij...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits