]> git.sommitrealweird.co.uk Git - onak.git/commitdiff
Only seed database for Debian install if we're using default config
authorJonathan McDowell <noodles@earth.li>
Tue, 15 Mar 2011 14:26:56 +0000 (07:26 -0700)
committerJonathan McDowell <noodles@earth.li>
Tue, 15 Mar 2011 14:26:56 +0000 (07:26 -0700)
  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.

debian/postinst

index 9770352910e07790ce62598c7ea86f4ae6d85324..5b29801b130a755874bbcaee82ce2765d59ebe40 100644 (file)
@@ -7,10 +7,13 @@ if [ "$1" = "configure" ]; then
     # Add the onak user
     adduser --system --home /var/lib/onak --no-create-home --disabled-login onak
 
     # 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
 
         zcat /usr/share/doc/onak/noodles.key | onak -b add
     fi