X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=debian%2Fpostinst;h=40d0d5f9f28289d271a43b9dc9c2243a6bc370dd;hb=4127b47cd6603d328e540f4f69f66fad9b303fa7;hp=5b29801b130a755874bbcaee82ce2765d59ebe40;hpb=a534b3b856a1e3cbfe60bc0bca432e802f9718be;p=onak.git

diff --git a/debian/postinst b/debian/postinst
index 5b29801..40d0d5f 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -13,7 +13,8 @@ if [ "$1" = "configure" ]; then
     #
     if grep -q "^db_dir /var/lib/onak" /etc/onak.conf &&
             grep -q "^db_backend db4" /etc/onak.conf &&
-            [ ! -e /var/lib/onak/num_keydb ]; then
+            [ ! -e /var/lib/onak/num_keydb -a \
+                -e /usr/share/doc/onak/noodles.key.gz ]; then
         zcat /usr/share/doc/onak/noodles.key | onak -b add
     fi
 
@@ -50,3 +51,13 @@ if [ "$1" = "configure" ]; then
 fi
 
 #DEBHELPER#
+
+#
+# With the move to systemd this will force systemd to start keyd even if it's
+# disabled in the onak config file; the systemd service file can't check the
+# way the init script does. Work around this by doing the check here and
+# only calling invoke-rc.d if it's actually enabled.
+#
+if grep -q -E '^use_keyd *(true|yes|1)$' /etc/onak.conf; then
+    invoke-rc.d onak start || exit $?
+fi