nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify git.sample.config and git.sample.fhs.config.

Browse Source 
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.
This commit is contained in:
Nick Daly 2013-10-30 22:05:29 -05:00
parent 3a30660c25
commit e3f1297711
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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)/

18
plinth.sample.fhs.config
View File

@ -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