diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/local/rz-mux/rz-mux-tool.py | 1 | ||||
| -rw-r--r-- | src/server/rz_server.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/local/rz-mux/rz-mux-tool.py b/src/local/rz-mux/rz-mux-tool.py index 18e2cf44..802d0d02 100644 --- a/src/local/rz-mux/rz-mux-tool.py +++ b/src/local/rz-mux/rz-mux-tool.py @@ -84,6 +84,7 @@ def gen_dom_config__rhizi(domain_fqdn, port_map): 'rz_port__http': port_map.rz_port__http, 'rz_server_secret': rz_server_secret, 'user_db_path': user_db_path, + 'template_d_path': '/srv/www/rhizi/mux-root.d/%s/webapp/fragment.d/template.d' % (domain_fqdn), }), Template_Task(os.path.join(rz_template_path_prefix, 'rhizi.init.jinja'), os.path.join(install_prefix, 'etc/init.d/', 'rhizi__%s' % (domain_fqdn)), diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 0ddad61c..756eb1d9 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -40,6 +40,7 @@ class Config(object): neo4j_url root_path: root path from which the server will serve content user_db_path: absolute path to a Berkeley DB file used to store user accounts & password hash values + template.d_path: absolute path to the jinja HTML template dir """ @staticmethod @@ -49,6 +50,7 @@ class Config(object): cfg['development_mode'] = False cfg['root_path'] = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) + cfg['template.d_path'] = os.path.join(cfg['root_path'], 'template.d') cfg['user_db_path'] = './user_db.db' @@ -412,7 +414,7 @@ def init_webapp(cfg, kernel): # webapp = FlaskExt(__name__, static_folder='static', - template_folder=os.path.join(root_path, 'templates'), + template_folder=cfg.template_folder, static_url_path=cfg.static_url_path) webapp.config.from_object(cfg) webapp.root_path = root_path # for some reason calling config.from_xxx() does not have effect |