From 9e176b81f42bd739707efd0af2d0a348a12052fd Mon Sep 17 00:00:00 2001
From: Rob Adams <rob.adams@bigswitch.com>
Date: Tue, 14 May 2013 11:51:24 -0700
Subject: [PATCH] Some packaging tweaks
---
debian/control/postinst | 10 ++++++----
debian/control/prerm | 10 ++--------
src/main/resources/apps/simpleforwarding.json | 4 ++--
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/debian/control/postinst b/debian/control/postinst
index 92eeb7af9..3e1d4441c 100644
--- a/debian/control/postinst
+++ b/debian/control/postinst
@@ -2,6 +2,7 @@
NAME=floodlight
KEYSTORE=/etc/floodlight/auth_credentials.jceks
+KEYSTOREPASS=/etc/floodlight/conf.d/01-keystorepass.properties
case "$1" in
configure)
@@ -16,17 +17,18 @@ case "$1" in
chown -R syslog:adm /var/log/floodlight
chown -R $NAME:$NAME /var/lib/floodlight
- if [ ! -f /etc/floodlight/auth_credentials.jceks ]; then
+ if [ ! -f $KEYSTORE ]; then
KSPASS=`dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 -w 0 | rev | cut -b 2- | rev`
+ umask 0077
echo "org.sdnplatform.sync.internal.SyncManager.keyStorePassword=$KSPASS" > \
- /etc/floodlight/conf.d/01-keystorepass.properties
+ $KEYSTOREPASS
authtool -a CHALLENGE_RESPONSE \
-ks $KEYSTORE \
-kp $KSPASS
- chown $NAME:$NAME $KEYSTORE
+ chown $NAME:$NAME $KEYSTORE $KEYSTOREPASS
fi
- service rsyslog reload
+ service rsyslog restart
service floodlight restart
;;
diff --git a/debian/control/prerm b/debian/control/prerm
index 4c9669156..847302f83 100644
--- a/debian/control/prerm
+++ b/debian/control/prerm
@@ -3,17 +3,11 @@
NAME=floodlight
case "$1" in
- purge)
- rm -f /etc/floodlight/auth_credentials.jceks
- rm -f /etc/floodlight/conf.d/01-keystorepass.properties
- rm -rf /var/lib/floodlight/SyncDB
- ;;
-
remove)
- service floodlight stop
+ service floodlight stop || true
;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
diff --git a/src/main/resources/apps/simpleforwarding.json b/src/main/resources/apps/simpleforwarding.json
index 0d555acaf..1214f6d73 100644
--- a/src/main/resources/apps/simpleforwarding.json
+++ b/src/main/resources/apps/simpleforwarding.json
@@ -1,8 +1,8 @@
{
"name": "simpleforwarding",
"modules": [
- "net.floodlightcontroller.counter.CounterStore",
- "net.floodlightcontroller.storage.memory.MemoryStorageSource",
+ "net.floodlightcontroller.counter.CounterStore",
+ "net.floodlightcontroller.storage.memory.MemoryStorageSource",
"net.floodlightcontroller.core.internal.FloodlightProvider",
"net.floodlightcontroller.threadpool.ThreadPool",
"net.floodlightcontroller.devicemanager.internal.DeviceManagerImpl",
--
GitLab