diff --git a/Makefile b/Makefile index b06b43f5d..67b97b858 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ install: mv $${temp}/freedombox $${temp}/freedombox*.dist-info $(DESTDIR)$${lib_dir} && \ rm -f $(DESTDIR)$${lib_dir}/freedombox*.dist-info/licenses/COPYING.md && \ rm -f $(DESTDIR)$${lib_dir}/freedombox*.dist-info/direct_url.json && \ - $(INSTALL) -D -t $(BIN_DIR) bin/plinth + $(INSTALL) -D -t $(BIN_DIR) bin/freedombox $(INSTALL) -D -t $(LIB_DIR)/freedombox bin/freedombox-privileged $(INSTALL) -D -t $(BIN_DIR) bin/freedombox-cmd $(INSTALL) -D -t $(BIN_DIR) bin/freedombox-change-password diff --git a/bin/plinth b/bin/freedombox similarity index 100% rename from bin/plinth rename to bin/freedombox diff --git a/data/usr/lib/systemd/system/plinth.service b/data/usr/lib/systemd/system/plinth.service index 3133e2c61..d89331e03 100644 --- a/data/usr/lib/systemd/system/plinth.service +++ b/data/usr/lib/systemd/system/plinth.service @@ -2,7 +2,7 @@ [Unit] Description=FreedomBox Service (Plinth) -Documentation=man:plinth(1) +Documentation=man:freedombox(1) After=network.target StartLimitIntervalSec=0 # Uploaded files in /var/tmp/ are shared with FreedomBox privileged service. @@ -10,7 +10,7 @@ JoinsNamespaceOf=freedombox-privileged.service [Service] Type=notify -ExecStart=/usr/bin/plinth +ExecStart=/usr/bin/freedombox TimeoutSec=300s Restart=on-failure RestartSec=5 diff --git a/debian/freedombox.links b/debian/freedombox.links new file mode 100644 index 000000000..8e7d1d3c5 --- /dev/null +++ b/debian/freedombox.links @@ -0,0 +1,2 @@ +usr/bin/freedombox usr/bin/plinth +usr/share/man/man1/freedombox.1.gz usr/share/man/man1/plinth.1.gz diff --git a/debian/freedombox.manpages b/debian/freedombox.manpages index f96cd2ce6..776fe575c 100644 --- a/debian/freedombox.manpages +++ b/debian/freedombox.manpages @@ -1,2 +1,2 @@ ./doc/freedombox-cmd.1 -./doc/plinth.1 +./doc/freedombox.1 diff --git a/doc/Makefile b/doc/Makefile index 934c3d9ae..94c3b6e42 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -13,7 +13,7 @@ SCRIPTS_DIR=scripts manual-pdfs=$(foreach lang,$(MANUAL_LANGUAGES),manual/$(lang)/freedombox-manual.pdf) manual-xmls=$(patsubst %.pdf,%.xml,$(manual-pdfs)) -OUTPUTS=$(manual-pdfs) plinth.1 freedombox-cmd.1 +OUTPUTS=$(manual-pdfs) freedombox.1 freedombox-cmd.1 INSTALL_OPTS=-D --mode=644 @@ -33,7 +33,7 @@ endif all: $(OUTPUTS) manual-pages install: all - install $(INSTALL_OPTS) -t $(MAN_INSTALL_DIR)/man1 plinth.1 + install $(INSTALL_OPTS) -t $(MAN_INSTALL_DIR)/man1 freedombox.1 for file in $(manual-pages-part-html) $(manual-pdfs); do \ install $(INSTALL_OPTS) -t $(INSTALL_DIR)/$$(dirname $${file}) \ $${file} ; \ diff --git a/doc/plinth.xml b/doc/freedombox.xml similarity index 95% rename from doc/plinth.xml rename to doc/freedombox.xml index 33da49c8e..ded013668 100644 --- a/doc/plinth.xml +++ b/doc/freedombox.xml @@ -5,22 +5,22 @@ --> - plinth + freedombox 1 FreedomBox - plinth + freedombox - a web front end for administering FreedomBox + An inexpensive server at home. - plinth + freedombox SERVER_DIR @@ -182,7 +182,7 @@ Start FreedomBox Service with default options - $ plinth + $ freedombox Run FreedomBox Service as guided by configuration file. @@ -190,7 +190,7 @@ Run FreedomBox Service with different URL prefix - $ plinth --server_dir='/myurl' + $ freedombox --server_dir='/myurl' Run FreedomBox with the '/myurl' prefix. Note that Apache forwards requests to '/freedombox' by default, so /myurl is not accessible @@ -200,7 +200,7 @@ Run FreedomBox Service in development mode - $ plinth --develop + $ freedombox --develop Run in development mode on the terminal. Enable auto-reloading and more extensive debugging. diff --git a/pyproject.toml b/pyproject.toml index d046a10a4..88360c32f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -108,7 +108,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project.scripts] -plinth = "freedombox.__main__:main" +freedombox = "freedombox.__main__:main" freedombox-privileged = "freedombox.privileged_daemon:main" freedombox-cmd = "freedombox.privileged_daemon:client_main"