diff --git a/files/reg-server/cron-prod b/files/reg-server/cron-prod index aa920207d4..154ea1c0af 100644 --- a/files/reg-server/cron-prod +++ b/files/reg-server/cron-prod @@ -1,5 +1,2 @@ SHELL=/bin/bash -MAILTO=maxamillion@fedoraproject.org - -#*/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 bb73dbbf59..3173d16cc5 100644 --- a/files/reg-server/cron-stg +++ b/files/reg-server/cron-stg @@ -1,5 +1,2 @@ SHELL=/bin/bash -MAILTO=maxamillion@fedoraproject.org - -#*/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 a64796346f..2c73156c7b 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 9515988c43..48c73d643b 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 7f9187b031..6fb6b04e90 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: