Cleanup default file locations and XenServer packaging

[sliver-openvswitch.git] / debian / openvswitch-switch.init

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 1f65b69..08f961a 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -205,11 +205,16 @@ case "$1" in
         fi
 
         # Create an empty configuration database if it doesn't exist.
-        if test ! -e /etc/openvswitch-switch/conf; then
+        if test ! -e /etc/openvswitch/conf.db; then
             # Create configuration database.
             ovsdb-tool -vANY:console:emer \
                 create /etc/openvswitch-switch/conf \
-                /usr/share/openvswitch/vswitch-idl.ovsschema
+                /usr/share/openvswitch/vswitch.ovsschema
+        else
+            # Upgrade or downgrade schema and compact database.
+            ovsdb-tool -vANY:console:emer \
+                convert /etc/openvswitch-switch/conf \
+                /usr/share/openvswitch/vswitch.ovsschema
         fi
 
         if test "$ENABLE_MONITOR" = y; then
@@ -225,6 +230,9 @@ case "$1" in
         set -- "$@" --detach --pidfile $monitor_opt
         set -- "$@" --remote punix:/var/run/ovsdb-server
         set -- "$@" /etc/openvswitch-switch/conf
+        set -- "$@" --private-key=db:SSL,private_key
+        set -- "$@" --certificate=db:SSL,certificate
+        set -- "$@" --bootstrap-ca-cert=db:SSL,ca_cert
         set -- "$@" $OVSDB_SERVER_OPTS
         echo -n "Starting ovsdb-server: "
         start-stop-daemon --start --quiet --pidfile /var/run/ovsdb-server.pid \