diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-11-01 07:50:17 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-11-01 07:50:17 +0100 |
| commit | 34800c7da65e428dc3a398222c3ceb0a3a4cfc22 (patch) | |
| tree | 191cbaa145298bba4d14c0c432da7b8f124ffee9 | |
| parent | b30d661dd76988ad4213a8c4a822f51125d6dc48 (diff) | |
| download | playbooks-ansible-34800c7da65e428dc3a398222c3ceb0a3a4cfc22.tar.gz playbooks-ansible-34800c7da65e428dc3a398222c3ceb0a3a4cfc22.tar.xz playbooks-ansible-34800c7da65e428dc3a398222c3ceb0a3a4cfc22.zip | |
Update diskcheck template script and caddy-reverse-proxy unit file
| -rw-r--r-- | roles/diagnostics/templates/diskcheck.sh.j2 | 8 | ||||
| -rw-r--r-- | roles/reverseproxy/files/caddy-reverse-proxy.service | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/diagnostics/templates/diskcheck.sh.j2 b/roles/diagnostics/templates/diskcheck.sh.j2 index 137dfdc..50021a6 100644 --- a/roles/diagnostics/templates/diskcheck.sh.j2 +++ b/roles/diagnostics/templates/diskcheck.sh.j2 @@ -1,15 +1,15 @@ #!/usr/bin/bash -{% if ansible_devices.sda is defined and ansible_devices.sda.removable == "0" %} +{% if ansible_devices.sda is defined and ansible_devices.sda.removable == "0" and ansible_devices.sda.rotational == "1" %} smartctl -t long /dev/sda {% endif %} -{% if ansible_devices.sdb is defined and ansible_devices.sdb.removable == "0" %} +{% if ansible_devices.sdb is defined and ansible_devices.sdb.removable == "0" and ansible_devices.sdb.rotational == "1" %} smartctl -t long /dev/sdb {% endif %} -{% if ansible_devices.sdc is defined and ansible_devices.sdc.removable == "0" %} +{% if ansible_devices.sdc is defined and ansible_devices.sdc.removable == "0" and ansible_devices.sdc.rotational == "1" %} smartctl -t long /dev/sdc {% endif %} -{% if ansible_devices.sdd is defined and ansible_devices.sdd.removable == "0" %} +{% if ansible_devices.sdd is defined and ansible_devices.sdd.removable == "0" and ansible_devices.sdd.rotational == "1" %} smartctl -t long /dev/sdd {% endif %} diff --git a/roles/reverseproxy/files/caddy-reverse-proxy.service b/roles/reverseproxy/files/caddy-reverse-proxy.service index 244aad2..c8d3085 100644 --- a/roles/reverseproxy/files/caddy-reverse-proxy.service +++ b/roles/reverseproxy/files/caddy-reverse-proxy.service @@ -4,7 +4,7 @@ After=docker.service [Service] Restart=always -ExecStart=/usr/bin/docker run -i --dns 208.67.222.222 -p 80:80 -p 443:443 \ +ExecStart=/usr/bin/docker run -i --dns 82.247.103.117 -p 80:80 -p 443:443 \ -v /contener/%p/root/.caddy:/root/.caddy:Z \ -v /contener/%p/etc/Caddyfile:/etc/Caddyfile:Z \ -v /contener/%p/srv:/srv:Z \ |