From c7cf438e8c170c0d34937b059802a33436dca2a9 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 31 Aug 2020 14:07:58 -0700
Subject: [PATCH] fedora-web: adjust to staging not having sysadmin-releng
 group.

Since we are not using fas in staging, but are switching to noggin, we
currently don't have the sysadmin-releng group. For now, just switch to
apache.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/fedora-web/build/tasks/main.yml    |  7 ++++++
 roles/fedora-web/ostree/tasks/main.yml   | 28 ++++++++++++++++++++++++
 roles/fedora-web/registry/tasks/main.yml | 14 ++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml
index d6d6da3cec..75f01a0fe6 100644
--- a/roles/fedora-web/build/tasks/main.yml
+++ b/roles/fedora-web/build/tasks/main.yml
@@ -52,6 +52,13 @@
   file: state=directory path=/srv/web/fmw owner=apache group=sysadmin-releng mode=2775 setype=httpd_sys_content_t seuser=system_u
   tags:
   - fedora-web
+  when: env != 'staging'
+
+- name: make fmw dir
+  file: state=directory path=/srv/web/fmw owner=apache group=apache mode=2775 setype=httpd_sys_content_t seuser=system_u
+  tags:
+  - fedora-web
+  when: env == 'staging'
 
 - name: Copy syncStatic script (stg)
   when: env == "staging"
diff --git a/roles/fedora-web/ostree/tasks/main.yml b/roles/fedora-web/ostree/tasks/main.yml
index 30831fa292..860844d64a 100644
--- a/roles/fedora-web/ostree/tasks/main.yml
+++ b/roles/fedora-web/ostree/tasks/main.yml
@@ -17,6 +17,20 @@
   tags:
   - fedora-web
   - ostree
+  when: env != 'staging'
+
+- name: make ostree dir
+  file: state=directory
+        path=/srv/web/ostree
+        owner=apache
+        group=apache
+        mode=2775
+        setype=httpd_sys_content_t
+        seuser=system_u
+  tags:
+  - fedora-web
+  - ostree
+  when: env == 'staging'
 
 - name: Copy over the static files
   copy: src={{item}} dest=/srv/web/ostree/{{item}} mode=0644
@@ -38,6 +52,20 @@
   tags:
   - fedora-web
   - ostree
+  when: env != 'staging'
+
+- name: make IoT ostree dir
+  file: state=directory
+        path=/srv/web/ostree/iot
+        owner=apache
+        group=apache
+        mode=2775
+        setype=httpd_sys_content_t
+        seuser=system_u
+  tags:
+  - fedora-web
+  - ostree
+  when: env == 'staging'
 
 - name: Copy over the static IoT files
   copy: src=iot_{{item}} dest=/srv/web/ostree/iot/{{item}} mode=0644
diff --git a/roles/fedora-web/registry/tasks/main.yml b/roles/fedora-web/registry/tasks/main.yml
index cab50ae756..d8756bdc23 100644
--- a/roles/fedora-web/registry/tasks/main.yml
+++ b/roles/fedora-web/registry/tasks/main.yml
@@ -2,11 +2,25 @@
   file: state=directory path=/srv/web/registry-signatures owner=apache group=sysadmin-releng mode=2775 setype=httpd_sys_content_t seuser=system_u
   tags:
   - fedora-web
+  when: env != 'staging'
+
+- name: make registry-signatures dir
+  file: state=directory path=/srv/web/registry-signatures owner=apache group=apache mode=2775 setype=httpd_sys_content_t seuser=system_u
+  tags:
+  - fedora-web
+  when: env == 'staging'
 
 - name: make registry-index dir
   file: state=directory path=/srv/web/registry-index owner=apache group=sysadmin-releng mode=755 setype=httpd_sys_content_t seuser=system_u
   tags:
   - fedora-web
+  when: env != 'staging'
+
+- name: make registry-index dir
+  file: state=directory path=/srv/web/registry-index owner=apache group=apache mode=755 setype=httpd_sys_content_t seuser=system_u
+  tags:
+  - fedora-web
+  when: env == 'staging'
 
 - name: Copy over the Fedora Server CA cert
   copy: src="{{ private }}/files/fedora-ca.cert" dest=/etc/pki/httpd/fedora-server-ca.cert