Spread files to proper application structure

usr/bin/vmmgr

@@ -0,0 +1,62 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+import argparse
+import sys
+from vmmgr import VMMgr
+
+parser = argparse.ArgumentParser(description='VM application manager')
+subparsers = parser.add_subparsers()
+
+parser_update_login = subparsers.add_parser('update-login')
+parser_update_login.set_defaults(action='update-login')
+parser_update_login.add_argument('app', help='Application name')
+parser_update_login.add_argument('login', help='Administrative login')
+parser_update_login.add_argument('password', help='Administrative password')
+
+parser_rebuild_issue = subparsers.add_parser('rebuild-issue')
+parser_rebuild_issue.set_defaults(action='rebuild-issue')
+
+parser_prepare_container = subparsers.add_parser('prepare-container')
+parser_prepare_container.add_argument('lxc', nargs=argparse.REMAINDER)
+parser_prepare_container.set_defaults(action='prepare-container')
+
+parser_register_container = subparsers.add_parser('register-container')
+parser_register_container.add_argument('lxc', nargs=argparse.REMAINDER)
+parser_register_container.set_defaults(action='register-container')
+
+parser_unregister_container = subparsers.add_parser('unregister-container')
+parser_unregister_container.add_argument('lxc', nargs=argparse.REMAINDER)
+parser_unregister_container.set_defaults(action='unregister-container')
+
+parser_register_proxy = subparsers.add_parser('register-proxy')
+parser_register_proxy.set_defaults(action='register-proxy')
+parser_register_proxy.add_argument('app', help='Application name')
+
+parser_unregister_proxy = subparsers.add_parser('unregister-proxy')
+parser_unregister_proxy.set_defaults(action='unregister-proxy')
+parser_unregister_proxy.add_argument('app', help='Application name')
+
+args = parser.parse_args()
+mgr = VMMgr()
+if args.action == 'update-login':
+    # Used by app install scripts
+    mgr.update_login(args.app, args.login, args.password)
+elif args.action == 'rebuild-issue':
+    # Used on VM startup
+    mgr.rebuild_issue()
+elif args.action == 'prepare-container':
+    # Used with LXC hooks
+    mgr.prepare_container()
+elif args.action == 'register-container':
+    # Used with LXC hooks
+    mgr.register_container()
+elif args.action == 'unregister-container':
+    # Used with LXC hooks
+    mgr.unregister_container()
+elif args.action == 'register-proxy':
+    # Used in init scripts
+    mgr.register_proxy(args.app)
+elif args.action == 'unregister-proxy':
+    # Used in init scripts
+    mgr.unregister_proxy(args.app)

usr/lib/python3.6/vmmgr/__init__.py

@@ -30,7 +30,7 @@ NGINX_TEMPLATE = '''server {{
 
     error_page 502 /502.html;
     location = /502.html {{
-        root /srv/vm/templates;
+        root /usr/share/vmmgr/templates;
     }}
 
     location = /vm-ping {{
@@ -65,12 +65,12 @@ server {{
     }}
 
     location /static {{
-        root /srv/vm;
+        root /usr/share/vmmgr;
     }}
 
     error_page 502 /502.html;
     location = /502.html {{
-        root /srv/vm/templates;
+        root /usr/share/vmmgr/templates;
     }}
 
     location = /vm-ping {{

usr/lib/python3.6/vmmgr/appmgr.py

@@ -18,7 +18,7 @@ from threading import Lock
 
 from . import tools
 
-PUB_FILE = '/srv/vm/packages.pub'
+PUB_FILE = '/etc/vmmgr/packages.pub'
 LXC_ROOT = '/var/lib/lxc'
 
 class ActionItem:

usr/lib/python3.6/vmmgr/config.py

@@ -3,7 +3,7 @@
 import json
 from threading import Lock
 
-CONF_FILE = '/srv/vm/config.json'
+CONF_FILE = '/etc/vmmgr/config.json'
 
 class Config:
     def __init__(self):

usr/lib/python3.6/vmmgr/wsgiapp.py

@@ -24,7 +24,7 @@ class WSGIApp(object):
         self.vmmgr = VMMgr()
         self.appmgr = AppMgr(self.vmmgr)
         self.conf = self.vmmgr.conf
-        self.jinja_env = Environment(loader=FileSystemLoader('/srv/vm/templates'), autoescape=True, lstrip_blocks=True, trim_blocks=True)
+        self.jinja_env = Environment(loader=FileSystemLoader('/usr/share/vmmgr/templates'), autoescape=True, lstrip_blocks=True, trim_blocks=True)
         self.jinja_env.globals.update(is_app_visible=self.is_app_visible)
         self.jinja_env.globals.update(is_service_autostarted=tools.is_service_autostarted)
         self.jinja_env.globals.update(is_service_started=tools.is_service_started)

usr/share/vmmgr/wsgi.py

@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import sys
-
+from vmmgr.wsgiapp import WSGIApp
-sys.path.append('/srv/vm')
-from mgr.wsgiapp import WSGIApp
 
 application = WSGIApp()