Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

sundries / staging: adjust flatpak-indexer some more in staging

Browse source 
Turns out we want to keep reg and it's output.
So, we just copy flatpak-indexers fedora/deltas/icons dirs under the reg
renerated top level on the proxies.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2021-03-09 13:42:51 -08:00
parent 32a3c0c43f
commit 317f724a08
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/sundries.yml
View file

@ -29,7 +29,7 @@
- role: easyfix/gather - role: easyfix/gather
when: master_sundries_node|bool when: master_sundries_node|bool
- role: regindexer/build - role: regindexer/build
when: master_sundries_node|bool and env != "staging" when: master_sundries_node|bool
- role: bz_review_report - role: bz_review_report
when: master_sundries_node|bool and env != "staging" when: master_sundries_node|bool and env != "staging"
- rsyncd - rsyncd

4
roles/fedora-web/registry/templates/cron-sync-registry-index
View file

@ -1,5 +1,7 @@
30 * * * * root /usr/bin/rsync -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
{% if env != 'staging' %} {% if env != 'staging' %}
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/ 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/ 32 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/icons/ /srv/web/registry-index/icons/
{% else %}
30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/fedora/ /srv/web/registry-index/index/ && /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/icons/ /srv/web/registry-index/icons/ && /usr/bin/rsync --delete -a --no-owner --no-group sundries01::regindexer/deltas/ /srv/web/registry-index/deltas/ && /usr/bin/rsync -a --no-owner --no-group sundries01::registry-index/ /srv/web/registry-index/
{% endif %} {% endif %}

4
roles/rsyncd/files/rsyncd.conf.sundries-stg
View file

@ -192,7 +192,7 @@ hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.25
[registry-index] [registry-index]
comment = registry-index comment = registry-index
path = /srv/web/registry-index path = /var/lib/reg-server/static/
uid = root uid = root
gid = root gid = root
read only = yes read only = yes
@ -200,7 +200,7 @@ hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0 10.5.128.0/255.25
[regindexer] [regindexer]
comment = regindexer comment = regindexer
path = /var/lib/regindexer/ path = /srv/web/registry-index
uid = root uid = root
gid = root gid = root
read only = yes read only = yes