diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 92c1438..0000000 --- a/conf/app.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/souramoo/commentoplusplus/releases/download/v1.8.7/release.tar.gz -SOURCE_SUM=a9925f34b3c035571b14b0d2f351129d70b9d589b9832fcb09f7f0d56d6d92a1 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false diff --git a/manifest.toml b/manifest.toml index 63c9d68..f744872 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.commento.io/" code = "https://github.com/souramoo/commentoplusplus" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.15" architectures = ["amd64"] multi_instance = true ldap = false @@ -44,6 +44,13 @@ ram.runtime = "50M" type = "password" [resources] + [resources.sources] + + [resources.sources.main] + url = "https://github.com/souramoo/commentoplusplus/releases/download/v1.8.7/release.tar.gz" + sha256 = "a9925f34b3c035571b14b0d2f351129d70b9d589b9832fcb09f7f0d56d6d92a1" + in_subdir = false + [resources.ports] [resources.system_user] diff --git a/scripts/install b/scripts/install index 2207465..fc82029 100755 --- a/scripts/install +++ b/scripts/install @@ -29,18 +29,22 @@ ynh_script_progression --message="Setting up source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config +# Create a dedicated systemd config +ynh_add_systemd_config + +yunohost service add $app --description="Privacy-focused commenting platform" --log="/var/log/$app/$app.log" + #================================================= # ADD A CONFIGURATION #================================================= @@ -51,21 +55,6 @@ ynh_add_config --template="../conf/.env" --destination="$install_dir/commento.en chmod 400 "$install_dir/commento.env" chown $app:$app "$install_dir/commento.env" -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 - -# Create a dedicated systemd config -ynh_add_systemd_config - -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="Privacy-focused commenting platform" --log="/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #=================================================