From 6fb03731bf0e3124a9bdb58fd84d5912cbb0699e Mon Sep 17 00:00:00 2001
From: Tagadda <36127788+Tagadda@users.noreply.github.com>
Date: Sat, 6 May 2023 23:36:48 +0000
Subject: [PATCH] wip

---
 check_process        | 24 ------------------------
 conf/systemd.service |  8 ++++----
 manifest.toml        |  7 +++++--
 scripts/restore      |  2 +-
 tests.toml           |  2 ++
 5 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 check_process

diff --git a/check_process b/check_process
deleted file mode 100644
index fc7f104..0000000
--- a/check_process
+++ /dev/null
@@ -1,24 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		admin="john"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0
-		setup_root=1
-		setup_nourl=0
-		setup_private=0
-		setup_public=0
-		upgrade=1
-		upgrade=1	from_commit=d4d938378a7b807264f82797cb297daebd1600f0
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=d4d938378a7b807264f82797cb297daebd1600f0
-		name=4.2.0~ynh1
-		manifest_arg=domain=domain.tld&admin=john&is_public=1&password=pass&extension_service_url=&extension_item_url=&enable_proposed_api=
diff --git a/conf/systemd.service b/conf/systemd.service
index df415ad..7b3da1d 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -4,12 +4,12 @@ After=network.target multi-user.target
 
 [Service]
 Type=simple
-User=__APP__
-Group=__APP__
-WorkingDirectory=__DATA_DIR__
+User=__ADMIN__
+Group=__ADMIN__
+WorkingDirectory=/home/__ADMIN__
 EnvironmentFile=__INSTALL_DIR__/code-server.env
 ExecStart=__INSTALL_DIR__/bin/code-server --config __INSTALL_DIR__/config.yaml
-StandardOutput=append:/var/log/__APP__/__APP__.log
+StandardOutput=append:/var/log/__APP__/__ADMIN__.log
 StandardError=inherit
 
 # Sandboxing options to harden security
diff --git a/manifest.toml b/manifest.toml
index 283f6d1..6011b74 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -22,15 +22,18 @@ architectures = ["amd64", "arm64", "armhf"]
 multi_instance = true
 ldap = false
 sso = false
-disk = "50M"
+disk = "500M"
 ram.build = "50M"
-ram.runtime = "50M"
+ram.runtime = "100M"
 
 [install]
     [install.domain]
     type = "domain"
     full_domain = true
 
+    [install.admin]
+    type = "user"
+
 [resources]
         [resources.sources.main]
         arm64.url = "https://github.com/coder/code-server/releases/download/v4.12.0/code-server-4.12.0-linux-arm64.tar.gz"
diff --git a/scripts/restore b/scripts/restore
index 1aea8c1..6255ba4 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -18,7 +18,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 ynh_restore_file --origin_path="$install_dir"
 
 chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$data_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # RESTORE THE DATA DIRECTORY
diff --git a/tests.toml b/tests.toml
index 96b1075..091af15 100644
--- a/tests.toml
+++ b/tests.toml
@@ -5,3 +5,5 @@ test_format = 1.0
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------
+
+    test_upgrade_from.d4d938378a7b807264f82797cb297daebd1600f0.name = "Upgrade from 4.2.0"
\ No newline at end of file