From: Jonathan McDowell <noodles@earth.li>
Date: Tue, 15 Mar 2011 14:26:56 +0000 (-0700)
Subject: Only seed database for Debian install if we're using default config
X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/a534b3b856a1e3cbfe60bc0bca432e802f9718be?ds=inline

Only seed database for Debian install if we're using default config

  If the user changes the config away from DB4 or the default DB
  directory and deletes the old directory we'll think they don't
  have an initialised key database and try to seed it with my key.
  Check the config file and if it doesn't match what we expect
  assume the user has configured appropriately and don't seed the DB.
---

diff --git a/debian/postinst b/debian/postinst
index 9770352..5b29801 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,10 +7,13 @@ if [ "$1" = "configure" ]; then
     # Add the onak user
     adduser --system --home /var/lib/onak --no-create-home --disabled-login onak
 
-    # 
-    # If there's no onak database, create it by adding my key.
     #
-    if [ ! -e /var/lib/onak/num_keydb ]; then
+    # If we're using a default config and there's no onak database, create it
+    # by adding my key.
+    #
+    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
         zcat /usr/share/doc/onak/noodles.key | onak -b add
     fi