From 98d7ee352ca2f0df21a28f3a8fca772c03cfb9e9 Mon Sep 17 00:00:00 2001 From: whypsi Date: Thu, 27 Jul 2017 13:38:06 +0000 Subject: [PATCH] Sets zeronet --ui_host start parameter to value of yunohost domain the zeronet app is running on. Otherwise access would be denied with "invalid host forbidden". --- conf/systemd.service.template | 2 +- scripts/install | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service.template b/conf/systemd.service.template index eebd817..adc5765 100644 --- a/conf/systemd.service.template +++ b/conf/systemd.service.template @@ -4,7 +4,7 @@ After=network.target [Service] User=__USER__ -ExecStart=/usr/bin/python2 ./zeronet.py --ui_port __UI_PORT__ --data_dir __DATA_DIR__ --log_dir __LOG_DIR__ +ExecStart=/usr/bin/python2 ./zeronet.py --ui_port __UI_PORT__ --ui_host __UI_HOST__ --data_dir __DATA_DIR__ --log_dir __LOG_DIR__ WorkingDirectory=__WORKING_DIRECTORY__ ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/scripts/install b/scripts/install index 4c509a2..b627235 100755 --- a/scripts/install +++ b/scripts/install @@ -50,6 +50,7 @@ update_systemd_configuration() { local port=$6 local symlink_to_deploy_path=$7 local zeronet_dir=$8 + local ui_host=$9 # create zeronet user data location local data_dir=$zeronet_dir/data @@ -64,6 +65,7 @@ update_systemd_configuration() { sudo sed --in-place "s@__USER__@$user@g" $service_file sudo sed --in-place "s@__UI_PORT__@$port@g" $service_file + sudo sed --in-place "s@__UI_HOST__@$ui_host@g" $service_file sudo sed --in-place "s@__APP_NAME__@$app@g" $service_file sudo sed --in-place "s@__WORKING_DIRECTORY__@$symlink_to_deploy_path@g" $service_file sudo sed --in-place "s@__DATA_DIR__@$data_dir@g" $service_file @@ -142,7 +144,7 @@ main() { update_nginx_configuration $app $nginx_config_template $nginx_config_file $path $port update_systemd_configuration $app $systemd_service_template $systemd_service_name $systemd_service_file \ - $user $port $symlink_to_deploy_path $user_zeronet_dir + $user $port $symlink_to_deploy_path $user_zeronet_dir $domain } main