trying to include systemd avalaible for Duniter with YuNoHost

rodinux · Feb 23, 2020 · e255d94 · e255d94
1 parent 44f80da
commit e255d94
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,6 @@ Be carefull when installing applications from the community list.
 ## Cesium
 Cesium is a wallet webapp. There is currently two ways to install it:
 - [With the YunoHost app](https://github.com/YunoHost-Apps/cesium_ynh)
-- With a Duniter plugin: `duniter plug git+https://github.com/duniter/duniter-ui-cesium.git`
 
 ## License
 This package and the Duniter software are under GNU AGPL v.3.
diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -11,30 +11,30 @@ location / {
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection "upgrade";
-       proxy_read_timeout 86400s; 
+       proxy_read_timeout 86400s;
        proxy_send_timeout 86400s;
 
-	location ~ \.(js|css|woff|woff2|ttf|png) {
-		proxy_pass http://localhost:9220;
-		access_by_lua_file /usr/share/ssowat/access.lua;
-	}
-
-	location /webui {
-		proxy_pass http://localhost:9220/;
-		access_by_lua_file /usr/share/ssowat/access.lua;
-		# Include SSOWAT user panel.
-		include conf.d/yunohost_panel.conf.inc;
-	}
+  location ~ \.(js|css|woff|woff2|ttf|png) {
+    proxy_pass http://localhost:9220;
+    access_by_lua_file /usr/share/ssowat/access.lua;
+  }
 
-	location ~ /webmin {
-		proxy_pass http://localhost:9220$uri;
-		access_by_lua_file /usr/share/ssowat/access.lua;
-	}
-
-	location ~ /modules {
-		proxy_pass http://localhost:9220;
-		access_by_lua_file /usr/share/ssowat/access.lua;
-	}
+  location /webui {
+    proxy_pass http://localhost:9220/;
+    access_by_lua_file /usr/share/ssowat/access.lua;
+    # Include SSOWAT user panel.
+    include conf.d/yunohost_panel.conf.inc;
+  }
+
+  location ~ /webmin {
+    proxy_pass http://localhost:9220$uri;
+    access_by_lua_file /usr/share/ssowat/access.lua;
+  }
+
+  location ~ /modules {
+    proxy_pass http://localhost:9220;
+    access_by_lua_file /usr/share/ssowat/access.lua;
+  }
 
         location /ws2p {
                 proxy_pass http://127.0.0.1:20901;

diff --git a/manifest.json b/manifest.json
@@ -34,12 +34,12 @@
             {
                 "name": "admin",
                 "type": "user",
-		"ask": {
-		    "en": "Administrator. Must a YunoHost user.",
-	            "fr": "Administrateur. Ce doit être un utilisateur YunoHost"
-		},
+        "ask": {
+            "en": "Administrator. Must a YunoHost user.",
+                "fr": "Administrateur. Ce doit être un utilisateur YunoHost"
+        },
                 "example": "jon doe"
-	    }
+        }
         ]
     }
-}
+}
diff --git a/scripts/functions.sh b/scripts/functions.sh
@@ -1,15 +1,15 @@
 #/bin/bash
 
 INSTALL_DUNITER_DEBIAN_PACKAGE () {
-	version="v1.6.25"
-	git_repo="https://git.duniter.org/nodes/typescript/duniter/"
+        version="v1.7.18"
 	if [ $arch == "x64" ]; then
-		middle_url="-/jobs/7062/artifacts/raw/work/bin/"
+		url_base="https://git.duniter.org/nodes/typescript/duniter/-/jobs/21913/artifacts/raw/work/bin/"
 	else
-		middle_url="uploads/722c2b2901e0c2a13ca3595eae4e696f/"
+		url_base="https://jytou.fr/duniter/"
 	fi
-	deb="duniter-server-$version-linux-$arch.deb"
-	url="${git_repo}${middle_url}${deb}"
+
+        deb="duniter-server-$version-linux-$arch.deb"
+	url="${url_base}${deb}"
 
 	# Retrieve debian package and install it
 	wget -nc --quiet $url -P /tmp
@@ -55,7 +55,7 @@ REMOVE_DUNITER () {
 	# Stop duniter daemon if running
 	duniter status
 	if [ `echo "$?"` == 0 ]; then
-	    service duniter stop
+	    duniter stop
 	fi
 
 	# Remove Duniter package

diff --git a/scripts/install b/scripts/install
@@ -30,10 +30,10 @@ ynh_user_exists $admin
 # Get CPU architecture and check it
 arch=$(uname -m)
 if [ $arch == "x86_64" ]; then
-	arch="x64"
+  arch="x64"
 fi
 if [[ $arch != "x64" && $arch != "armv7l" ]]; then
-	ynh_die "$arch is not supported." 2
+  ynh_die "$arch is not supported." 2
 fi
 
 # Store config on YunoHost instance

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -19,7 +19,7 @@ INSTALL_DUNITER_DEBIAN_PACKAGE
 INSTALL_SYSTEMD
 CONFIGURE_DUNITER
 
-# Start duniter service
+# Start duniter daemon
 service duniter start
 
 CONFIG_SSOWAT