Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296619
Change subject: Gerrit: minor (no-op) manifest cleanup
......................................................................
Gerrit: minor (no-op) manifest cleanup
- Remove unused robots.txt stuff
- Rename main class to gerrit instead of gerrit::instance
Change-Id: I760dbf277e05482ab23e30a9ca85a0b9274f4d04
---
D modules/gerrit/files/robots-txt-disallow
R modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/proxy.pp
M modules/role/manifests/gerrit/production.pp
4 files changed, 2 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/296619/1
diff --git a/modules/gerrit/files/robots-txt-disallow
b/modules/gerrit/files/robots-txt-disallow
deleted file mode 100644
index 94cb4c9..0000000
--- a/modules/gerrit/files/robots-txt-disallow
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS MANAGED BY PUPPET
-#
-# puppet:///modules/gerrit/robots-txt-disallow
-#
-User-agent: *
-Disallow: /
diff --git a/modules/gerrit/manifests/instance.pp
b/modules/gerrit/manifests/init.pp
similarity index 96%
rename from modules/gerrit/manifests/instance.pp
rename to modules/gerrit/manifests/init.pp
index 44e4381..926f18c 100644
--- a/modules/gerrit/manifests/instance.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,6 +1,6 @@
# Manifest to setup a Gerrit instance
-class gerrit::instance(
+class gerrit(
$db_host = '',
$host = '',
$ssh_key = '',
diff --git a/modules/gerrit/manifests/proxy.pp
b/modules/gerrit/manifests/proxy.pp
index 7c2ede7..8f3c347 100644
--- a/modules/gerrit/manifests/proxy.pp
+++ b/modules/gerrit/manifests/proxy.pp
@@ -8,16 +8,6 @@
content => template('gerrit/gerrit.wikimedia.org.erb'),
}
- # We don't use gitweb anymore, so we're going to allow spiders again
- # If it becomes a problem, just set ensure => present again
- file { '/var/www/robots.txt':
- ensure => absent,
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/gerrit/robots-txt-disallow',
- }
-
include ::apache::mod::rewrite
include ::apache::mod::proxy
diff --git a/modules/role/manifests/gerrit/production.pp
b/modules/role/manifests/gerrit/production.pp
index 711d7a1..c2d3155 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -44,7 +44,7 @@
'+refs/tags/*:refs/tags/*',
]
- class { 'gerrit::instance':
+ class { '::gerrit':
db_host => 'm2-master.eqiad.wmnet',
host => 'gerrit.wikimedia.org',
ssh_key => 'ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
gerrit@production',
--
To view, visit https://gerrit.wikimedia.org/r/296619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I760dbf277e05482ab23e30a9ca85a0b9274f4d04
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
