X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=3ca3dabbe8ecc584799eef1ccdaf6813bac1bf3a;hb=HEAD;hp=bf81c9b8dbcbad006ee486f8632f92daa4d2b478;hpb=72943ba7e231bbcde2b88858abf0472ca9e437ae;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/debian/rules b/debian/rules
index bf81c9b..3ca3dab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 package:=userdir-ldap-cgi
-i:=./debian/tmp
+i:=./debian/$(package)
 
 build:
 	dh_testdir
@@ -14,13 +14,14 @@ build:
 clean:
 	dh_testdir
 	-rm -f build
-	-rm -rf $(i) debian/files* core debian/substvars debian/debhelper.log html/*.html
+	-rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html
 
 instdirs = \
 	var/www/userdir-ldap \
 	var/www/userdir-ldap/Pics \
 	var/cache/userdir-ldap/web-cookies \
 	var/cache/userdir-ldap/hosts \
+	var/cache/userdir-ldap/totp \
 	usr/share/doc/$(package) \
 	usr/lib/userdir-ldap-cgi
 
@@ -30,7 +31,6 @@ binary-indep: build
 	dh_clean -k
 	dh_installdirs $(instdirs)
 	dh_installdocs
-	isoquery -i 3166 -c | cut -f 1,4 > html/domains.tab
 
 	install -m 755 *.cgi $(i)/var/www/userdir-ldap/
 	install -m 644 Util.pm $(i)/var/www/userdir-ldap/
@@ -49,9 +49,12 @@ binary-indep: build
 	install -m 644 html/searchform.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/searchhelp.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/searchresults.html $(i)/var/www/userdir-ldap/
+	install -m 644 html/fetch-totp-seed.html $(i)/var/www/userdir-ldap/
 	install -m 644 html/update.html $(i)/var/www/userdir-ldap/
 	chown www-data:www-data $(i)/var/cache/userdir-ldap/web-cookies/
 	chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/web-cookies/
+	chown www-data:www-data $(i)/var/cache/userdir-ldap/totp/
+	chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/totp/
 
 	install -m 755 password-qualify-check $(i)/usr/lib/userdir-ldap-cgi
 
@@ -61,7 +64,7 @@ binary-indep: build
 
 	dh_installchangelogs
 	dh_installcron
-	dh_fixperms --exclude=web-cookies
+	dh_fixperms --exclude=web-cookies --exclude=totp
 	dh_compress
 	dh_installdeb
 	dh_gencontrol