diff --git a/bin/docklet-master b/bin/docklet-master index 794a4e7..89c223e 100755 --- a/bin/docklet-master +++ b/bin/docklet-master @@ -107,7 +107,6 @@ pre_start_master () { } do_start_master () { - pre_start_master DAEMON_OPTS_MASTER=$1 @@ -194,11 +193,13 @@ do_stop_user () { case "$1" in init) + pre_start_master do_start_master "new" do_start_proxy do_start_web ;; start) + pre_start_master do_start_master "recovery" do_start_proxy do_start_web @@ -214,6 +215,7 @@ case "$1" in do_stop_master do_stop_proxy do_stop_web + pre_start_master do_start_master "recovery" do_start_proxy do_start_web @@ -234,6 +236,7 @@ case "$1" in reinit) do_stop_master do_stop_proxy + pre_start_master do_start_master "new" do_start_proxy ;; diff --git a/bin/docklet-supermaster b/bin/docklet-supermaster index 570713d..629239e 100755 --- a/bin/docklet-supermaster +++ b/bin/docklet-supermaster @@ -107,7 +107,6 @@ pre_start_master () { } do_start_master () { - pre_start_master DAEMON_OPTS_MASTER=$1 @@ -159,6 +158,7 @@ do_start_web () { } do_start_user () { + log_daemon_msg "Starting $DAEMON_NAME_USER in $FS_PREFIX" DAEMON_OPTS_USER="-p $USER_PORT" @@ -198,12 +198,14 @@ do_stop_user () { case "$1" in init) + pre_start_master do_start_user do_start_proxy do_start_web do_start_master "new" ;; start) + pre_start_master do_start_user do_start_proxy do_start_web @@ -222,6 +224,7 @@ case "$1" in do_stop_web do_stop_proxy do_stop_master + pre_start_master do_start_user do_start_proxy do_start_web @@ -249,6 +252,7 @@ case "$1" in do_stop_proxy do_stop_master do_stop_user + pre_start_master do_start_user do_start_proxy do_start_web diff --git a/web/templates/base_AdminLTE.html b/web/templates/base_AdminLTE.html index a1973af..3c7a9e2 100644 --- a/web/templates/base_AdminLTE.html +++ b/web/templates/base_AdminLTE.html @@ -223,7 +223,7 @@ Docklet {{ version }} - Copyright© 2016 UniAS@ SEI, PKU + Copyright© 2017 UniAS@ SEI, PKU diff --git a/web/web.py b/web/web.py index 5d59e14..d364e8f 100755 --- a/web/web.py +++ b/web/web.py @@ -112,7 +112,7 @@ def dashboard(): @app.route("/document/", methods=['GET']) def redirect_dochome(): - return redirect("http://docklet.unias.org/userguide") + return redirect("http://unias.github.io/docklet/userguide") @app.route("/config/", methods=['GET']) @login_required