Move config files into folders

debian/authentic2.dirs

@@ -1,5 +1,6 @@
 etc/authentic2
 etc/authentic2/config.d
+usr/share/dbconfig-common/scripts/authentic2/install
 var/lib/authentic2/media
 var/lib/authentic2/static
 var/lib/authentic2/extra-static

debian/authentic2.install

@@ -1,5 +1,4 @@
-debian/authentic.conf           /etc/authentic2
-debian/nginx-example.conf       /etc/authentic2
-debian/authentic2-ctl           /usr/bin
-debian/db.conf                  /usr/share/authentic2/templates
-debian/syncdb.sh                /usr/share/dbconfig-common/scripts/authentic2/install/pgsql
+debian/conf/authentic.conf            /etc/authentic2
+debian/conf/nginx-example.conf        /etc/authentic2
+debian/sql/db.conf                    /usr/share/authentic2/templates
+debian/authentic2-ctl                 /usr/bin

debian/authentic2.postinst

@@ -35,14 +35,7 @@ case "$1" in
 
         ;;
 
-    reconfigure)
-        echo -n "Generating static files.."
-        su authentic -p -c "/usr/bin/authentic2-ctl collectstatic --noinput --link"
-        echo "..done"
-
-        ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
+    reconfigure|abort-upgrade|abort-remove|abort-deconfigure)
         ;;
 
     *)

debian/rules

@@ -9,4 +9,5 @@ pythonauthentic2=$(CURDIR)/debian/python-authentic2
 override_dh_install:
 	dh_install
 	mv $(CURDIR)/debian/tmp/usr/bin/authentic2-ctl $(pythonauthentic2)/usr/lib/authentic2/manage.py
+	install -m 755 -o root -g root debian/sql/syncdb.sh $(authentic2)/usr/share/dbconfig-common/scripts/authentic2/install/pgsql
 

debian/sql/syncdb.sh

@@ -3,5 +3,5 @@
 . /etc/authentic2/authentic.conf
 
 python /usr/lib/authentic2/manage.py syncdb --noinput
-python /usr/lib/authentic2/manage.py migrate
+python /usr/lib/authentic2/manage.py migrate --fake --noinput