From 3f03400dac34d06da3ba7d0b19fa82f2bf3f9a74 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Thu, 5 Nov 2020 17:27:27 +0100
Subject: [PATCH] distgit: drop pagure related selinux config since it's now
 handled in the pagure role

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 roles/distgit/files/pagure.pp | Bin 9020 -> 0 bytes
 roles/distgit/tasks/main.yml  |  18 ------------------
 2 files changed, 18 deletions(-)
 delete mode 100644 roles/distgit/files/pagure.pp

diff --git a/roles/distgit/files/pagure.pp b/roles/distgit/files/pagure.pp
deleted file mode 100644
index 200eb4cede8354955aa188be7f10c4a270ee7a7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9020
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

diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index 34a4fcb7fa..c3ff4548e4 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -232,13 +232,6 @@
   tags:
   - distgit
 
-- name: set the selinux boolean nis_enabled
-  seboolean: name=nis_enabled persistent=yes state=yes
-  tags:
-  - distgit
-  - config
-  - selinux
-
 - name: set the selinux boolean git_cgi_use_nfs
   seboolean: name=git_cgi_use_nfs persistent=yes state=yes
   tags:
@@ -300,17 +293,6 @@
   file: dest=/usr/local/share/selinux/ state=directory
   tags: selinux
 
-- name: copy over our custom selinux policy for pagure
-  copy: src=pagure.pp dest=/usr/local/share/selinux/pagure.pp
-  register: selinux_module
-  tags: selinux
-  when: env == "staging"
-
-- name: install our custom selinux policy for pagure
-  command: semodule -i /usr/local/share/selinux/pagure.pp
-  when: selinux_module is changed and env == "staging"
-  tags: selinux
-
 - name: copy over our custom selinux policy
   copy: src=upload_cgi.pp dest=/usr/local/share/selinux/upload_cgi.pp
   register: selinux_module