diff --git a/conf/systemd.service b/conf/systemd.service index c4357c4..d601c76 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,6 +7,7 @@ User=root Group=root WorkingDirectory=__INSTALL_DIR__/ ExecStart=/bin/bash -c '__INSTALL_DIR__/cjdroute < __INSTALL_DIR__/cjdroute.conf' +ExecStartPost=/bin/bash -c 'sleep 3 && __INSTALL_DIR__/cjdns-proxy-server &' KillMode=process Restart=no diff --git a/doc/ADMIN.md b/doc/ADMIN.md deleted file mode 100644 index a2bf58d..0000000 --- a/doc/ADMIN.md +++ /dev/null @@ -1,7 +0,0 @@ -# Setup your website on cjdns network - -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. -5. Finally edit `/etc/nginx/conf.d/__DOMAIN__.conf`, add your cjdns-ipv6 to the list of `server_name`. diff --git a/manifest.toml b/manifest.toml index b614583..8fa6f13 100644 --- a/manifest.toml +++ b/manifest.toml @@ -32,10 +32,10 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - amd64.url = "https://github.com/dkoukoul/cjdns/releases/download/v22-7/cjdroute_debian11_x86_64.tar.gz" - amd64.sha256 = "32948ed786abd02d49c86ff614df5a49e629b14a7495ac96b641baddcd57945b" - arm64.url = "https://github.com/dkoukoul/cjdns/releases/download/v22-7/cjdroute_linux_arm64.tar.gz" - arm64.sha256 = "8c391e024cc9094f0ec23ac325c2115013757da34fe730d46fc17436cf4773da" + amd64.url = "https://github.com/dkoukoul/cjdns/releases/download/v22-7/cjdns_ynh_x86_64.tar.gz" + amd64.sha256 = "ec4cea5226b8896c61d6db1736718f2f57a9f5e1303e3c3a1ca7cea445e14370" + arm64.url = "https://github.com/dkoukoul/cjdns/releases/download/v22-7/cjdns_ynh_linux_arm64.tar.gz" + arm64.sha256 = "a9cfece03bd3f4b163f46140cb2bd513a4dac826d7a038c3b87636fd0ac8e19e" in_subdir = false [resources.system_user] diff --git a/scripts/install b/scripts/install index 97acc49..897b50a 100755 --- a/scripts/install +++ b/scripts/install @@ -31,6 +31,7 @@ ynh_script_progression --message="Configuring $app..." --weight=1 $install_dir/cjdroute --genconf | $install_dir/cjdroute --cleanconf > $install_dir/cjdroute.conf jq '.security[0].setuser = 0' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.tmp && mv $install_dir/cjdroute.conf.tmp $install_dir/cjdroute.conf +jq '.security[0].seccomp = 0' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.tmp && mv $install_dir/cjdroute.conf.tmp $install_dir/cjdroute.conf jq '.noBackground = 1' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.tmp && mv $install_dir/cjdroute.conf.tmp $install_dir/cjdroute.conf #=================================================