From ff247fa5aacafc7a095811e9ebbcd5f2d522815e Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 8 Mar 2019 18:08:40 -0800 Subject: [PATCH] setup: Move app data files into respective apps Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .../data}/etc/apache2/conf-available/php-fpm-freedombox.conf | 0 .../apache/data}/etc/fail2ban/jail.d/apache-auth-freedombox.conf | 0 .../data}/etc/apache2/conf-available/cockpit-freedombox.conf | 0 .../data}/etc/apache2/conf-available/coquelicot-freedombox.conf | 0 .../deluge/data}/etc/apache2/conf-available/deluge-plinth.conf | 0 .../ejabberd/data}/etc/apache2/conf-available/jwchat-plinth.conf | 0 .../modules/ejabberd/data}/etc/avahi/services/xmpp-server.service | 0 .../ikiwiki/data}/etc/apache2/conf-available/ikiwiki-plinth.conf | 0 .../modules/ikiwiki/data}/etc/ikiwiki/plinth-blog.setup | 0 .../modules/ikiwiki/data}/etc/ikiwiki/plinth-wiki.setup | 0 .../data}/usr/lib/firewalld/services/infinoted-plinth.xml | 0 .../data}/etc/apache2/conf-available/matrix-synapse-plinth.conf | 0 .../data}/usr/lib/firewalld/services/matrix-synapse-plinth.xml | 0 .../data}/etc/apache2/conf-available/mediawiki-freedombox.conf | 0 .../modules/mediawiki/data}/etc/mediawiki/FreedomBoxSettings.php | 0 .../minetest/data}/usr/lib/firewalld/services/minetest-plinth.xml | 0 .../data}/etc/apache2/conf-available/mldonkey-freedombox.conf | 0 .../lib/systemd/system/mldonkey-server.service.d/freedombox.conf | 0 .../mumble/data}/usr/lib/firewalld/services/mumble-plinth.xml | 0 .../data}/etc/NetworkManager/dispatcher.d/10-freedombox-batman | 0 .../networks/data}/usr/share/polkit-1/rules.d/50-plinth.rules | 0 .../localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla | 0 .../modules/pagekite/data}/usr/share/augeas/lenses/pagekite.aug | 0 .../data}/usr/share/augeas/lenses/tests/test_pagekite.aug | 0 .../quassel/data}/usr/lib/firewalld/services/quassel-plinth.xml | 0 .../data}/etc/apache2/conf-available/radicale-plinth.conf | 0 .../data}/etc/apache2/conf-available/radicale2-freedombox.conf | 0 .../repro/data}/etc/apache2/conf-available/repro-plinth.conf | 0 .../modules/repro/data}/usr/lib/firewalld/services/rtp-plinth.xml | 0 .../searx/data}/etc/apache2/conf-available/searx-freedombox.conf | 0 .../security/data}/usr/share/pam-configs/access-freedombox | 0 .../data}/usr/lib/firewalld/services/shadowsocks-local-plinth.xml | 0 .../sharing/data}/etc/apache2/includes/freedombox-sharing.conf | 0 .../modules/ssh/data}/etc/avahi/services/sftp-ssh.service | 0 {data => plinth/modules/ssh/data}/etc/avahi/services/ssh.service | 0 .../modules/ssh/data}/etc/fail2ban/jail.d/ssh-freedombox.conf | 0 .../sso/data}/etc/apache2/includes/freedombox-single-sign-on.conf | 0 .../storage/data}/lib/systemd/system/freedombox-udiskie.service | 0 .../data}/etc/apache2/conf-available/syncthing-plinth.conf | 0 .../tahoe/data}/etc/apache2/conf-available/tahoe-plinth.conf | 0 .../tahoe/data}/usr/lib/firewalld/services/tahoe-plinth.xml | 0 .../modules/tor/data}/usr/share/augeas/lenses/tests/test_tor.aug | 0 {data => plinth/modules/tor/data}/usr/share/augeas/lenses/tor.aug | 0 .../data}/etc/apache2/conf-available/transmission-plinth.conf | 0 .../ttrss/data}/etc/apache2/conf-available/tt-rss-plinth.conf | 0 .../modules/upgrades/data}/etc/apt/apt.conf.d/20freedombox | 0 .../upgrades/data}/etc/apt/apt.conf.d/60unattended-upgrades | 0 .../lib/systemd/system/freedombox-setup-repositories.service | 0 .../data}/lib/systemd/system/freedombox-setup-repositories.timer | 0 .../users/data}/etc/apache2/includes/freedombox-auth-ldap.conf | 0 .../users/data}/usr/share/pam-configs/mkhomedir-freedombox | 0 51 files changed, 0 insertions(+), 0 deletions(-) rename {data => plinth/modules/apache/data}/etc/apache2/conf-available/php-fpm-freedombox.conf (100%) rename {data => plinth/modules/apache/data}/etc/fail2ban/jail.d/apache-auth-freedombox.conf (100%) rename {data => plinth/modules/cockpit/data}/etc/apache2/conf-available/cockpit-freedombox.conf (100%) rename {data => plinth/modules/coquelicot/data}/etc/apache2/conf-available/coquelicot-freedombox.conf (100%) rename {data => plinth/modules/deluge/data}/etc/apache2/conf-available/deluge-plinth.conf (100%) rename {data => plinth/modules/ejabberd/data}/etc/apache2/conf-available/jwchat-plinth.conf (100%) rename {data => plinth/modules/ejabberd/data}/etc/avahi/services/xmpp-server.service (100%) rename {data => plinth/modules/ikiwiki/data}/etc/apache2/conf-available/ikiwiki-plinth.conf (100%) rename {data => plinth/modules/ikiwiki/data}/etc/ikiwiki/plinth-blog.setup (100%) rename {data => plinth/modules/ikiwiki/data}/etc/ikiwiki/plinth-wiki.setup (100%) rename {data => plinth/modules/infinoted/data}/usr/lib/firewalld/services/infinoted-plinth.xml (100%) rename {data => plinth/modules/matrixsynapse/data}/etc/apache2/conf-available/matrix-synapse-plinth.conf (100%) rename {data => plinth/modules/matrixsynapse/data}/usr/lib/firewalld/services/matrix-synapse-plinth.xml (100%) rename {data => plinth/modules/mediawiki/data}/etc/apache2/conf-available/mediawiki-freedombox.conf (100%) rename {data => plinth/modules/mediawiki/data}/etc/mediawiki/FreedomBoxSettings.php (100%) rename {data => plinth/modules/minetest/data}/usr/lib/firewalld/services/minetest-plinth.xml (100%) rename {data => plinth/modules/mldonkey/data}/etc/apache2/conf-available/mldonkey-freedombox.conf (100%) rename {data => plinth/modules/mldonkey/data}/lib/systemd/system/mldonkey-server.service.d/freedombox.conf (100%) rename {data => plinth/modules/mumble/data}/usr/lib/firewalld/services/mumble-plinth.xml (100%) rename {data => plinth/modules/networks/data}/etc/NetworkManager/dispatcher.d/10-freedombox-batman (100%) rename {data => plinth/modules/networks/data}/usr/share/polkit-1/rules.d/50-plinth.rules (100%) rename {data => plinth/modules/networks/data}/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla (100%) rename {data => plinth/modules/pagekite/data}/usr/share/augeas/lenses/pagekite.aug (100%) rename {data => plinth/modules/pagekite/data}/usr/share/augeas/lenses/tests/test_pagekite.aug (100%) rename {data => plinth/modules/quassel/data}/usr/lib/firewalld/services/quassel-plinth.xml (100%) rename {data => plinth/modules/radicale/data}/etc/apache2/conf-available/radicale-plinth.conf (100%) rename {data => plinth/modules/radicale/data}/etc/apache2/conf-available/radicale2-freedombox.conf (100%) rename {data => plinth/modules/repro/data}/etc/apache2/conf-available/repro-plinth.conf (100%) rename {data => plinth/modules/repro/data}/usr/lib/firewalld/services/rtp-plinth.xml (100%) rename {data => plinth/modules/searx/data}/etc/apache2/conf-available/searx-freedombox.conf (100%) rename {data => plinth/modules/security/data}/usr/share/pam-configs/access-freedombox (100%) rename {data => plinth/modules/shadowsocks/data}/usr/lib/firewalld/services/shadowsocks-local-plinth.xml (100%) rename {data => plinth/modules/sharing/data}/etc/apache2/includes/freedombox-sharing.conf (100%) rename {data => plinth/modules/ssh/data}/etc/avahi/services/sftp-ssh.service (100%) rename {data => plinth/modules/ssh/data}/etc/avahi/services/ssh.service (100%) rename {data => plinth/modules/ssh/data}/etc/fail2ban/jail.d/ssh-freedombox.conf (100%) rename {data => plinth/modules/sso/data}/etc/apache2/includes/freedombox-single-sign-on.conf (100%) rename {data => plinth/modules/storage/data}/lib/systemd/system/freedombox-udiskie.service (100%) rename {data => plinth/modules/syncthing/data}/etc/apache2/conf-available/syncthing-plinth.conf (100%) rename {data => plinth/modules/tahoe/data}/etc/apache2/conf-available/tahoe-plinth.conf (100%) rename {data => plinth/modules/tahoe/data}/usr/lib/firewalld/services/tahoe-plinth.xml (100%) rename {data => plinth/modules/tor/data}/usr/share/augeas/lenses/tests/test_tor.aug (100%) rename {data => plinth/modules/tor/data}/usr/share/augeas/lenses/tor.aug (100%) rename {data => plinth/modules/transmission/data}/etc/apache2/conf-available/transmission-plinth.conf (100%) rename {data => plinth/modules/ttrss/data}/etc/apache2/conf-available/tt-rss-plinth.conf (100%) rename {data => plinth/modules/upgrades/data}/etc/apt/apt.conf.d/20freedombox (100%) rename {data => plinth/modules/upgrades/data}/etc/apt/apt.conf.d/60unattended-upgrades (100%) rename {data => plinth/modules/upgrades/data}/lib/systemd/system/freedombox-setup-repositories.service (100%) rename {data => plinth/modules/upgrades/data}/lib/systemd/system/freedombox-setup-repositories.timer (100%) rename {data => plinth/modules/users/data}/etc/apache2/includes/freedombox-auth-ldap.conf (100%) rename {data => plinth/modules/users/data}/usr/share/pam-configs/mkhomedir-freedombox (100%) diff --git a/data/etc/apache2/conf-available/php-fpm-freedombox.conf b/plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/php-fpm-freedombox.conf rename to plinth/modules/apache/data/etc/apache2/conf-available/php-fpm-freedombox.conf diff --git a/data/etc/fail2ban/jail.d/apache-auth-freedombox.conf b/plinth/modules/apache/data/etc/fail2ban/jail.d/apache-auth-freedombox.conf similarity index 100% rename from data/etc/fail2ban/jail.d/apache-auth-freedombox.conf rename to plinth/modules/apache/data/etc/fail2ban/jail.d/apache-auth-freedombox.conf diff --git a/data/etc/apache2/conf-available/cockpit-freedombox.conf b/plinth/modules/cockpit/data/etc/apache2/conf-available/cockpit-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/cockpit-freedombox.conf rename to plinth/modules/cockpit/data/etc/apache2/conf-available/cockpit-freedombox.conf diff --git a/data/etc/apache2/conf-available/coquelicot-freedombox.conf b/plinth/modules/coquelicot/data/etc/apache2/conf-available/coquelicot-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/coquelicot-freedombox.conf rename to plinth/modules/coquelicot/data/etc/apache2/conf-available/coquelicot-freedombox.conf diff --git a/data/etc/apache2/conf-available/deluge-plinth.conf b/plinth/modules/deluge/data/etc/apache2/conf-available/deluge-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/deluge-plinth.conf rename to plinth/modules/deluge/data/etc/apache2/conf-available/deluge-plinth.conf diff --git a/data/etc/apache2/conf-available/jwchat-plinth.conf b/plinth/modules/ejabberd/data/etc/apache2/conf-available/jwchat-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/jwchat-plinth.conf rename to plinth/modules/ejabberd/data/etc/apache2/conf-available/jwchat-plinth.conf diff --git a/data/etc/avahi/services/xmpp-server.service b/plinth/modules/ejabberd/data/etc/avahi/services/xmpp-server.service similarity index 100% rename from data/etc/avahi/services/xmpp-server.service rename to plinth/modules/ejabberd/data/etc/avahi/services/xmpp-server.service diff --git a/data/etc/apache2/conf-available/ikiwiki-plinth.conf b/plinth/modules/ikiwiki/data/etc/apache2/conf-available/ikiwiki-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/ikiwiki-plinth.conf rename to plinth/modules/ikiwiki/data/etc/apache2/conf-available/ikiwiki-plinth.conf diff --git a/data/etc/ikiwiki/plinth-blog.setup b/plinth/modules/ikiwiki/data/etc/ikiwiki/plinth-blog.setup similarity index 100% rename from data/etc/ikiwiki/plinth-blog.setup rename to plinth/modules/ikiwiki/data/etc/ikiwiki/plinth-blog.setup diff --git a/data/etc/ikiwiki/plinth-wiki.setup b/plinth/modules/ikiwiki/data/etc/ikiwiki/plinth-wiki.setup similarity index 100% rename from data/etc/ikiwiki/plinth-wiki.setup rename to plinth/modules/ikiwiki/data/etc/ikiwiki/plinth-wiki.setup diff --git a/data/usr/lib/firewalld/services/infinoted-plinth.xml b/plinth/modules/infinoted/data/usr/lib/firewalld/services/infinoted-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/infinoted-plinth.xml rename to plinth/modules/infinoted/data/usr/lib/firewalld/services/infinoted-plinth.xml diff --git a/data/etc/apache2/conf-available/matrix-synapse-plinth.conf b/plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/matrix-synapse-plinth.conf rename to plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf diff --git a/data/usr/lib/firewalld/services/matrix-synapse-plinth.xml b/plinth/modules/matrixsynapse/data/usr/lib/firewalld/services/matrix-synapse-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/matrix-synapse-plinth.xml rename to plinth/modules/matrixsynapse/data/usr/lib/firewalld/services/matrix-synapse-plinth.xml diff --git a/data/etc/apache2/conf-available/mediawiki-freedombox.conf b/plinth/modules/mediawiki/data/etc/apache2/conf-available/mediawiki-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/mediawiki-freedombox.conf rename to plinth/modules/mediawiki/data/etc/apache2/conf-available/mediawiki-freedombox.conf diff --git a/data/etc/mediawiki/FreedomBoxSettings.php b/plinth/modules/mediawiki/data/etc/mediawiki/FreedomBoxSettings.php similarity index 100% rename from data/etc/mediawiki/FreedomBoxSettings.php rename to plinth/modules/mediawiki/data/etc/mediawiki/FreedomBoxSettings.php diff --git a/data/usr/lib/firewalld/services/minetest-plinth.xml b/plinth/modules/minetest/data/usr/lib/firewalld/services/minetest-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/minetest-plinth.xml rename to plinth/modules/minetest/data/usr/lib/firewalld/services/minetest-plinth.xml diff --git a/data/etc/apache2/conf-available/mldonkey-freedombox.conf b/plinth/modules/mldonkey/data/etc/apache2/conf-available/mldonkey-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/mldonkey-freedombox.conf rename to plinth/modules/mldonkey/data/etc/apache2/conf-available/mldonkey-freedombox.conf diff --git a/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf b/plinth/modules/mldonkey/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf similarity index 100% rename from data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf rename to plinth/modules/mldonkey/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf diff --git a/data/usr/lib/firewalld/services/mumble-plinth.xml b/plinth/modules/mumble/data/usr/lib/firewalld/services/mumble-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/mumble-plinth.xml rename to plinth/modules/mumble/data/usr/lib/firewalld/services/mumble-plinth.xml diff --git a/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman b/plinth/modules/networks/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman similarity index 100% rename from data/etc/NetworkManager/dispatcher.d/10-freedombox-batman rename to plinth/modules/networks/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman diff --git a/data/usr/share/polkit-1/rules.d/50-plinth.rules b/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-plinth.rules similarity index 100% rename from data/usr/share/polkit-1/rules.d/50-plinth.rules rename to plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-plinth.rules diff --git a/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla b/plinth/modules/networks/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla similarity index 100% rename from data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla rename to plinth/modules/networks/data/var/lib/polkit-1/localauthority/10-vendor.d/org.freedombox.NetworkManager.pkla diff --git a/data/usr/share/augeas/lenses/pagekite.aug b/plinth/modules/pagekite/data/usr/share/augeas/lenses/pagekite.aug similarity index 100% rename from data/usr/share/augeas/lenses/pagekite.aug rename to plinth/modules/pagekite/data/usr/share/augeas/lenses/pagekite.aug diff --git a/data/usr/share/augeas/lenses/tests/test_pagekite.aug b/plinth/modules/pagekite/data/usr/share/augeas/lenses/tests/test_pagekite.aug similarity index 100% rename from data/usr/share/augeas/lenses/tests/test_pagekite.aug rename to plinth/modules/pagekite/data/usr/share/augeas/lenses/tests/test_pagekite.aug diff --git a/data/usr/lib/firewalld/services/quassel-plinth.xml b/plinth/modules/quassel/data/usr/lib/firewalld/services/quassel-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/quassel-plinth.xml rename to plinth/modules/quassel/data/usr/lib/firewalld/services/quassel-plinth.xml diff --git a/data/etc/apache2/conf-available/radicale-plinth.conf b/plinth/modules/radicale/data/etc/apache2/conf-available/radicale-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/radicale-plinth.conf rename to plinth/modules/radicale/data/etc/apache2/conf-available/radicale-plinth.conf diff --git a/data/etc/apache2/conf-available/radicale2-freedombox.conf b/plinth/modules/radicale/data/etc/apache2/conf-available/radicale2-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/radicale2-freedombox.conf rename to plinth/modules/radicale/data/etc/apache2/conf-available/radicale2-freedombox.conf diff --git a/data/etc/apache2/conf-available/repro-plinth.conf b/plinth/modules/repro/data/etc/apache2/conf-available/repro-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/repro-plinth.conf rename to plinth/modules/repro/data/etc/apache2/conf-available/repro-plinth.conf diff --git a/data/usr/lib/firewalld/services/rtp-plinth.xml b/plinth/modules/repro/data/usr/lib/firewalld/services/rtp-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/rtp-plinth.xml rename to plinth/modules/repro/data/usr/lib/firewalld/services/rtp-plinth.xml diff --git a/data/etc/apache2/conf-available/searx-freedombox.conf b/plinth/modules/searx/data/etc/apache2/conf-available/searx-freedombox.conf similarity index 100% rename from data/etc/apache2/conf-available/searx-freedombox.conf rename to plinth/modules/searx/data/etc/apache2/conf-available/searx-freedombox.conf diff --git a/data/usr/share/pam-configs/access-freedombox b/plinth/modules/security/data/usr/share/pam-configs/access-freedombox similarity index 100% rename from data/usr/share/pam-configs/access-freedombox rename to plinth/modules/security/data/usr/share/pam-configs/access-freedombox diff --git a/data/usr/lib/firewalld/services/shadowsocks-local-plinth.xml b/plinth/modules/shadowsocks/data/usr/lib/firewalld/services/shadowsocks-local-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/shadowsocks-local-plinth.xml rename to plinth/modules/shadowsocks/data/usr/lib/firewalld/services/shadowsocks-local-plinth.xml diff --git a/data/etc/apache2/includes/freedombox-sharing.conf b/plinth/modules/sharing/data/etc/apache2/includes/freedombox-sharing.conf similarity index 100% rename from data/etc/apache2/includes/freedombox-sharing.conf rename to plinth/modules/sharing/data/etc/apache2/includes/freedombox-sharing.conf diff --git a/data/etc/avahi/services/sftp-ssh.service b/plinth/modules/ssh/data/etc/avahi/services/sftp-ssh.service similarity index 100% rename from data/etc/avahi/services/sftp-ssh.service rename to plinth/modules/ssh/data/etc/avahi/services/sftp-ssh.service diff --git a/data/etc/avahi/services/ssh.service b/plinth/modules/ssh/data/etc/avahi/services/ssh.service similarity index 100% rename from data/etc/avahi/services/ssh.service rename to plinth/modules/ssh/data/etc/avahi/services/ssh.service diff --git a/data/etc/fail2ban/jail.d/ssh-freedombox.conf b/plinth/modules/ssh/data/etc/fail2ban/jail.d/ssh-freedombox.conf similarity index 100% rename from data/etc/fail2ban/jail.d/ssh-freedombox.conf rename to plinth/modules/ssh/data/etc/fail2ban/jail.d/ssh-freedombox.conf diff --git a/data/etc/apache2/includes/freedombox-single-sign-on.conf b/plinth/modules/sso/data/etc/apache2/includes/freedombox-single-sign-on.conf similarity index 100% rename from data/etc/apache2/includes/freedombox-single-sign-on.conf rename to plinth/modules/sso/data/etc/apache2/includes/freedombox-single-sign-on.conf diff --git a/data/lib/systemd/system/freedombox-udiskie.service b/plinth/modules/storage/data/lib/systemd/system/freedombox-udiskie.service similarity index 100% rename from data/lib/systemd/system/freedombox-udiskie.service rename to plinth/modules/storage/data/lib/systemd/system/freedombox-udiskie.service diff --git a/data/etc/apache2/conf-available/syncthing-plinth.conf b/plinth/modules/syncthing/data/etc/apache2/conf-available/syncthing-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/syncthing-plinth.conf rename to plinth/modules/syncthing/data/etc/apache2/conf-available/syncthing-plinth.conf diff --git a/data/etc/apache2/conf-available/tahoe-plinth.conf b/plinth/modules/tahoe/data/etc/apache2/conf-available/tahoe-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/tahoe-plinth.conf rename to plinth/modules/tahoe/data/etc/apache2/conf-available/tahoe-plinth.conf diff --git a/data/usr/lib/firewalld/services/tahoe-plinth.xml b/plinth/modules/tahoe/data/usr/lib/firewalld/services/tahoe-plinth.xml similarity index 100% rename from data/usr/lib/firewalld/services/tahoe-plinth.xml rename to plinth/modules/tahoe/data/usr/lib/firewalld/services/tahoe-plinth.xml diff --git a/data/usr/share/augeas/lenses/tests/test_tor.aug b/plinth/modules/tor/data/usr/share/augeas/lenses/tests/test_tor.aug similarity index 100% rename from data/usr/share/augeas/lenses/tests/test_tor.aug rename to plinth/modules/tor/data/usr/share/augeas/lenses/tests/test_tor.aug diff --git a/data/usr/share/augeas/lenses/tor.aug b/plinth/modules/tor/data/usr/share/augeas/lenses/tor.aug similarity index 100% rename from data/usr/share/augeas/lenses/tor.aug rename to plinth/modules/tor/data/usr/share/augeas/lenses/tor.aug diff --git a/data/etc/apache2/conf-available/transmission-plinth.conf b/plinth/modules/transmission/data/etc/apache2/conf-available/transmission-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/transmission-plinth.conf rename to plinth/modules/transmission/data/etc/apache2/conf-available/transmission-plinth.conf diff --git a/data/etc/apache2/conf-available/tt-rss-plinth.conf b/plinth/modules/ttrss/data/etc/apache2/conf-available/tt-rss-plinth.conf similarity index 100% rename from data/etc/apache2/conf-available/tt-rss-plinth.conf rename to plinth/modules/ttrss/data/etc/apache2/conf-available/tt-rss-plinth.conf diff --git a/data/etc/apt/apt.conf.d/20freedombox b/plinth/modules/upgrades/data/etc/apt/apt.conf.d/20freedombox similarity index 100% rename from data/etc/apt/apt.conf.d/20freedombox rename to plinth/modules/upgrades/data/etc/apt/apt.conf.d/20freedombox diff --git a/data/etc/apt/apt.conf.d/60unattended-upgrades b/plinth/modules/upgrades/data/etc/apt/apt.conf.d/60unattended-upgrades similarity index 100% rename from data/etc/apt/apt.conf.d/60unattended-upgrades rename to plinth/modules/upgrades/data/etc/apt/apt.conf.d/60unattended-upgrades diff --git a/data/lib/systemd/system/freedombox-setup-repositories.service b/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.service similarity index 100% rename from data/lib/systemd/system/freedombox-setup-repositories.service rename to plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.service diff --git a/data/lib/systemd/system/freedombox-setup-repositories.timer b/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.timer similarity index 100% rename from data/lib/systemd/system/freedombox-setup-repositories.timer rename to plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.timer diff --git a/data/etc/apache2/includes/freedombox-auth-ldap.conf b/plinth/modules/users/data/etc/apache2/includes/freedombox-auth-ldap.conf similarity index 100% rename from data/etc/apache2/includes/freedombox-auth-ldap.conf rename to plinth/modules/users/data/etc/apache2/includes/freedombox-auth-ldap.conf diff --git a/data/usr/share/pam-configs/mkhomedir-freedombox b/plinth/modules/users/data/usr/share/pam-configs/mkhomedir-freedombox similarity index 100% rename from data/usr/share/pam-configs/mkhomedir-freedombox rename to plinth/modules/users/data/usr/share/pam-configs/mkhomedir-freedombox