summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorLisa Stillwell <lisa@lisa-VirtualBox.(none)>2012-05-15 14:35:52 (GMT)
committer Lisa Stillwell <lisa@lisa-VirtualBox.(none)>2012-05-15 14:35:52 (GMT)
commit5c46425bedab08202d3c612704812cdd795c8d54 (patch)
tree7e03c2ba0f45da6fe72fbbd325de7e0e880cc9b5 /packaging
parent701d2ce5edd2a2288bbdc6b6b2bff318bb35d03e (diff)
downloadQCG-Data-5c46425bedab08202d3c612704812cdd795c8d54.zip
QCG-Data-5c46425bedab08202d3c612704812cdd795c8d54.tar.gz
QCG-Data-5c46425bedab08202d3c612704812cdd795c8d54.tar.bz2
[#769] fixed iptables save for deb packages
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/build.sh4
-rw-r--r--packaging/idrop-web.list.template8
2 files changed, 6 insertions, 6 deletions
diff --git a/packaging/build.sh b/packaging/build.sh
index baaba12..e475165 100755
--- a/packaging/build.sh
+++ b/packaging/build.sh
@@ -83,10 +83,10 @@ rm tmp.list
if [ -f "/etc/redhat-release" ]; then # CentOS and RHEL and Fedora
echo "Running EPM :: Generating RPM"
- epm -f rpm idrop-web idrop-web.list
+ epm -f rpm idrop-web RPM=true idrop-web.list
elif [ -f "/etc/SuSE-release" ]; then # SuSE
echo "Running EPM :: Generating RPM"
- epm -f rpm idrop-web idrop-web.list
+ epm -f rpm idrop-web RPM=true idrop-web.list
elif [ -f "/etc/lsb-release" ]; then # Ubuntu
echo "Running EPM :: Generating DEB"
epm -a amd64 -f deb idrop-web idrop-web.list
diff --git a/packaging/idrop-web.list.template b/packaging/idrop-web.list.template
index 7ea9001..a39b4c7 100644
--- a/packaging/idrop-web.list.template
+++ b/packaging/idrop-web.list.template
@@ -6,10 +6,6 @@
%description Web Based Interface for Interacting with the iRODS data grid
%version 3.1 300001
-%if DEB
-%elseif RPM
-%endif
-
#%requires http 2
#%requires java 6
#%requires wget
@@ -155,7 +151,11 @@ echo "INFO :: Removing Firewall Access for iDrop Web ..."
/sbin/iptables -F idropweb
/sbin/iptables -D INPUT -j idropweb
/sbin/iptables -X idropweb
+%if RPM
/sbin/service iptables save
+%else
+/sbin/iptables-save
+%endif
END_PREREMOVE
# =-=-=-=-=-=-=-