From b788a789725a894105f73d54b05956f88f690b4b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Thu, 28 Dec 2023 01:28:36 +0100 Subject: [PATCH 1/7] Rename Admin.md to ADMIN.md --- doc/{Admin.md => ADMIN.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{Admin.md => ADMIN.md} (100%) diff --git a/doc/Admin.md b/doc/ADMIN.md similarity index 100% rename from doc/Admin.md rename to doc/ADMIN.md From 3637f4d48419965df5fa5f6e9ed3791f079e0019 Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Fri, 29 Dec 2023 12:35:32 +0200 Subject: [PATCH 2/7] edit ssowat --- scripts/install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index 0ed4ee2..6062354 100755 --- a/scripts/install +++ b/scripts/install @@ -97,6 +97,12 @@ ynh_script_progression --message="Launching cjdns service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +#================================================= +# MAKE WORDPRESS AVAILABLE ON CJDNS +#================================================= + +yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" + #================================================= # END OF SCRIPT #================================================= From 3eb53e258dc646ca500cb3ac538c8ad1cc41bf0c Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Fri, 29 Dec 2023 12:36:31 +0200 Subject: [PATCH 3/7] remove ssowat edit --- doc/Admin.md | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/doc/Admin.md b/doc/Admin.md index a710f17..123c31b 100644 --- a/doc/Admin.md +++ b/doc/Admin.md @@ -4,24 +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. Edit `/etc/nginx/conf.d/[your-domain].conf`, add your cjdns-ipv6 to the list of `server_name`. -6. Finally, to allow public access for cjdns requests to your new wordpress site you can do the following: - 1. SSH into your yunoHost server - 2. Copy current sso configuration file to persistent: `cp /etc/ssowat/conf.json /etc/ssowat/conf.json.persistent` - 3. Then edit the persistent file: `nano /etc/ssowat/conf.json.persistent` - 4. Change `public` to `true` and add this line under the `wordpress.main uris` section: `"re:^.fc.*"`. Remember to add a trailing “,” to the above entry. For example: - -```json -"wordpress.main": { - "auth_header": true, - "label": "WordPress", - "public": true, - "show_tile": true, - "uris": [ - "example.nohost.me/blog", - "re:^.fc.*" - ], - "use_remote_user_var_in_nginx_conf": false, - "users": [] -} -`````` +5. Finally edit `/etc/nginx/conf.d/[your-domain].conf`, add your cjdns-ipv6 to the list of `server_name`. From 2a529b741a57695c9046bbfbce23551286f22adb Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Fri, 29 Dec 2023 12:43:07 +0200 Subject: [PATCH 4/7] after wordpress --- doc/Admin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Admin.md b/doc/Admin.md index 123c31b..b3b4ccc 100644 --- a/doc/Admin.md +++ b/doc/Admin.md @@ -1,6 +1,6 @@ # Setup your website on cjdns network -1. In the Applications menu, search for "cjdns" and install it. +1. From the Applications menu, first install wordpress and then "cjdns". 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. From bc14245217af66f21075d3b49690d82dab6fccac Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Wed, 10 Jan 2024 10:17:49 +0200 Subject: [PATCH 5/7] rename admin, update curl --- doc/{Admin.md => ADMIN.md} | 0 scripts/install | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename doc/{Admin.md => ADMIN.md} (100%) diff --git a/doc/Admin.md b/doc/ADMIN.md similarity index 100% rename from doc/Admin.md rename to doc/ADMIN.md diff --git a/scripts/install b/scripts/install index f75ccee..3aecd93 100755 --- a/scripts/install +++ b/scripts/install @@ -39,7 +39,7 @@ jq '.noBackground = 1' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.t #================================================= ynh_script_progression --message="Getting cjdns peers..." --weight=1 # Fetch the JSON data -json=$(curl -s https://vpn.anode.co/api/0.3/vpn/cjdns/peeringlines/) +json=$(curl -s -A "ynh" https://vpn.anode.co/api/0.4/vpn/cjdns/peeringlines/) echo "Got peering lines" length=$(echo $json | jq '. | length') From d285048c9df674cfe0f1d94801364de621d350e8 Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Fri, 23 Feb 2024 11:48:41 +0200 Subject: [PATCH 6/7] update linux cjdroute build --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4687299..3bb771d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -33,7 +33,7 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] amd64.url = "https://github.com/dkoukoul/cjdns/releases/download/v22-7/cjdroute_linux_x86_64.tar.gz" - amd64.sha256 = "7385b98a3f7874a1fea14a6afeb9019d3595269b5c3282cb4dea35fc3b4a47ac" + amd64.sha256 = "68c4d536d907e33532f13277915f5312a19105056d407f5c04f1360d01559323" arm64.url = "https://github.com/dkoukoul/cjdns/releases/download/v22-7/cjdroute_linux_arm64.tar.gz" arm64.sha256 = "8c391e024cc9094f0ec23ac325c2115013757da34fe730d46fc17436cf4773da" From 51e23ec9885714edc0d8150c06e5cd85b7e5f725 Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Fri, 23 Feb 2024 11:52:47 +0200 Subject: [PATCH 7/7] remove duplicate --- scripts/install | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/install b/scripts/install index 3aecd93..bec5528 100755 --- a/scripts/install +++ b/scripts/install @@ -96,11 +96,6 @@ ynh_script_progression --message="Launching cjdns service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# MAKE WORDPRESS AVAILABLE ON CJDNS -#================================================= - -yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" #================================================= # MAKE WORDPRESS AVAILABLE ON CJDNS