From ac65c80b074e34c280fbec7db843d2c2cf2d808d Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Mon, 21 Jan 2019 17:49:56 +0100
Subject: [PATCH] Drop the variant-specific config again, hoping for ref=

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 .../ostree/files/cron-sync-ostree-summary     |  2 +-
 roles/fedora-web/ostree/tasks/main.yml        | 32 +------------------
 .../templates/check_proxies.cfg.j2            |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/roles/fedora-web/ostree/files/cron-sync-ostree-summary b/roles/fedora-web/ostree/files/cron-sync-ostree-summary
index 0e168a126d..d513afa4e4 100644
--- a/roles/fedora-web/ostree/files/cron-sync-ostree-summary
+++ b/roles/fedora-web/ostree/files/cron-sync-ostree-summary
@@ -1,2 +1,2 @@
 MAILTO=""
-*/15 * * * *  root /usr/bin/curl -f https://kojipkgs.fedoraproject.org/atomic/repo/summary -o /srv/web/ostree_allofthem/summary
+*/15 * * * *  root /usr/bin/curl -f https://kojipkgs.fedoraproject.org/atomic/repo/summary -o /srv/web/ostree/summary
diff --git a/roles/fedora-web/ostree/tasks/main.yml b/roles/fedora-web/ostree/tasks/main.yml
index e20c64f905..4066d2bc37 100644
--- a/roles/fedora-web/ostree/tasks/main.yml
+++ b/roles/fedora-web/ostree/tasks/main.yml
@@ -18,38 +18,8 @@
   - fedora-web
   - ostree
 
-- name: make ostree "allofthem" dir
-  file: state=directory
-        path=/srv/web/ostree_allofthem
-        owner=apache
-        group=sysadmin-releng
-        mode=2775
-        setype=httpd_sys_content_t
-        seuser=system_u
-  tags:
-  - fedora-web
-  - ostree
-
-- name: make ostree variant dir symlinks
-  file: state=link
-        dest=/srv/web/ostree/{{ item }}
-        src=/srv/web/ostree_allofthem
-        owner=apache
-        group=sysadmin-releng
-        mode=2775
-        setype=httpd_sys_content_t
-        seuser=system_u
-  with_items:
-  - atomichost
-  - coreos
-  - silverblue
-  - iot
-  tags:
-  - fedora-web
-  - ostree
-
 - name: Copy over the static files
-  copy: src={{item}} dest=/srv/web/ostree_allofthem/{{item}} mode=0644
+  copy: src={{item}} dest=/srv/web/ostree/{{item}} mode=0644
   with_items:
   - config
   - mirrorlist
diff --git a/roles/nagios_client/templates/check_proxies.cfg.j2 b/roles/nagios_client/templates/check_proxies.cfg.j2
index 631715efb6..216b6474d5 100644
--- a/roles/nagios_client/templates/check_proxies.cfg.j2
+++ b/roles/nagios_client/templates/check_proxies.cfg.j2
@@ -1,2 +1,2 @@
 command[check_ticketkey_age]={{ libdir }}/nagios/plugins/check_file_age -w 3600 -c 7200 -f /etc/httpd/ticketkey_{{env}}.tkey
-command[check_ostree_summary_file_age]=/usr/lib64/nagios/plugins/check_file_age -w 1800 -c 3600 /srv/web/ostree_allofthem/summary
+command[check_ostree_summary_file_age]=/usr/lib64/nagios/plugins/check_file_age -w 1800 -c 3600 /srv/web/ostree/summary