From: Tim Serong <tserong@suse.com>
Date: Thu, 30 Apr 2015 00:55:38 +0000 (+1000)
Subject: packaging: move SuSEfirewall2 templates out of src
X-Git-Tag: v9.0.1~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4492%2Fhead;p=ceph.git

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 6856bd6fac4c..7ccd122bbe17 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -508,8 +508,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
index 000000000000..7a28e73a7402
--- /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
index 000000000000..0109fde41be0
--- /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
index 7a28e73a7402..000000000000
--- 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
index 0109fde41be0..000000000000
--- 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"