From f4110913b77c4a7f055389d36a54485730f91c61 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <codeblock@fedoraproject.org>
Date: Thu, 2 Oct 2014 18:59:08 +0000
Subject: [PATCH] rename some things

Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
---
 roles/nagios_server/files/selinux/Makefile       |   4 ++++
 roles/nagios_server/files/selinux/hostname.pp    | Bin 1010 -> 0 bytes
 .../files/selinux/nagios_hostname.pp             | Bin 0 -> 997 bytes
 .../selinux/{hostname.te => nagios_hostname.te}  |   2 +-
 roles/nagios_server/tasks/main.yml               |   4 ++--
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 roles/nagios_server/files/selinux/Makefile
 delete mode 100644 roles/nagios_server/files/selinux/hostname.pp
 create mode 100644 roles/nagios_server/files/selinux/nagios_hostname.pp
 rename roles/nagios_server/files/selinux/{hostname.te => nagios_hostname.te} (89%)

diff --git a/roles/nagios_server/files/selinux/Makefile b/roles/nagios_server/files/selinux/Makefile
new file mode 100644
index 0000000000..9f2c724098
--- /dev/null
+++ b/roles/nagios_server/files/selinux/Makefile
@@ -0,0 +1,4 @@
+module:
+	checkmodule -Mmo nagios_hostname.mod nagios_hostname.te
+	semodule_package -o nagios_hostname.pp -m nagios_hostname.mod
+	rm nagios_hostname.mod
diff --git a/roles/nagios_server/files/selinux/hostname.pp b/roles/nagios_server/files/selinux/hostname.pp
deleted file mode 100644
index 0db5752ea007f255235e8e3c9522e7360340de6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1010
zcmb_aK~4iP3^Wu(Z-p1o7a;fn7jE>_2SlMYWl>40U9Z$bzkqmePeoHQlC^3i4jm~<
z)*joF?ED;d`wJ1lx)qV{!)`wjk@?H?wMqSUI?Ky`t(PKlS7>AT1NM*HS&Cme5|O8e
z$LEsrVE3yM#P@Ysz<aaS8<AsPx4P)<_=$-twP@C&5>>6nB{ZVCFhk10+L$_UAR=!x
zaUulb4CJ>@U07(n!rGbedC0+HPtE{5FU3`pyI^=j@M}CiT);(wabyi_!|MQy0g!;j
zJa;ec6b}*^_h9dPA1v@a|1)>U!EXYFeTZ5dnufiouU2!e__=^Pz^X7k-<UhBMVor-
S&~~&I`PgBzft7sv6n+6UqeYki

diff --git a/roles/nagios_server/files/selinux/nagios_hostname.pp b/roles/nagios_server/files/selinux/nagios_hostname.pp
new file mode 100644
index 0000000000000000000000000000000000000000..4064cf79d81510f105f75b20ae99002abcefd9c6
GIT binary patch
literal 997
zcmcIi%TB{E5Zv+*hztAy{Q?Akz@;}h@d1`;my)X3RkD$K=r2_L-kw@b@JOpDMI2xx
z%l3M9ce0t?VY45J2-cm5Y!93Lt%$r$#xGTB*W=ebYnOT^A~%J0E#Ckw#d(#R@R=J+
z@k`G|<mut@xiCD~<e~&|zbp&*sFr#q(!J|ir>%8YG@h$Pvl^Mmsx{6a71@OuQVv$f
z)PMsKd8LURp%-T$zb|xZq4o+-odLARVhz>=d|sJ@VJ6_8;&D&`!h>~negMl*KEN0N
z30QpR?xhX!Adzto*1q?_-lzViXP<*#GE|4~di@!C`n9Od^Zw)fSHL&GmM}Qy%N@3&
UCB1EEIogVR?66qRM*evSM<jVjH~;_u

literal 0
HcmV?d00001

diff --git a/roles/nagios_server/files/selinux/hostname.te b/roles/nagios_server/files/selinux/nagios_hostname.te
similarity index 89%
rename from roles/nagios_server/files/selinux/hostname.te
rename to roles/nagios_server/files/selinux/nagios_hostname.te
index db281e0abe..a8029f453a 100644
--- a/roles/nagios_server/files/selinux/hostname.te
+++ b/roles/nagios_server/files/selinux/nagios_hostname.te
@@ -1,5 +1,5 @@
 
-module hostname 1.0;
+module nagios_hostname 1.0;
 
 require {
 	type nagios_t;
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 5a078ba67a..07407ebe62 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -125,13 +125,13 @@
   - nagios_server
 
 - name: Copy over our custom selinux module
-  copy: src=selinux/hostname.pp dest=/usr/local/share/nagios-policy/hostname.pp
+  copy: src=selinux/nagios_hostname.pp dest=/usr/local/share/nagios-policy/nagios_hostname.pp
   register: selinux_module
   tags:
   - nagios_server
 
 - name: Install our custom selinux module
-  command: semodule -i /usr/local/share/nagios-policy/hostname.pp
+  command: semodule -i /usr/local/share/nagios-policy/nagios_hostname.pp
   when: selinux_module|changed
   tags:
   - nagios_server