diff --git a/modules/installed/apps/__init__.py b/modules/apps/__init__.py similarity index 100% rename from modules/installed/apps/__init__.py rename to modules/apps/__init__.py diff --git a/modules/installed/apps/apps.py b/modules/apps/apps.py similarity index 100% rename from modules/installed/apps/apps.py rename to modules/apps/apps.py diff --git a/modules/installed/apps/templates/apps.html b/modules/apps/templates/apps.html similarity index 100% rename from modules/installed/apps/templates/apps.html rename to modules/apps/templates/apps.html diff --git a/modules/installed/config/__init__.py b/modules/config/__init__.py similarity index 100% rename from modules/installed/config/__init__.py rename to modules/config/__init__.py diff --git a/modules/installed/config/config.py b/modules/config/config.py similarity index 100% rename from modules/installed/config/config.py rename to modules/config/config.py diff --git a/modules/installed/config/templates/config.html b/modules/config/templates/config.html similarity index 100% rename from modules/installed/config/templates/config.html rename to modules/config/templates/config.html diff --git a/modules/installed/diagnostics/__init__.py b/modules/diagnostics/__init__.py similarity index 100% rename from modules/installed/diagnostics/__init__.py rename to modules/diagnostics/__init__.py diff --git a/modules/installed/diagnostics/diagnostics.py b/modules/diagnostics/diagnostics.py similarity index 100% rename from modules/installed/diagnostics/diagnostics.py rename to modules/diagnostics/diagnostics.py diff --git a/modules/installed/diagnostics/templates/diagnostics.html b/modules/diagnostics/templates/diagnostics.html similarity index 100% rename from modules/installed/diagnostics/templates/diagnostics.html rename to modules/diagnostics/templates/diagnostics.html diff --git a/modules/installed/diagnostics/templates/diagnostics_test.html b/modules/diagnostics/templates/diagnostics_test.html similarity index 100% rename from modules/installed/diagnostics/templates/diagnostics_test.html rename to modules/diagnostics/templates/diagnostics_test.html diff --git a/modules/enabled/apps b/modules/enabled/apps index 1e5ce6875..ee655a64d 120000 --- a/modules/enabled/apps +++ b/modules/enabled/apps @@ -1 +1 @@ -../installed/apps/ \ No newline at end of file +../apps/ \ No newline at end of file diff --git a/modules/enabled/config b/modules/enabled/config index 95f5d5d11..408852685 120000 --- a/modules/enabled/config +++ b/modules/enabled/config @@ -1 +1 @@ -../installed/config/ \ No newline at end of file +../config/ \ No newline at end of file diff --git a/modules/enabled/diagnostics b/modules/enabled/diagnostics index 7575508ad..44f76bee7 120000 --- a/modules/enabled/diagnostics +++ b/modules/enabled/diagnostics @@ -1 +1 @@ -../installed/diagnostics/ \ No newline at end of file +../diagnostics/ \ No newline at end of file diff --git a/modules/enabled/expert_mode b/modules/enabled/expert_mode index 899eb7ef1..0006eedc0 120000 --- a/modules/enabled/expert_mode +++ b/modules/enabled/expert_mode @@ -1 +1 @@ -../installed/expert_mode/ \ No newline at end of file +../expert_mode/ \ No newline at end of file diff --git a/modules/enabled/firewall b/modules/enabled/firewall index fa24d8415..ecb364d05 120000 --- a/modules/enabled/firewall +++ b/modules/enabled/firewall @@ -1 +1 @@ -../installed/firewall/ \ No newline at end of file +../firewall/ \ No newline at end of file diff --git a/modules/enabled/first_boot b/modules/enabled/first_boot index ffd4685cc..b977d6c94 120000 --- a/modules/enabled/first_boot +++ b/modules/enabled/first_boot @@ -1 +1 @@ -../installed/first_boot/ \ No newline at end of file +../first_boot/ \ No newline at end of file diff --git a/modules/enabled/help b/modules/enabled/help index 7f4f221a6..76c213eda 120000 --- a/modules/enabled/help +++ b/modules/enabled/help @@ -1 +1 @@ -../installed/help/ \ No newline at end of file +../help/ \ No newline at end of file diff --git a/modules/enabled/lib b/modules/enabled/lib index 7cd28ddb5..5bf80bf13 120000 --- a/modules/enabled/lib +++ b/modules/enabled/lib @@ -1 +1 @@ -../installed/lib/ \ No newline at end of file +../lib/ \ No newline at end of file diff --git a/modules/enabled/owncloud b/modules/enabled/owncloud index 63da55329..b9d942937 120000 --- a/modules/enabled/owncloud +++ b/modules/enabled/owncloud @@ -1 +1 @@ -../installed/owncloud/ \ No newline at end of file +../owncloud/ \ No newline at end of file diff --git a/modules/enabled/packages b/modules/enabled/packages index b6441c789..f314f73fa 120000 --- a/modules/enabled/packages +++ b/modules/enabled/packages @@ -1 +1 @@ -../installed/packages/ \ No newline at end of file +../packages/ \ No newline at end of file diff --git a/modules/enabled/pagekite b/modules/enabled/pagekite index e19e08de2..1c4c9c144 120000 --- a/modules/enabled/pagekite +++ b/modules/enabled/pagekite @@ -1 +1 @@ -../installed/pagekite/ \ No newline at end of file +../pagekite/ \ No newline at end of file diff --git a/modules/enabled/system b/modules/enabled/system index e47f3142b..16f8cc2b2 120000 --- a/modules/enabled/system +++ b/modules/enabled/system @@ -1 +1 @@ -../installed/system/ \ No newline at end of file +../system/ \ No newline at end of file diff --git a/modules/enabled/tor b/modules/enabled/tor index 62dc28af9..f7495e4ab 120000 --- a/modules/enabled/tor +++ b/modules/enabled/tor @@ -1 +1 @@ -../installed/tor/ \ No newline at end of file +../tor/ \ No newline at end of file diff --git a/modules/enabled/users b/modules/enabled/users index 8f8a47d96..db9284fbb 120000 --- a/modules/enabled/users +++ b/modules/enabled/users @@ -1 +1 @@ -../installed/users/ \ No newline at end of file +../users/ \ No newline at end of file diff --git a/modules/enabled/xmpp b/modules/enabled/xmpp index 726e67c0e..686474fe7 120000 --- a/modules/enabled/xmpp +++ b/modules/enabled/xmpp @@ -1 +1 @@ -../installed/xmpp/ \ No newline at end of file +../xmpp/ \ No newline at end of file diff --git a/modules/installed/expert_mode/__init__.py b/modules/expert_mode/__init__.py similarity index 100% rename from modules/installed/expert_mode/__init__.py rename to modules/expert_mode/__init__.py diff --git a/modules/installed/expert_mode/expert_mode.py b/modules/expert_mode/expert_mode.py similarity index 100% rename from modules/installed/expert_mode/expert_mode.py rename to modules/expert_mode/expert_mode.py diff --git a/modules/installed/expert_mode/templates/expert_mode.html b/modules/expert_mode/templates/expert_mode.html similarity index 100% rename from modules/installed/expert_mode/templates/expert_mode.html rename to modules/expert_mode/templates/expert_mode.html diff --git a/modules/installed/firewall/__init__.py b/modules/firewall/__init__.py similarity index 100% rename from modules/installed/firewall/__init__.py rename to modules/firewall/__init__.py diff --git a/modules/installed/firewall/firewall.py b/modules/firewall/firewall.py similarity index 100% rename from modules/installed/firewall/firewall.py rename to modules/firewall/firewall.py diff --git a/modules/installed/firewall/templates/firewall.html b/modules/firewall/templates/firewall.html similarity index 100% rename from modules/installed/firewall/templates/firewall.html rename to modules/firewall/templates/firewall.html diff --git a/modules/installed/first_boot/__init__.py b/modules/first_boot/__init__.py similarity index 100% rename from modules/installed/first_boot/__init__.py rename to modules/first_boot/__init__.py diff --git a/modules/installed/first_boot/first_boot.py b/modules/first_boot/first_boot.py similarity index 100% rename from modules/installed/first_boot/first_boot.py rename to modules/first_boot/first_boot.py diff --git a/modules/installed/first_boot/templates/firstboot_sidebar.html b/modules/first_boot/templates/firstboot_sidebar.html similarity index 100% rename from modules/installed/first_boot/templates/firstboot_sidebar.html rename to modules/first_boot/templates/firstboot_sidebar.html diff --git a/modules/installed/first_boot/templates/firstboot_state0.html b/modules/first_boot/templates/firstboot_state0.html similarity index 100% rename from modules/installed/first_boot/templates/firstboot_state0.html rename to modules/first_boot/templates/firstboot_state0.html diff --git a/modules/installed/first_boot/templates/firstboot_state1.html b/modules/first_boot/templates/firstboot_state1.html similarity index 100% rename from modules/installed/first_boot/templates/firstboot_state1.html rename to modules/first_boot/templates/firstboot_state1.html diff --git a/modules/installed/help/__init__.py b/modules/help/__init__.py similarity index 100% rename from modules/installed/help/__init__.py rename to modules/help/__init__.py diff --git a/modules/installed/help/help.py b/modules/help/help.py similarity index 100% rename from modules/installed/help/help.py rename to modules/help/help.py diff --git a/modules/installed/help/templates/about.html b/modules/help/templates/about.html similarity index 100% rename from modules/installed/help/templates/about.html rename to modules/help/templates/about.html diff --git a/modules/installed/help/templates/help.html b/modules/help/templates/help.html similarity index 100% rename from modules/installed/help/templates/help.html rename to modules/help/templates/help.html diff --git a/modules/installed/__init__.py b/modules/installed/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/modules/installed/lib/__init__.py b/modules/lib/__init__.py similarity index 100% rename from modules/installed/lib/__init__.py rename to modules/lib/__init__.py diff --git a/modules/installed/lib/auth.py b/modules/lib/auth.py similarity index 100% rename from modules/installed/lib/auth.py rename to modules/lib/auth.py diff --git a/modules/installed/lib/auth_page.py b/modules/lib/auth_page.py similarity index 100% rename from modules/installed/lib/auth_page.py rename to modules/lib/auth_page.py diff --git a/modules/installed/lib/user_store.py b/modules/lib/user_store.py similarity index 100% rename from modules/installed/lib/user_store.py rename to modules/lib/user_store.py diff --git a/modules/installed/owncloud/__init__.py b/modules/owncloud/__init__.py similarity index 100% rename from modules/installed/owncloud/__init__.py rename to modules/owncloud/__init__.py diff --git a/modules/installed/owncloud/owncloud.py b/modules/owncloud/owncloud.py similarity index 100% rename from modules/installed/owncloud/owncloud.py rename to modules/owncloud/owncloud.py diff --git a/modules/installed/owncloud/templates/owncloud.html b/modules/owncloud/templates/owncloud.html similarity index 100% rename from modules/installed/owncloud/templates/owncloud.html rename to modules/owncloud/templates/owncloud.html diff --git a/modules/installed/packages/__init__.py b/modules/packages/__init__.py similarity index 100% rename from modules/installed/packages/__init__.py rename to modules/packages/__init__.py diff --git a/modules/installed/packages/packages.py b/modules/packages/packages.py similarity index 100% rename from modules/installed/packages/packages.py rename to modules/packages/packages.py diff --git a/modules/installed/packages/templates/packages.html b/modules/packages/templates/packages.html similarity index 100% rename from modules/installed/packages/templates/packages.html rename to modules/packages/templates/packages.html diff --git a/modules/installed/pagekite/__init__.py b/modules/pagekite/__init__.py similarity index 100% rename from modules/installed/pagekite/__init__.py rename to modules/pagekite/__init__.py diff --git a/modules/installed/pagekite/pagekite.py b/modules/pagekite/pagekite.py similarity index 100% rename from modules/installed/pagekite/pagekite.py rename to modules/pagekite/pagekite.py diff --git a/modules/installed/pagekite/templates/pagekite_configure.html b/modules/pagekite/templates/pagekite_configure.html similarity index 100% rename from modules/installed/pagekite/templates/pagekite_configure.html rename to modules/pagekite/templates/pagekite_configure.html diff --git a/modules/installed/pagekite/templates/pagekite_introduction.html b/modules/pagekite/templates/pagekite_introduction.html similarity index 100% rename from modules/installed/pagekite/templates/pagekite_introduction.html rename to modules/pagekite/templates/pagekite_introduction.html diff --git a/modules/installed/santiago/__init__.py b/modules/santiago/__init__.py similarity index 100% rename from modules/installed/santiago/__init__.py rename to modules/santiago/__init__.py diff --git a/modules/installed/santiago/santiago.py b/modules/santiago/santiago.py similarity index 100% rename from modules/installed/santiago/santiago.py rename to modules/santiago/santiago.py diff --git a/modules/installed/system/__init__.py b/modules/system/__init__.py similarity index 100% rename from modules/installed/system/__init__.py rename to modules/system/__init__.py diff --git a/modules/installed/system/system.py b/modules/system/system.py similarity index 100% rename from modules/installed/system/system.py rename to modules/system/system.py diff --git a/modules/installed/system/templates/system.html b/modules/system/templates/system.html similarity index 100% rename from modules/installed/system/templates/system.html rename to modules/system/templates/system.html diff --git a/modules/installed/tor/__init__.py b/modules/tor/__init__.py similarity index 100% rename from modules/installed/tor/__init__.py rename to modules/tor/__init__.py diff --git a/modules/installed/tor/templates/tor.html b/modules/tor/templates/tor.html similarity index 100% rename from modules/installed/tor/templates/tor.html rename to modules/tor/templates/tor.html diff --git a/modules/installed/tor/tor.py b/modules/tor/tor.py similarity index 100% rename from modules/installed/tor/tor.py rename to modules/tor/tor.py diff --git a/modules/installed/users/__init__.py b/modules/users/__init__.py similarity index 100% rename from modules/installed/users/__init__.py rename to modules/users/__init__.py diff --git a/modules/installed/users/templates/users_add.html b/modules/users/templates/users_add.html similarity index 100% rename from modules/installed/users/templates/users_add.html rename to modules/users/templates/users_add.html diff --git a/modules/installed/users/templates/users_edit.html b/modules/users/templates/users_edit.html similarity index 100% rename from modules/installed/users/templates/users_edit.html rename to modules/users/templates/users_edit.html diff --git a/modules/installed/users/users.py b/modules/users/users.py similarity index 100% rename from modules/installed/users/users.py rename to modules/users/users.py diff --git a/modules/installed/xmpp/__init__.py b/modules/xmpp/__init__.py similarity index 100% rename from modules/installed/xmpp/__init__.py rename to modules/xmpp/__init__.py diff --git a/modules/installed/xmpp/templates/xmpp_configure.html b/modules/xmpp/templates/xmpp_configure.html similarity index 100% rename from modules/installed/xmpp/templates/xmpp_configure.html rename to modules/xmpp/templates/xmpp_configure.html diff --git a/modules/installed/xmpp/templates/xmpp_register.html b/modules/xmpp/templates/xmpp_register.html similarity index 100% rename from modules/installed/xmpp/templates/xmpp_register.html rename to modules/xmpp/templates/xmpp_register.html diff --git a/modules/installed/xmpp/xmpp.py b/modules/xmpp/xmpp.py similarity index 100% rename from modules/installed/xmpp/xmpp.py rename to modules/xmpp/xmpp.py diff --git a/plinth.py b/plinth.py index ee3dd1571..e3d8666a9 100755 --- a/plinth.py +++ b/plinth.py @@ -80,16 +80,15 @@ class Root(plugin_mount.PagePlugin): def load_modules(): """ Read names of enabled modules in modules/enabled directory and - import them from modules/installed directory. + import them from modules directory. """ for name in os.listdir('modules/enabled'): - cfg.log.info('Importing modules/installed/%s' % name) + cfg.log.info('Importing modules/%s' % name) try: - importlib.import_module( - 'modules.installed.{module}'.format(module=name)) + importlib.import_module('modules.{module}'.format(module=name)) except ImportError as exception: cfg.log.error( - 'Could not import modules/installed/{module}: {exception}' + 'Could not import modules/{module}: {exception}' .format(module=name, exception=exception)) @@ -100,8 +99,7 @@ def get_template_directories(): directories = set((core_directory,)) for name in os.listdir('modules/enabled'): - directories.add(os.path.join('modules', 'installed', name, - 'templates')) + directories.add(os.path.join('modules', name, 'templates')) cfg.log.info('Template directories - %s' % directories)