Switch staging to new rust based mirrorlist server

Signed-off-by: Adrian Reber <adrian@lisas.de>
This commit is contained in:
Adrian Reber 2019-10-10 14:38:09 +02:00 committed by Pierre-Yves Chibon
parent 49305e19f0
commit 2cb4f66f27
4 changed files with 34 additions and 0 deletions

View file

@ -1 +1,2 @@
mirrorlist_container_image: "candidate-registry.fedoraproject.org/f29/mirrormanager2-mirrorlist:f29-container-candidate-80018-20190214185556"
mirrorlist_container_image_stg: "quay.io/adrianreber/mirrorlist-server:1.0.0"

View file

@ -7,6 +7,22 @@
tags:
- mirrorlist_proxy
- name: mirrormanager subgid
lineinfile:
dest: /etc/subgid
regexp: "^mirrormanager:"
line: "mirrormanager:{{ mirrormanager_subgid }}"
tags:
- mirrorlist_proxy
- name: mirrormanager subuid
lineinfile:
dest: /etc/subuid
regexp: "^mirrormanager:"
line: "mirrormanager:{{ mirrormanager_subuid }}"
tags:
- mirrorlist_proxy
# mirrormanager user ssh key(s)
- name: add authorized_keys for mirrormanager
authorized_key: key="{{ item }}" user=mirrormanager state=present

View file

@ -2,9 +2,24 @@
Description=Mirrorlist Container {{ item }}
[Service]
{% if env == "staging" %}
User=mirrormanager
{% endif %}
ExecStartPre=-/usr/bin/podman stop %n
ExecStartPre=-/usr/bin/podman rm %n --force
{% if env == "staging" %}
ExecStart=/usr/bin/podman run \
--net=host --userns=keep-id \
-e RUST_LOG=info --rm=true --name %n \
-v /usr/share/GeoIP:/usr/share/GeoIP \
-v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager:z \
-v /var/log/mirrormanager:/var/log/mirrormanager:z \
{{ mirrorlist_container_image_stg }} \
--port 1808{{ item }} \
-l /var/log/mirrormanager/%n.log
{% else %}
ExecStart=/usr/bin/podman run --rm=true --name %n -v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 1808{{ item }}:80 {{ mirrorlist_container_image }} -l /var/log/mirrormanager/%n.log
{% endif %}
ExecStop=/usr/bin/podman stop %n
[Install]

View file

@ -1,4 +1,6 @@
mirrormanager_uid: 441
mirrormanager_gid: 441
mirrormanager_subuid: "100000:65536"
mirrormanager_subgid: "100000:65536"
mirrors_gid: 263
mirrors2_gid: 529