swicth from deb repository to app.src

README.md

@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
 
-**Shipped version:** 1.0
+**Shipped version:** 1.1.1
 
 ## Screenshots
 

conf/app.src

@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-amd64-v1.1.1.tar.gz
+SOURCE_SUM=33554cdc9c6ed4f540cca234c10c046b40d036e24730eebe95e9cffa1c3dd61e
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=

conf/config.xml

@@ -0,0 +1,9 @@
+<configuration version="28">
+    <folder id="default" label="Default Folder" path="__SYNC_HOME__" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
+    </folder>
+    <gui enabled="true" tls="false" debugging="false">
+        <address>127.0.0.1:__GUI_PORT__</address>
+    </gui>
+    <ldap></ldap>
+    <options></options>
+</configuration>

conf/systemd.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=Syncthing - Open Source Continuous File Synchronization for %I
+Documentation=man:syncthing(1)
+After=multi-user.target network.target
+
+[Service]
+User=__APP__
+ExecStart=__FINALPATH__/syncthing -no-browser -no-restart -logflags=0
+Restart=on-failure
+SuccessExitStatus=3 4
+RestartForceExitStatus=3 4
+
+# Hardening
+ProtectSystem=full
+PrivateTmp=true
+SystemCallArchitectures=native
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target

manifest.json

@@ -6,6 +6,7 @@
         "en": "Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized.",
         "fr": "Syncthing remplace les services propriétaires de synchro et de cloud avec quelque chose d'ouvert, digne de confiance et décentralisée."
     },
+    "version": "1.1.1~ynh1",
     "url": "https://syncthing.net/",
     "license": "MPL-2.0",
     "maintainer": {
@@ -15,7 +16,7 @@
     "requirements": {
         "yunohost": ">= 3.4"
     },
-    "multi_instance": true,
+    "multi_instance": false,
     "services": [
     "nginx"
     ],

scripts/install

@@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
+	read -p "key"
 	true
 }
 # Exit if an error occurs during the execution of the script
@@ -33,15 +33,15 @@ app=$YNH_APP_INSTANCE_NAME
 
 # Configurable variables
 sync_home="/home/yunohost.app/$app"
-sync_user=debian-syncthing
-sync_port=22000
-gui_port=8384
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
 ynh_print_info "Validating installation parameters..."
 
+final_path=/var/www/$app
+test ! -e "$final_path" || ynh_die "This path already contains a folder"
+
 # Register (book) web path
 ynh_webpath_register $app $domain $path_url
 
@@ -55,7 +55,6 @@ ynh_app_setting_set $app path $path_url
 ynh_app_setting_set $app admin $admin
 ynh_app_setting_set $app channel $channel
 ynh_app_setting_set $app sync_home $sync_home
-ynh_app_setting_set $app sync_user $sync_user
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -64,20 +63,10 @@ ynh_app_setting_set $app sync_user $sync_user
 #=================================================
 ynh_print_info "Configuring firewall..."
 
-# Check port availability
+gui_port=$(ynh_find_port 8384)
-sudo yunohost app checkport $gui_port
-if [[ ! $? -eq 0 ]]; then
-  echo Port $gui_port for Syncthing UI is not available.
-  exit 1
-fi
 ynh_app_setting_set $app gui_port $gui_port
 
-sudo yunohost app checkport $sync_port
+sync_port=$(ynh_find_port 22000)
-if [[ ! $? -eq 0 ]]; then
-  echo Port $sync_port for Syncthing protocol is not available.
-  exit 1
-fi
-
 # Open this port
 ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $sync_port
 ynh_app_setting_set $app sync_port $sync_port
@@ -89,13 +78,18 @@ ynh_print_info "Installing dependencies..."
 
 ynh_install_app_dependencies $pkg_dependencies
 
-## Add the release PGP keys:
+#=================================================
-curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
+# DOWNLOAD, CHECK AND UNPACK SOURCE
-## Add the choosed channel to your APT sources:
+#=================================================
-echo "deb http://apt.syncthing.net/ syncthing $channel" | sudo tee /etc/apt/sources.list.d/syncthing.list
+ynh_print_info "Setting up source files..."
-## Update and install syncthing:
+
-sudo apt-get update -qq
+### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
-sudo apt-get install syncthing -y --force-yes
+### downloaded from an upstream source, like a git repository.
+### `ynh_setup_source` use the file conf/app.src
+
+ynh_app_setting_set $app final_path $final_path
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -111,7 +105,7 @@ ynh_add_nginx_config "gui_port"
 ynh_print_info "Configuring system user..."
 
 # Create a system user
-ynh_system_user_create --username=$sync_user --home_dir=$sync_home/ --use_shell
+ynh_system_user_create --username=$app --home_dir=$final_path
 
 #=================================================
 # SPECIFIC SETUP
@@ -121,21 +115,34 @@ ynh_system_user_create --username=$sync_user --home_dir=$sync_home/ --use_shell
 ynh_print_info "Creating sync directory..."
 
 # Make directories and set rights
-sudo chown -R $sync_user:$sync_user $sync_home/
+mkdir -p "$sync_home"
-sudo find $sync_home/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
+chown -R "$app": "$sync_home"
-sudo find $sync_home/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
 
 #=================================================
 # SETUP SYSTEMD
 #=================================================
 ynh_print_info "Configuring a systemd service..."
 
-# Install and monitor service
+# Create a dedicated systemd config
-sudo sed -i '/^\[Service\]$/,/^\[/ s/^Restart=on-failure/Restart=always/' /lib/systemd/system/syncthing@.service
+ynh_add_systemd_config
-sudo systemctl daemon-reload
+
-sudo systemctl enable syncthing@$sync_user.service
+#=================================================
-sudo yunohost service add syncthing@$sync_user -l /var/log/syncthing.log
+# MODIFY A CONFIG FILE
-sudo systemctl start syncthing@$sync_user.service
+#=================================================
+
+mkdir -p "$final_path/.config/syncthing"
+config_file="$final_path/.config/syncthing/config.xml"
+cp "../conf/config.xml" "$config_file"
+
+ynh_replace_string "__GUI_PORT__" "$gui_port" "$config_file"
+ynh_replace_string "__SYNC_HOME__" "$sync_home" "$config_file"
+
+#=================================================
+# STORE THE CONFIG FILE CHECKSUM
+#=================================================
+
+# Calculate and store the config file checksum into the app settings
+ynh_store_file_checksum "$config_file"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -143,9 +150,8 @@ sudo systemctl start syncthing@$sync_user.service
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-# Remove acces to all users
+# Set permissions to app files
-sudo yunohost app removeaccess syncthing
+chown -R $app: $final_path
-sudo yunohost app addaccess syncthing -u $admin
 
 #=================================================
 # SETUP LOGROTATE
@@ -155,6 +161,12 @@ ynh_print_info "Configuring log rotation..."
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate
 
+#=================================================
+# ADVERTISE SERVICE IN ADMIN PANEL
+#=================================================
+
+yunohost service add $app --description "$app daemon for Syncthing"
+
 #=================================================
 # SETUP SSOWAT
 #=================================================
@@ -170,6 +182,14 @@ ynh_print_info "Reloading nginx web server..."
 
 systemctl reload nginx
 
+#=================================================
+# START SYNCTHING SERVICES
+#=================================================
+ynh_print_info "Starting Syncthing services..."
+
+ynh_systemd_action --action=start --service_name=$app --log_path=systemd
+#--line_match="Started $app"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/remove

@@ -27,15 +27,24 @@ gui_port=$(ynh_app_setting_get $app gui_port)
 
 #=================================================
 # STANDARD REMOVE
+#=================================================
+# REMOVE SERVICE FROM ADMIN PANEL
+#=================================================
+
+# Remove a service from the admin panel, added by `yunohost service add`
+if yunohost service status $app >/dev/null 2>&1
+then
+	ynh_print_info "Removing $app service"
+	yunohost service remove $app
+fi
+
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================
 ynh_print_info "Stopping and removing the systemd service"
 
 # Remove the dedicated systemd config
-sudo systemctl stop syncthing@$sync_user.service
+ynh_remove_systemd_config
-sudo yunohost service remove syncthing
-sudo systemctl disable syncthing@$sync_user.service
 
 #=================================================
 # REMOVE DEPENDENCIES
@@ -45,19 +54,13 @@ ynh_print_info "Removing dependencies"
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
-# Remove syncthing binairy
+#=================================================
-sudo apt-get autoremove syncthing -y --purge
+# REMOVE APP MAIN DIR
-sudo rm /etc/apt/sources.list.d/syncthing.list
+#=================================================
-sudo apt-get update -qq
+ynh_print_info "Removing app main directory"
-
-# Backup syncthing sync_home directory
-sudo mv $sync_home $sync_home.old
-# sudo rm -rf $sync_home
-
-
-
-
 
+# Remove the app directory securely
+ynh_secure_remove "$final_path"
 
 #=================================================
 # REMOVE NGINX CONFIGURATION
@@ -90,7 +93,7 @@ ynh_exec_warn_less yunohost firewall disallow TCP $sync_port
 ynh_print_info "Removing the dedicated system user"
 
 # Delete a system user
-ynh_system_user_delete $sync_user
+ynh_system_user_delete $app
 
 #=================================================
 # END OF SCRIPT