From d91707c23204cbce2e909e6183a5eafc4bd689c8 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 21 Jun 2018 17:08:18 +0200 Subject: [PATCH] [enh] Quota documentation --- manifest.json | 9 +++++++++ scripts/install | 10 +++++++--- scripts/restore | 9 +++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index a5eb176..b102291 100644 --- a/manifest.json +++ b/manifest.json @@ -35,6 +35,15 @@ "en": "Indicate the public key given by borg_ynh app", "fr": "Indiquez la clé publique donnée par l'app borg_ynh" } + }, + { + "name": "quota", + "ask": { + "en": "Indicate the storage quota", + "fr": "Indiquez le quota de stockage" + }, + "optionnal": true, + "example": "30G" } ] } diff --git a/scripts/install b/scripts/install index 6bd1cf9..0cc1099 100755 --- a/scripts/install +++ b/scripts/install @@ -22,12 +22,12 @@ ynh_abort_if_errors export app=$YNH_APP_INSTANCE_NAME # Retrieve arguments -ynh_export ssh_user public_key +ynh_export ssh_user public_key quota #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_save_args ssh_user public_key +ynh_save_args ssh_user public_key quota #================================================= # STORE SETTINGS FROM MANIFEST @@ -47,7 +47,11 @@ adduser $ssh_user --quiet --gecos ",,," --shell /bin/bash --disabled-password home=/home/$ssh_user mkdir -p /home/$ssh_user/.ssh touch /home/$ssh_user/.ssh/authorized_keys -echo "command=\"borg serve --restrict-to-path /home/$ssh_user/backup\",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc $public_key" >> /home/$ssh_user/.ssh/authorized_keys +extra="--storage-quota $quota" +if [ "$quota" = "" ]; then + extra="" +fi +echo "command=\"borg serve $extra --restrict-to-repository /home/$ssh_user/backup\",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc $public_key" >> /home/$ssh_user/.ssh/authorized_keys #================================================= # AVOID BACKUP OF BACKUP diff --git a/scripts/restore b/scripts/restore index 1946267..0b84591 100755 --- a/scripts/restore +++ b/scripts/restore @@ -29,6 +29,7 @@ app=$YNH_APP_INSTANCE_NAME export ssh_user=$(ynh_app_setting_get $app ssh_user) export public_key=$(ynh_app_setting_get $app public_key) +export quota=$(ynh_app_setting_get $app quota) #================================================= # STORE SETTINGS FROM MANIFEST @@ -40,7 +41,7 @@ pip3 install borgbackup #================================================= # CREATE SSH USER USED BY BORG #================================================= -adduser $ssh_user -s /bin/bash --disabled-password +adduser $ssh_user --quiet --gecos ",,," --shell /bin/bash --disabled-password #================================================= # AUTORIZE SSH FOR THIS USER @@ -48,7 +49,11 @@ adduser $ssh_user -s /bin/bash --disabled-password home=/home/$ssh_user mkdir -p /home/$ssh_user/.ssh touch /home/$ssh_user/.ssh/authorized_keys -echo "command=\"borg serve --restrict-to-path /home/$ssh_user/backup\",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc $public_key" >> /home/$ssh_user/.ssh/authorized_keys +extra="--storage-quota $quota" +if [ "$quota" = "" ]; then + extra="" +fi +echo "command=\"borg serve $extra --restrict-to-repository /home/$ssh_user/backup\",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc $public_key" >> /home/$ssh_user/.ssh/authorized_keys #================================================= # AVOID BACKUP OF BACKUP