Dzahn has submitted this change and it was merged.
Change subject: aptrepo: set separate incoming conf for releases
......................................................................
aptrepo: set separate incoming conf for releases
After we made this configurable, make the actual "default"
config used on releases the default and set a separate one
for the config of apt.wm.org on carbon to make uploads from tin
work again as before.
Bug:T132757
Change-Id: I83b49fbb5a83208483532f9018dc1319c3dbd0c2
---
A modules/aptrepo/templates/incoming-wikimedia.erb
M modules/aptrepo/templates/incoming.erb
M modules/role/manifests/aptrepo/wikimedia.pp
3 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptrepo/templates/incoming-wikimedia.erb
b/modules/aptrepo/templates/incoming-wikimedia.erb
new file mode 100644
index 0000000..fc864ca
--- /dev/null
+++ b/modules/aptrepo/templates/incoming-wikimedia.erb
@@ -0,0 +1,4 @@
+Name: default
+IncomingDir: <%= @incomingdir %>
+TempDir: /tmp
+Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
diff --git a/modules/aptrepo/templates/incoming.erb
b/modules/aptrepo/templates/incoming.erb
index fc864ca..19315cb 100644
--- a/modules/aptrepo/templates/incoming.erb
+++ b/modules/aptrepo/templates/incoming.erb
@@ -1,4 +1,4 @@
Name: default
IncomingDir: <%= @incomingdir %>
-TempDir: /tmp
-Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia
precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia
+TempDir: tmp
+Default: <% @default_distro %>
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp
b/modules/role/manifests/aptrepo/wikimedia.pp
index 8c39cd1..6aa5c81 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -4,7 +4,8 @@
$basedir = '/srv/wikimedia'
class { '::aptrepo':
- basedir => $basedir,
+ basedir => $basedir,
+ incomingconf => 'incoming-wikimedia',
}
file { "${basedir}/conf/distributions":
--
To view, visit https://gerrit.wikimedia.org/r/292767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83b49fbb5a83208483532f9018dc1319c3dbd0c2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
