From e6dbcdccaa004f931e9366c846fda401c4d2d74c Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 30 Aug 2014 09:37:45 +0530 Subject: [PATCH] Move all misc files under misc directory --- .../apache2/sites-available}/plinth-ssl.conf | 0 .../etc/apache2/sites-available}/plinth.conf | 0 {share => data/etc}/init.d/plinth | 0 data/etc/plinth/plinth.config | 23 +++++++++++++++++++ {sudoers.d => data/etc/sudoers.d}/plinth | 0 .../lib}/freedombox/first-run.d/90_firewall | 0 .../usr/lib/freedombox/setup.d}/86_plinth | 0 7 files changed, 23 insertions(+) rename {share/apache2 => data/etc/apache2/sites-available}/plinth-ssl.conf (100%) rename {share/apache2 => data/etc/apache2/sites-available}/plinth.conf (100%) rename {share => data/etc}/init.d/plinth (100%) create mode 100644 data/etc/plinth/plinth.config rename {sudoers.d => data/etc/sudoers.d}/plinth (100%) rename {lib => data/usr/lib}/freedombox/first-run.d/90_firewall (100%) rename {setup.d => data/usr/lib/freedombox/setup.d}/86_plinth (100%) diff --git a/share/apache2/plinth-ssl.conf b/data/etc/apache2/sites-available/plinth-ssl.conf similarity index 100% rename from share/apache2/plinth-ssl.conf rename to data/etc/apache2/sites-available/plinth-ssl.conf diff --git a/share/apache2/plinth.conf b/data/etc/apache2/sites-available/plinth.conf similarity index 100% rename from share/apache2/plinth.conf rename to data/etc/apache2/sites-available/plinth.conf diff --git a/share/init.d/plinth b/data/etc/init.d/plinth similarity index 100% rename from share/init.d/plinth rename to data/etc/init.d/plinth diff --git a/data/etc/plinth/plinth.config b/data/etc/plinth/plinth.config new file mode 100644 index 000000000..4cf364501 --- /dev/null +++ b/data/etc/plinth/plinth.config @@ -0,0 +1,23 @@ +[Name] +product_name = Plinth +box_name = FreedomBox + +[Path] +# directory locations +file_root = /usr/share/plinth/static +data_dir = /var/lib/plinth +log_dir = /var/log/plinth +pid_dir = /var/run +actions_dir = /usr/share/plinth/actions +server_dir = plinth/ + +# file locations +store_file = %(data_dir)s/store.sqlite3 +user_db = %(data_dir)s/users.sqlite3 +status_log_file = %(log_dir)s/status.log +access_log_file = %(log_dir)s/access.log +pidfile = %(pid_dir)s/pidfile.pid + +[Network] +host = 127.0.0.1 +port = 8000 diff --git a/sudoers.d/plinth b/data/etc/sudoers.d/plinth similarity index 100% rename from sudoers.d/plinth rename to data/etc/sudoers.d/plinth diff --git a/lib/freedombox/first-run.d/90_firewall b/data/usr/lib/freedombox/first-run.d/90_firewall similarity index 100% rename from lib/freedombox/first-run.d/90_firewall rename to data/usr/lib/freedombox/first-run.d/90_firewall diff --git a/setup.d/86_plinth b/data/usr/lib/freedombox/setup.d/86_plinth similarity index 100% rename from setup.d/86_plinth rename to data/usr/lib/freedombox/setup.d/86_plinth