diff --git a/doc/ADMIN.md b/doc/ADMIN.md index b3b4ccc..a2bf58d 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,4 +4,4 @@ 2. Obtain your cjdns IPv6 address by navigating to Tools -> Logs -> Click on "Install the 'cjdns' app." Your IPv6 address should be displayed in the log. 3. Reboot your YunoHost server to make the tun device available. Navigate to Tools->Shutdown and click Reboot. 4. Navigate to Tools -> Yunohost Settings -> Security, and under NGINX, disable "Force HTTPS." Click Save to apply the changes. -5. Finally edit `/etc/nginx/conf.d/[your-domain].conf`, add your cjdns-ipv6 to the list of `server_name`. +5. Finally edit `/etc/nginx/conf.d/__DOMAIN__.conf`, add your cjdns-ipv6 to the list of `server_name`. diff --git a/scripts/install b/scripts/install index bec5528..48f3e62 100755 --- a/scripts/install +++ b/scripts/install @@ -24,6 +24,7 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/cjdroute" # mv $install_dir/cjdroute $data_dir/cjdroute + #================================================= # CONFIGURING CJDNS #================================================= @@ -38,6 +39,7 @@ jq '.noBackground = 1' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.t # UPGRADE PEERS #================================================= ynh_script_progression --message="Getting cjdns peers..." --weight=1 + # Fetch the JSON data json=$(curl -s -A "ynh" https://vpn.anode.co/api/0.4/vpn/cjdns/peeringlines/) echo "Got peering lines" diff --git a/scripts/remove b/scripts/remove index f6ffecb..2b596c5 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d190780..11f7ddb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= - #================================================= # STOP SYSTEMD SERVICE #================================================= @@ -27,12 +21,9 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Installing latest version..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Installing latest version..." --weight=1 - ynh_setup_source --dest_dir="$install_dir" -fi +ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"