debian: Remove openvswitch-pki-server package.

The functionality provided by this package was used only by
openvswitch-switch-config, which was removed some time ago.  If I had been
more careful at the time, I would have removed this package at the same
time.

diff --git a/debian/.gitignore b/debian/.gitignore
index f2e3c9769f5bdc8b53a91d163c5b02dbe5ea7fe5..3ebb73b5f4549b3d86a09b2d7e9695006f2a4919 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -13,7 +13,6 @@
 /openvswitch-dbg
 /openvswitch-ipsec
 /openvswitch-pki
-/openvswitch-pki-server
 /openvswitch-switch
 /openvswitch-switch.copyright
 /python-openvswitch

diff --git a/debian/automake.mk b/debian/automake.mk
index a423c6b0a6641886ef0da97a0cc98a91ef11ae1e..f493100148e8d85c0a7a0aea518a348835869dae 100644 (file)
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -24,10 +24,6 @@ EXTRA_DIST += \
        debian/openvswitch-ipsec.dirs \
        debian/openvswitch-ipsec.init \
        debian/openvswitch-ipsec.install \
-       debian/openvswitch-pki-server.apache2 \
-       debian/openvswitch-pki-server.dirs \
-       debian/openvswitch-pki-server.install \
-       debian/openvswitch-pki-server.postinst \
        debian/openvswitch-pki.postinst \
        debian/openvswitch-switch.README.Debian \
        debian/openvswitch-switch.dirs \

diff --git a/debian/control b/debian/control
index f488cfbdcb3e6e2564551601d27e05d7d65e500e..29709154338c62e387122b544ae8706bf1ed7888 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -69,20 +69,6 @@ Description: A dependency package for the Open vSwitch public key infrastructure
  .
  Open vSwitch is a full-featured software-based Ethernet switch.
 
-Package: openvswitch-pki-server
-Architecture: all
-Depends:
- ${misc:Depends}, ${perl:Depends}, openvswitch-pki (= ${binary:Version}),
- apache2
-Description: Open vSwitch public key infrastructure (HTTP server support)
- openvswitch-pki-server provides HTTP access to the Open vSwitch PKI (public
- key infrastructure) maintained on the local machine by the
- openvswitch-pki package.  This HTTP access is needed for secure and
- convenient OpenFlow switch setup using the ovs-switch-setup program
- in the openvswitch-switch package.
- .
- Open vSwitch is a full-featured software-based Ethernet switch.
-
 Package: openvswitch-controller
 Architecture: linux-any
 Depends:

diff --git a/debian/openvswitch-pki-server.apache2 b/debian/openvswitch-pki-server.apache2
deleted file mode 100644 (file)
index d0bc8ba..0000000
--- a/debian/openvswitch-pki-server.apache2
+++ /dev/null
@@ -1 +0,0 @@
-Alias /openvswitch/pki/ /usr/share/openvswitch/pki/

diff --git a/debian/openvswitch-pki-server.dirs b/debian/openvswitch-pki-server.dirs
deleted file mode 100644 (file)
index 7307777..0000000
--- a/debian/openvswitch-pki-server.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/apache2/sites-available

diff --git a/debian/openvswitch-pki-server.install b/debian/openvswitch-pki-server.install
deleted file mode 100644 (file)
index 5af75da..0000000
--- a/debian/openvswitch-pki-server.install
+++ /dev/null
@@ -1 +0,0 @@
-_debian/utilities/ovs-pki-cgi usr/lib/cgi-bin

diff --git a/debian/openvswitch-pki-server.postinst b/debian/openvswitch-pki-server.postinst
deleted file mode 100755 (executable)
index 79d73a4..0000000
--- a/debian/openvswitch-pki-server.postinst
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# postinst script for openflow-pki-server
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    configure)
-        # Enable site under Apache.
-        a2ensite openflow-pki >/dev/null
-        if command -v invoke-rc.d >/dev/null 2>&1; then
-                invoke-rc.d apache2 force-reload || :
-        else
-                [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
-        fi
-        ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-        ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/rules b/debian/rules
index 4a02a49e5c4539c8d66963ca2e338fcd6994f880..bbc7357e54ddec9a09a94a95a1e2eb9068aa027c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,6 @@ install-indep: build-indep
                > debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
        chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
        cd debian/openvswitch-datapath-source/usr/src && tar -c modules | bzip2 -9 > openvswitch-datapath.tar.bz2 && rm -rf modules
-       install -m644 debian/openvswitch-pki-server.apache2 debian/openvswitch-pki-server/etc/apache2/sites-available/openvswitch-pki
 
 install-arch: build-arch
        dh_testdir