Kaynağa Gözat

ROUTE_PREFIX for easier proxying

boyska 6 yıl önce
ebeveyn
işleme
1e4a5fc791

+ 1 - 0
larigira/config.py

@@ -19,6 +19,7 @@ def get_conf(prefix='LARIGIRA_'):
     conf['CACHING_TIME'] = 10
     conf['DB_URI'] = os.path.join(conf_dir, 'db.json')
     conf['SCRIPTS_PATH'] = os.path.join(conf_dir, 'scripts')
+    conf['ROUTE_PREFIX'] = ''
     conf['BOOTSTRAP_SERVE_LOCAL'] = True
     conf['SECRET_KEY'] = 'Please replace me!'
     conf['MPD_WAIT_START'] = True

+ 6 - 2
larigira/dbadmin/__init__.py

@@ -17,7 +17,9 @@ from larigira.timegen import get_timegenerator, timegenerate
 from larigira import forms
 from larigira.config import get_conf
 from .suggestions import get_suggestions
-db = Blueprint('db', __name__, url_prefix='/db', template_folder='templates')
+db = Blueprint('db', __name__,
+               url_prefix=get_conf()['ROUTE_PREFIX'] + '/db',
+               template_folder='templates')
 
 
 def get_model():
@@ -172,7 +174,9 @@ def edit_event(alarmid):
     actions = tuple(model.get_actions_by_alarm(alarm))
     return render_template('edit_event.html',
                            alarm=alarm, all_actions=allactions,
-                           actions=actions)
+                           actions=actions,
+                           routeprefix=get_conf()['ROUTE_PREFIX']
+                          )
 
 
 @db.route('/api/alarm/<alarmid>/actions', methods=['POST'])

+ 1 - 1
larigira/dbadmin/templates/edit_event.html

@@ -31,7 +31,7 @@ $(function() {
 			return $(li).data('id');
 		});
 		jQuery.post(
-			'/db/api/alarm/' + my_id + '/actions',
+			'{{routeprefix}}/db/api/alarm/' + my_id + '/actions',
 			{"actions[]": ids.toArray()}
 			);
 	});

+ 4 - 2
larigira/rpc.py

@@ -11,8 +11,10 @@ from werkzeug.contrib.cache import SimpleCache
 from .dbadmin import db
 from .config import get_conf
 
-rpc = Blueprint('rpc', __name__, url_prefix='/api')
-viewui = Blueprint('view', __name__, url_prefix='/view',
+rpc = Blueprint('rpc', __name__,
+                url_prefix=get_conf()['ROUTE_PREFIX'] + '/api')
+viewui = Blueprint('view', __name__,
+                   url_prefix=get_conf()['ROUTE_PREFIX'] + '/view',
                    template_folder='templates')