Move all modules from 'modules/installed' to 'modules' directory

2026-05-13 10:30:16 +00:00 · 2014-06-06 12:14:17 +05:30 · 2014-06-06 12:14:17 +05:30 · 37206f1e83
commit 37206f1e83
parent 912c5022ca
72 changed files with 20 additions and 22 deletions
--- a/modules/installed/apps/init.py
+++ b/modules/installed/apps/init.py
--- a/modules/installed/apps/apps.py
+++ b/modules/installed/apps/apps.py
--- a/modules/installed/apps/templates/apps.html
+++ b/modules/installed/apps/templates/apps.html
--- a/modules/installed/config/init.py
+++ b/modules/installed/config/init.py
--- a/modules/installed/config/config.py
+++ b/modules/installed/config/config.py
--- a/modules/installed/config/templates/config.html
+++ b/modules/installed/config/templates/config.html
--- a/modules/installed/diagnostics/init.py
+++ b/modules/installed/diagnostics/init.py
--- a/modules/installed/diagnostics/diagnostics.py
+++ b/modules/installed/diagnostics/diagnostics.py
--- a/modules/installed/diagnostics/templates/diagnostics.html
+++ b/modules/installed/diagnostics/templates/diagnostics.html
--- a/modules/installed/diagnostics/templates/diagnostics_test.html
+++ b/modules/installed/diagnostics/templates/diagnostics_test.html
--- a/modules/enabled/apps
+++ b/modules/enabled/apps
@ -1 +1 @@
-../installed/apps/
+../apps/
--- a/modules/enabled/config
+++ b/modules/enabled/config
@ -1 +1 @@
-../installed/config/
+../config/
--- a/modules/enabled/diagnostics
+++ b/modules/enabled/diagnostics
@ -1 +1 @@
-../installed/diagnostics/
+../diagnostics/
--- a/modules/enabled/expert_mode
+++ b/modules/enabled/expert_mode
@ -1 +1 @@
-../installed/expert_mode/
+../expert_mode/
--- a/modules/enabled/firewall
+++ b/modules/enabled/firewall
@ -1 +1 @@
-../installed/firewall/
+../firewall/
--- a/modules/enabled/first_boot
+++ b/modules/enabled/first_boot
@ -1 +1 @@
-../installed/first_boot/
+../first_boot/
--- a/modules/enabled/help
+++ b/modules/enabled/help
@ -1 +1 @@
-../installed/help/
+../help/
--- a/modules/enabled/lib
+++ b/modules/enabled/lib
@ -1 +1 @@
-../installed/lib/
+../lib/
--- a/modules/enabled/owncloud
+++ b/modules/enabled/owncloud
@ -1 +1 @@
-../installed/owncloud/
+../owncloud/
--- a/modules/enabled/packages
+++ b/modules/enabled/packages
@ -1 +1 @@
-../installed/packages/
+../packages/
--- a/modules/enabled/pagekite
+++ b/modules/enabled/pagekite
@ -1 +1 @@
-../installed/pagekite/
+../pagekite/
--- a/modules/enabled/system
+++ b/modules/enabled/system
@ -1 +1 @@
-../installed/system/
+../system/
--- a/modules/enabled/tor
+++ b/modules/enabled/tor
@ -1 +1 @@
-../installed/tor/
+../tor/
--- a/modules/enabled/users
+++ b/modules/enabled/users
@ -1 +1 @@
-../installed/users/
+../users/
--- a/modules/enabled/xmpp
+++ b/modules/enabled/xmpp
@ -1 +1 @@
-../installed/xmpp/
+../xmpp/
--- a/modules/installed/expert_mode/init.py
+++ b/modules/installed/expert_mode/init.py
--- a/modules/installed/expert_mode/expert_mode.py
+++ b/modules/installed/expert_mode/expert_mode.py
--- a/modules/installed/expert_mode/templates/expert_mode.html
+++ b/modules/installed/expert_mode/templates/expert_mode.html
--- a/modules/installed/firewall/init.py
+++ b/modules/installed/firewall/init.py
--- a/modules/installed/firewall/firewall.py
+++ b/modules/installed/firewall/firewall.py
--- a/modules/installed/firewall/templates/firewall.html
+++ b/modules/installed/firewall/templates/firewall.html
--- a/modules/installed/first_boot/init.py
+++ b/modules/installed/first_boot/init.py
--- a/modules/installed/first_boot/first_boot.py
+++ b/modules/installed/first_boot/first_boot.py
--- a/modules/installed/first_boot/templates/firstboot_sidebar.html
+++ b/modules/installed/first_boot/templates/firstboot_sidebar.html
--- a/modules/installed/first_boot/templates/firstboot_state0.html
+++ b/modules/installed/first_boot/templates/firstboot_state0.html
--- a/modules/installed/first_boot/templates/firstboot_state1.html
+++ b/modules/installed/first_boot/templates/firstboot_state1.html
--- a/modules/installed/help/init.py
+++ b/modules/installed/help/init.py
--- a/modules/installed/help/help.py
+++ b/modules/installed/help/help.py
--- a/modules/installed/help/templates/about.html
+++ b/modules/installed/help/templates/about.html
--- a/modules/installed/help/templates/help.html
+++ b/modules/installed/help/templates/help.html
--- a/modules/installed/init.py
+++ b/modules/installed/init.py
--- a/modules/installed/lib/init.py
+++ b/modules/installed/lib/init.py
--- a/modules/installed/lib/auth.py
+++ b/modules/installed/lib/auth.py
--- a/modules/installed/lib/auth_page.py
+++ b/modules/installed/lib/auth_page.py
--- a/modules/installed/lib/user_store.py
+++ b/modules/installed/lib/user_store.py
--- a/modules/installed/owncloud/init.py
+++ b/modules/installed/owncloud/init.py
--- a/modules/installed/owncloud/owncloud.py
+++ b/modules/installed/owncloud/owncloud.py
--- a/modules/installed/owncloud/templates/owncloud.html
+++ b/modules/installed/owncloud/templates/owncloud.html
--- a/modules/installed/packages/init.py
+++ b/modules/installed/packages/init.py
--- a/modules/installed/packages/packages.py
+++ b/modules/installed/packages/packages.py
--- a/modules/installed/packages/templates/packages.html
+++ b/modules/installed/packages/templates/packages.html
--- a/modules/installed/pagekite/init.py
+++ b/modules/installed/pagekite/init.py
--- a/modules/installed/pagekite/pagekite.py
+++ b/modules/installed/pagekite/pagekite.py
--- a/modules/installed/pagekite/templates/pagekite_configure.html
+++ b/modules/installed/pagekite/templates/pagekite_configure.html
--- a/modules/installed/pagekite/templates/pagekite_introduction.html
+++ b/modules/installed/pagekite/templates/pagekite_introduction.html
--- a/modules/installed/santiago/init.py
+++ b/modules/installed/santiago/init.py
--- a/modules/installed/santiago/santiago.py
+++ b/modules/installed/santiago/santiago.py
--- a/modules/installed/system/init.py
+++ b/modules/installed/system/init.py
--- a/modules/installed/system/system.py
+++ b/modules/installed/system/system.py
--- a/modules/installed/system/templates/system.html
+++ b/modules/installed/system/templates/system.html
--- a/modules/installed/tor/init.py
+++ b/modules/installed/tor/init.py
--- a/modules/installed/tor/templates/tor.html
+++ b/modules/installed/tor/templates/tor.html
--- a/modules/installed/tor/tor.py
+++ b/modules/installed/tor/tor.py
--- a/modules/installed/users/init.py
+++ b/modules/installed/users/init.py
--- a/modules/installed/users/templates/users_add.html
+++ b/modules/installed/users/templates/users_add.html
--- a/modules/installed/users/templates/users_edit.html
+++ b/modules/installed/users/templates/users_edit.html
--- a/modules/installed/users/users.py
+++ b/modules/installed/users/users.py
--- a/modules/installed/xmpp/init.py
+++ b/modules/installed/xmpp/init.py
--- a/modules/installed/xmpp/templates/xmpp_configure.html
+++ b/modules/installed/xmpp/templates/xmpp_configure.html
--- a/modules/installed/xmpp/templates/xmpp_register.html
+++ b/modules/installed/xmpp/templates/xmpp_register.html
--- a/modules/installed/xmpp/xmpp.py
+++ b/modules/installed/xmpp/xmpp.py
--- 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(
+            importlib.import_module('modules.{module}'.format(module=name))
                'modules.installed.{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,
+        directories.add(os.path.join('modules', name, 'templates'))
                                     'templates'))
    cfg.log.info('Template directories - %s' % directories)