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