From e3f1297711d4c428c8832f1575e7834f98b87519 Mon Sep 17 00:00:00 2001
From: Nick Daly <Nick.M.Daly@gmail.com>
Date: Wed, 30 Oct 2013 22:05:29 -0500
Subject: [PATCH] Unify git.sample.config and git.sample.fhs.config.

There's no point to having two copies of what's essentially the same
file.  In the long term, this means the distributions will need to
patch out cfg.py directories instead of plinth.sample.fhs.config.  So,
if diff plinth.sample.config plinth.sample.fhs.config reveals
anything relevant, put that in your patch.
---
 Makefile                 |  2 +-
 plinth.sample.fhs.config | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 plinth.sample.fhs.config

diff --git a/Makefile b/Makefile
index e736a4be8..3e36fc88e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ predepend:
 
 install: default apache-install freedombox-setup-install
 	mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/etc/plinth
-	cp plinth.sample.fhs.config $(DESTDIR)/etc/plinth/plinth.config
+	cp plinth.sample.config $(DESTDIR)/etc/plinth/plinth.config
 	mkdir -p $(DESTDIR)$(PYDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)/usr/bin \
 		$(DESTDIR)/usr/share/doc/plinth $(DESTDIR)/usr/share/man/man1
 	cp -a static themes $(DESTDIR)$(DATADIR)/
diff --git a/plinth.sample.fhs.config b/plinth.sample.fhs.config
deleted file mode 100644
index 683ff8bdd..000000000
--- a/plinth.sample.fhs.config
+++ /dev/null
@@ -1,18 +0,0 @@
-[Name]
-product_name = Plinth
-box_name = FreedomBox
-
-[Path]
-file_root = /usr/share/plinth/static
-python_root = /usr/share/plinth/python/plinth
-data_dir = /var/lib/plinth
-store_file = %(data_dir)s/store.sqlite3
-user_db = %(data_dir)s/users
-status_log_file = /var/log/plinth/status.log
-access_log_file = /var/log/plinth/access.log
-users_dir = %(data_dir)s/users
-pidfile = /var/run/plinth.pid
-
-[Network]
-host = 127.0.0.1
-port = 8000