diff --git a/conf/check-restic.j2 b/conf/check-restic.j2 index 2113bc8..0dc1551 100644 --- a/conf/check-restic.j2 +++ b/conf/check-restic.j2 @@ -18,20 +18,20 @@ echo $$ > "$LOCK_FILE" CHECK_READ_DATA=${1:-0} # Check system part conf -conf=$(yunohost app setting {{ app }} conf) +conf=$(sudo yunohost app setting {{ app }} conf) if [ $conf -eq 1 ];then - {{final_path}}/check_method_{{ app }} auto_conf ${CHECK_READ_DATA} + sudo {{final_path}}/check_method_{{ app }} auto_conf ${CHECK_READ_DATA} fi # Check system data -data=$(yunohost app setting {{ app }} data) +data=$(sudo yunohost app setting {{ app }} data) if [ $data -eq 1 ];then - {{final_path}}/check_method_{{ app }} auto_data ${CHECK_READ_DATA} + sudo {{final_path}}/check_method_{{ app }} auto_data ${CHECK_READ_DATA} fi # Check all apps independently -apps=$(yunohost app setting {{ app }} apps) -for app in $(ls /etc/yunohost/apps/*/scripts/backup | cut -d / -f 5); do +apps=$(sudo yunohost app setting {{ app }} apps) +for app in $(sudo /usr/bin/find /etc/yunohost/apps -name backup | cut -d / -f 5); do check_app=false for selected_app in $(echo $apps | tr "," " ");do if [[ "$selected_app" == "$app" ]] || [ "$apps" = "all" ]; then @@ -40,7 +40,7 @@ for app in $(ls /etc/yunohost/apps/*/scripts/backup | cut -d / -f 5); do fi done if [ "$check_app" == "true" ];then - {{final_path}}/check_method_{{ app }} auto_${app} ${CHECK_READ_DATA} + sudo {{final_path}}/check_method_{{ app }} auto_${app} ${CHECK_READ_DATA} fi done rm "$LOCK_FILE" diff --git a/conf/systemd_check.service b/conf/systemd_check.service index 6304f4e..043d309 100644 --- a/conf/systemd_check.service +++ b/conf/systemd_check.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=oneshot ExecStart=__FINALPATH__/check-__APP__ -ExecStartPost=/bin/bash -c 'echo -e "Subject: YunoHost Restic check log on $(hostname)\n$(/bin/journalctl _SYSTEMD_INVOCATION_ID=`systemctl show -p InvocationID --value __APP___check.service`)" | /usr/sbin/sendmail root' +ExecStartPost=/bin/bash -c 'echo -e "Subject: YunoHost Restic check log on $(hostname)\n$(sudo /bin/journalctl _SYSTEMD_INVOCATION_ID=`systemctl show -p InvocationID --value __APP___check.service`)" | /usr/sbin/sendmail root' User=__APP__ Group=__APP__ diff --git a/manifest.json b/manifest.json index d985e72..f328d3c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Backup your server with restic.", "fr": "Sauvegardez votre serveur avec restic." }, - "version": "0.12.0~ynh5", + "version": "0.12.0~ynh6", "url": "https://restic.net/", "license": "BSD-2-Clause", "maintainer": { diff --git a/scripts/install b/scripts/install index e1c6df4..f0f786f 100755 --- a/scripts/install +++ b/scripts/install @@ -43,7 +43,7 @@ ynh_script_progression --message="Creating user ${app}" useradd -m ${app} ynh_script_progression --message="Configure ${app} user sudoer rights" cat > /tmp/${app}_sudoer << EOSUDOER -${app} ALL = (root) NOPASSWD: /usr/bin/yunohost*, /bin/journalctl*, /usr/bin/find /etc/yunohost/apps -name backup +${app} ALL = (root) NOPASSWD: /usr/bin/yunohost*, /bin/journalctl*, /usr/bin/find /etc/yunohost/apps -name backup, ${final_path}/check_method_${app} EOSUDOER visudo -cf /tmp/${app}_sudoer && mv /tmp/${app}_sudoer /etc/sudoers.d/${app} @@ -66,7 +66,7 @@ ynh_configure check_method "${final_path}/check_method_${app}" #================================================= ynh_script_progression --message="Setting up log script" ynh_configure restic_log "${final_path}/restic_log_${app}" -chmod u+x "${final_path}/restic_log_${app}" +chmod +x "${final_path}/restic_log_${app}" chown ${app}: "${final_path}/restic_log_${app}" #================================================= @@ -75,10 +75,10 @@ chown ${app}: "${final_path}/restic_log_${app}" ynh_script_progression --message="Configuring cron" --weight=5 ynh_configure backup-with-restic "/usr/local/bin/backup-with-${app}" ynh_configure check-restic "${final_path}/check-${app}" -chmod u+x "/usr/local/bin/backup-with-${app}" +chmod +x "/usr/local/bin/backup-with-${app}" chown ${app}: "/usr/local/bin/backup-with-${app}" -chmod u+x "${final_path}/check-${app}" -chmod u+x "${final_path}/check_method_${app}" +chmod +x "${final_path}/check-${app}" +chmod +x "${final_path}/check_method_${app}" ynh_add_systemd_config --service=${app} --template=systemd.service ynh_add_systemd_config --service=${app}_check --template=systemd_check.service ynh_add_systemd_config --service=${app}_check_read_data --template=systemd_check_read_data.service diff --git a/scripts/upgrade b/scripts/upgrade index 4cebdad..6aef29f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -67,7 +67,7 @@ ynh_script_progression --message="Creating user ${app}" id ${app} 2>/dev/null || useradd -m ${app} ynh_script_progression --message="Configure ${app} user sudoer rights" cat > /tmp/${app}_sudoer << EOSUDOER -${app} ALL = (root) NOPASSWD: /usr/bin/yunohost*, /bin/journalctl*, /usr/bin/find /etc/yunohost/apps -name backup +${app} ALL = (root) NOPASSWD: /usr/bin/yunohost*, /bin/journalctl*, /usr/bin/find /etc/yunohost/apps -name backup, ${final_path}/check_method_${app} EOSUDOER visudo -cf /tmp/${app}_sudoer && mv /tmp/${app}_sudoer /etc/sudoers.d/${app} ynh_script_progression --message="Move ssh keys from root to ${app} user's home" @@ -115,7 +115,7 @@ ynh_configure check_method "${final_path}/check_method_${app}" #================================================= ynh_script_progression --message="Setting up log script" ynh_configure restic_log "${final_path}/restic_log_${app}" -chmod u+x "${final_path}/restic_log_${app}" +chmod +x "${final_path}/restic_log_${app}" chown ${app}: "${final_path}/restic_log_${app}" #================================================= @@ -124,10 +124,10 @@ chown ${app}: "${final_path}/restic_log_${app}" ynh_script_progression --message="Configuring cron" --weight=5 ynh_configure backup-with-restic "/usr/local/bin/backup-with-${app}" ynh_configure check-restic "${final_path}/check-${app}" -chmod u+x "/usr/local/bin/backup-with-${app}" +chmod +x "/usr/local/bin/backup-with-${app}" chown ${app}: "/usr/local/bin/backup-with-${app}" -chmod u+x "${final_path}/check-${app}" -chmod u+x "${final_path}/check_method_${app}" +chmod +x "${final_path}/check-${app}" +chmod +x "${final_path}/check_method_${app}" ynh_add_systemd_config --service=${app} --template=systemd.service ynh_add_systemd_config --service=${app}_check --template=systemd_check.service ynh_add_systemd_config --service=${app}_check_read_data --template=systemd_check_read_data.service