1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/zeronet_ynh.git synced 2024-09-03 17:46:12 +02:00

Merge branch 'mkody-master'

This commit is contained in:
whypsi 2017-07-27 14:02:06 +00:00
commit 710dfb9303
5 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,3 @@
SOURCE_URL=https://github.com/HelloZeroNet/ZeroNet/archive/v0.5.2.tar.gz SOURCE_URL=https://github.com/HelloZeroNet/ZeroNet/archive/v0.5.6.tar.gz
SOURCE_SUM=cb17031cf0bbf2834ffbae70ec65f436aa83b020a5654054106da104a673a242 SOURCE_SUM=aa3fccf45747c090fe3430593fae4135e5f520e556e260bcc7fd919f6adb1951
SOURCE_VERSION=0.5.2 SOURCE_VERSION=0.5.6

View file

@ -4,7 +4,7 @@ After=network.target
[Service] [Service]
User=__USER__ 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__ WorkingDirectory=__WORKING_DIRECTORY__
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillMode=process KillMode=process

View file

@ -8,7 +8,7 @@
}, },
"url": "https://zeronet.io", "url": "https://zeronet.io",
"license": "free", "license": "free",
"version": "0.5.2", "version": "0.5.6",
"maintainer": { "maintainer": {
"name": "whypsi", "name": "whypsi",
"email": "whypsi@riseup.net" "email": "whypsi@riseup.net"

View file

@ -57,6 +57,7 @@ obtain_and_deploy_source() {
check_file_integrity $src_file $src_checksum check_file_integrity $src_file $src_checksum
extract_archive $src_file $deploy_path extract_archive $src_file $deploy_path
sudo rm -f $symlink_to_deploy_path
sudo ln --symbolic --force $deploy_path $symlink_to_deploy_path sudo ln --symbolic --force $deploy_path $symlink_to_deploy_path
sudo chown $user: -LR $symlink_to_deploy_path sudo chown $user: -LR $symlink_to_deploy_path

View file

@ -50,6 +50,7 @@ update_systemd_configuration() {
local port=$6 local port=$6
local symlink_to_deploy_path=$7 local symlink_to_deploy_path=$7
local zeronet_dir=$8 local zeronet_dir=$8
local ui_host=$9
# create zeronet user data location # create zeronet user data location
local data_dir=$zeronet_dir/data 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@__USER__@$user@g" $service_file
sudo sed --in-place "s@__UI_PORT__@$port@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@__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@__WORKING_DIRECTORY__@$symlink_to_deploy_path@g" $service_file
sudo sed --in-place "s@__DATA_DIR__@$data_dir@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_nginx_configuration $app $nginx_config_template $nginx_config_file $path $port
update_systemd_configuration $app $systemd_service_template $systemd_service_name $systemd_service_file \ 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 main