From 31ffed9323b8044b6340331ea4b57ac4c887290b Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Wed, 20 Nov 2013 20:45:17 -0500
Subject: [PATCH] Remove users database and folder. The user db will be
 generated in firstboot.

---
 Makefile                   |  11 +++--------
 data/users.sqlite3.distrib | Bin 3072 -> 0 bytes
 data/users/admin           |   1 -
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 data/users.sqlite3.distrib
 delete mode 100644 data/users/admin

diff --git a/Makefile b/Makefile
index 3e36fc88e..36e1da9b6 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ ALL_BUT_GZ=$(subst $(wildcard *.tar.gz),,$(wildcard *))
 DATADIR=/usr/share/plinth
 PYDIR=$(DATADIR)/python/plinth
 
-## Catch-all tagets
-default: config dirs template css docs dbs
+## Catch-all targets
+default: config dirs template css docs
 all: default
 
 predepend:
@@ -34,7 +34,7 @@ install: default apache-install freedombox-setup-install
 	cp share/init.d/plinth $(DESTDIR)/etc/init.d
 	install plinth $(DESTDIR)/usr/bin/
 	mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions $(DESTDIR)/var/log/plinth $(DESTDIR)/var/run
-	cp -r data/* $(DESTDIR)/var/lib/plinth
+	mkdir -p $(DESTDIR)/var/lib/plinth/data
 	rm -f $(DESTDIR)/var/lib/plinth/users/sqlite3.distrib
 
 freedombox-setup-install:
@@ -47,11 +47,6 @@ uninstall:
 	rm -f $(DESTDIR)/usr/bin/plinth $(DESTDIR)/etc/init.d/plinth \
 		$(DESTDIR)/usr/share/man/man1/plinth.1.gz $(DESTDIR)/var/run/plinth.pid
 
-dbs: data/users.sqlite3
-
-data/users.sqlite3: data/users.sqlite3.distrib
-	cp data/users.sqlite3.distrib data/users.sqlite3
-
 dirs:
 	@mkdir -p data/cherrypy_sessions
 
diff --git a/data/users.sqlite3.distrib b/data/users.sqlite3.distrib
deleted file mode 100644
index 2d805a1537d2501e6dddf3302a83dd69935d620c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3072
zcmeHH!Ab)$5KT6vV4>%|#`R*M!dkUjL9l9Xy{Ns3l(ajwi@TdP$!bMBh{t}Nzu-rB
z@?etfLMiwKX2>L&H}fXsL2`TDj}_1f7b#Qp096pi=$ul7kf)t!FAeLB@zU1!CAPVG
zXzy#gPJWO_mWV9L=VpP6odQk)tH2em`o522#YPE8#YHiBmp8rcphpMYi++z<obEot
z3staCG|%FB4o&*R5(_jMUe!PIF^aPY7IL2G*F9vp;x-;y`f%Sa=51H%dcvfE^l;`B
za0>jT!21AK{Er<LrE&IJqm%}avN#D&X&^XP=LsLPWXh!qnniXo1EEZsXDjGI@O&mU
zbZ07Ti=xPc_XRCuDHu}MoU`K1n3S`rVA5ueU<9pJ=MctG2;n3=0X8~rcfzQ}+5qj&
q8tIvf$TV9)xdc)6xAzEYZ#8{iOumsG&YS{Hfq$XE7V)wD0q`$K!EYA;

diff --git a/data/users/admin b/data/users/admin
deleted file mode 100644
index acda278c8..000000000
--- a/data/users/admin
+++ /dev/null
@@ -1 +0,0 @@
-{"username": "admin", "name": "Admin", "expert": "on", "groups": ["expert"], "passphrase": "5ebe2294ecd0e0f08eab7690d2a6ee69", "password": "", "email": "root@localhost"}
\ No newline at end of file