Merge into master from pull request #3329:

Some packaging tweaks (https://github.com/bigswitch/bigswitchcontroller/pull/3329)

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

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)
     ;;
 
     *)

src/main/resources/apps/simpleforwarding.json

 {
     "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",