packaging: move SuSEfirewall2 templates out of src

Better to have static config like this that needs to be installed in
/etc in a separate subdirectory of the project.

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 70292658d5febb6c5f94af4df9c3e93551772d12)

diff --git a/ceph.spec.in b/ceph.spec.in
index c3f5c20a0b55595798eaeb2ae86b9898afb2a9af..d7c8a607f7a791b45c3f46805788a5985c6cb380 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -482,8 +482,8 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config
 
 # firewall templates
 %if 0%{?suse_version}
-install -m 0644 -D src/susefirewall-ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
-install -m 0644 -D src/susefirewall-ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
+install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
+install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 %endif
 
 # udev rules

diff --git a/etc/sysconfig/SuSEfirewall2.d/services/ceph-mon b/etc/sysconfig/SuSEfirewall2.d/services/ceph-mon
new file mode 100644 (file)
index 0000000..7a28e73
--- /dev/null
+++ b/etc/sysconfig/SuSEfirewall2.d/services/ceph-mon
@@ -0,0 +1,5 @@
+## Name: Ceph MON
+## Description: Open port for Ceph Monitor
+
+# space separated list of allowed TCP ports
+TCP="6789"

diff --git a/etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds b/etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
new file mode 100644 (file)
index 0000000..0109fde
--- /dev/null
+++ b/etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
@@ -0,0 +1,5 @@
+## Name: Ceph OSD/MDS
+## Description: Open ports for Ceph OSDs and Metadata Servers (max: 166 per node)
+
+# space separated list of allowed TCP ports
+TCP="6800:7300"

diff --git a/src/susefirewall-ceph-mon b/src/susefirewall-ceph-mon
deleted file mode 100644 (file)
index 7a28e73..0000000
--- a/src/susefirewall-ceph-mon
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: Ceph MON
-## Description: Open port for Ceph Monitor
-
-# space separated list of allowed TCP ports
-TCP="6789"

diff --git a/src/susefirewall-ceph-osd-mds b/src/susefirewall-ceph-osd-mds
deleted file mode 100644 (file)
index 0109fde..0000000
--- a/src/susefirewall-ceph-osd-mds
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: Ceph OSD/MDS
-## Description: Open ports for Ceph OSDs and Metadata Servers (max: 166 per node)
-
-# space separated list of allowed TCP ports
-TCP="6800:7300"