Greetings. I would like to do the following: * Apply the attached ansible diff. This changes things to run the new 'reg' (which just has a 'server' subcommand, not a reg-server binary), and also fixes varnish to not eat the requests to show more than 100 items from our registry. It also fixes some sync jobs where the flatpak info would 'disappear' for 10min at a time due to a --delete that shouldn't have been there. * Upgrade 'reg' on sundries01.phx2 (prod). I've already tested this version in staging and it works. * Run playbooks: sundries, and proxies The only thing that could affect things much here is the varnish change, but it's one line and contained to the registry block. This would make our registry nice and pretty before release. +1s? kevin
From 89d55ff50825c83f658257cb12a25c89a9ce1f09 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@xxxxxxxxx>
Date: Tue, 16 Oct 2018 18:53:51 +0000
Subject: [PATCH] Fix up registry
* Move to new reg binary.
* Fix --delete on rsync that was blowing away flatpak indexes.
* Fix varnish to not drop requests for pagination on the registry
* Make cron jobs not email maxamillion directly.
* Make cron job ignore INFO output.
Signed-off-by: Kevin Fenzi <kevin@xxxxxxxxx>
---
files/reg-server/cron-prod | 5 +----
files/reg-server/cron-stg | 5 +----
roles/fedora-web/registry/files/cron-sync-registry-index | 6 +++---
roles/varnish/templates/proxies.vcl.j2 | 1 -
tasks/reg-server.yml | 8 --------
5 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/files/reg-server/cron-prod b/files/reg-server/cron-prod
index aa92020..154ea1c 100644
--- a/files/reg-server/cron-prod
+++ b/files/reg-server/cron-prod
@@ -1,5 +1,2 @@
SHELL=/bin/bash
-MAILTO=maxamillion@xxxxxxxxxxxxxxxxx
-
-#*/5 * * * * root cd /var/lib/reg-server/ && reg-server -r registry.fedoraproject.org --once
-
+*/5 * * * * root cd /var/lib/reg-server/ && reg server -r registry.fedoraproject.org --once | grep -v INFO
diff --git a/files/reg-server/cron-stg b/files/reg-server/cron-stg
index bb73dbb..3173d16 100644
--- a/files/reg-server/cron-stg
+++ b/files/reg-server/cron-stg
@@ -1,5 +1,2 @@
SHELL=/bin/bash
-MAILTO=maxamillion@xxxxxxxxxxxxxxxxx
-
-#*/5 * * * * root cd /var/lib/reg-server/ && reg-server -r registry.stg.fedoraproject.org --once
-
+*/5 * * * * root cd /var/lib/reg-server/ && reg server -r registry.stg.fedoraproject.org --once | grep -v INFO
diff --git a/roles/fedora-web/registry/files/cron-sync-registry-index b/roles/fedora-web/registry/files/cron-sync-registry-index
index a647963..2c73156 100644
--- a/roles/fedora-web/registry/files/cron-sync-registry-index
+++ b/roles/fedora-web/registry/files/cron-sync-registry-index
@@ -1,3 +1,3 @@
-30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
-40 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/index/ /srv/web/registry-index/index/
-45 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/icons/ /srv/web/registry-index/icons/
+30 * * * * root /usr/bin/rsync -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
+31 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/index/ /srv/web/registry-index/index/
+32 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/icons/ /srv/web/registry-index/icons/
diff --git a/roles/varnish/templates/proxies.vcl.j2 b/roles/varnish/templates/proxies.vcl.j2
index 9515988..48c73d6 100644
--- a/roles/varnish/templates/proxies.vcl.j2
+++ b/roles/varnish/templates/proxies.vcl.j2
@@ -184,7 +184,6 @@ sub vcl_recv {
set req.backend_hint = registry;
unset req.http.cookie;
set req.http.clear-cookies = "yes";
- set req.url = regsub(req.url, "\?.*", "");
if (req.url ~ "/blobs/") {
return(pass);
}
diff --git a/tasks/reg-server.yml b/tasks/reg-server.yml
index 7f9187b..6fb6b04 100644
--- a/tasks/reg-server.yml
+++ b/tasks/reg-server.yml
@@ -1,16 +1,8 @@
- name: install reg-server
package:
- name: reg-server
- tags:
- - regserver
- when: env != 'staging'
-
-- name: install reg-server
- package:
name: reg
tags:
- regserver
- when: env == 'staging'
- name: Copy reg-server repositories html template
copy:
--
1.8.3.1
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
