diff options
-rw-r--r-- | changelog.md | 8 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-snapshot-sync.sh | 84 | ||||
-rw-r--r-- | etc/nextcloudpi-config.d/nc-snapshot.sh | 1 | ||||
-rw-r--r-- | ncp-web/ncp-launcher.php | 2 |
4 files changed, 92 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md index 43ce79ee..04de414b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,11 @@ -[v0.47.3](https://github.com/nextcloud/nextcloudpi/commit/4156bb7) (2018-03-16) fix for nc-automount-links +[v0.50.0](https://github.com/nextcloud/nextcloudpi/commit/1937d28) (2018-03-12) added nc-snapshot-sync -[v0.47.2](https://github.com/nextcloud/nextcloudpi/commit/66cb00a) (2018-03-15) improve dependency of database with automount +[v0.47.4 ](https://github.com/nextcloud/nextcloudpi/commit/5e9cb51) (2018-03-14) Add template generation functionality to L10N.php (activate by setting constant GENERATE_TEMPLATES to true). + +[v0.47.3](https://github.com/nextcloud/nextcloudpi/commit/fd9fc8c) (2018-03-16) fix for nc-automount-links + +[v0.47.2 ](https://github.com/nextcloud/nextcloudpi/commit/66cb00a) (2018-03-15) improve dependency of database with automount [v0.47.1 ](https://github.com/nextcloud/nextcloudpi/commit/9f6c479) (2018-03-10) update: make sure redis log exists diff --git a/etc/nextcloudpi-config.d/nc-snapshot-sync.sh b/etc/nextcloudpi-config.d/nc-snapshot-sync.sh new file mode 100644 index 00000000..9f992f6a --- /dev/null +++ b/etc/nextcloudpi-config.d/nc-snapshot-sync.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +# Sync Nextcloud BTRFS snapshots +# +# Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> +# GPL licensed (see end of file) * Use at your own risk! +# +# Usage: +# +# ./installer.sh nc-snapshot-sync.sh <IP> (<img>) +# +# See installer.sh instructions for details +# +# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/ +# + +ACTIVE_=no +SNAPDIR_=/media/USBdrive/ncp-snapshots +DESTINATION_=/media/myBackupDrive/ncp-snapshots +COMPRESSION_=no +SYNCDAYS_=1 +DESCRIPTION="Sync BTRFS snapshots to USBdrive or remote machine" + +INFO="Use format user@ip:/path/to/snapshots for remote sync +'user' needs permissions for the 'btrfs' command at 'ip' +'user' needs SSH autologin from the NCP 'root' user at 'ip' +Only use compression for internet transfer, because it uses many resources" + +install() +{ + apt-get update + apt-get install -y --no-install-recommends pv + wget https://raw.githubusercontent.com/nachoparker/btrfs-sync/master/btrfs-sync -O /usr/local/bin/btrfs-sync + chmod +x /usr/local/bin/btrfs-sync + ssh-keygen -N "" -f /root/.ssh/id_rsa +} + +configure() +{ + [[ $ACTIVE_ != "yes" ]] && { + rm /etc/cron.d/ncp-snapsync-auto + service cron restart + echo "snapshot sync disabled" + return 0 + } + + # checks + [[ -d "$SNAPDIR_" ]] || { echo "$SNAPDIR_ does not exist"; return 1; } + + [[ "$DESTINATION_" =~ : ]] && { + local NET="$( sed 's|:.*||' <<<"$DESTINATION_" )" + local DST="$( sed 's|.*:||' <<<"$DESTINATION_" )" + local SSH=( ssh -o "BatchMode=yes" "$NET" ) + ${SSH[@]} : || { echo "SSH non-interactive not properly configured"; return 1; } + } || DST="$DESTINATION_" + [[ "$( ${SSH[@]} stat -fc%T "$DST" )" != "btrfs" ]] && { + echo "$DESTINATION_ is not in a BTRFS filesystem" + return 1 + } + + [[ "$COMPRESSION_" == "yes" ]] && ZIP="-z" + + echo "30 4 */${SYNCDAYS_} * * root /usr/local/bin/btrfs-sync -qd $ZIP \"$SNAPDIR_\" \"$DESTINATION_\"" > /etc/cron.d/ncp-snapsync-auto + service cron restart + echo "snapshot sync enabled" +} + +# License +# +# This script is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this script; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place, Suite 330, +# Boston, MA 02111-1307 USA + diff --git a/etc/nextcloudpi-config.d/nc-snapshot.sh b/etc/nextcloudpi-config.d/nc-snapshot.sh index 00a39ce3..9059ac7c 100644 --- a/etc/nextcloudpi-config.d/nc-snapshot.sh +++ b/etc/nextcloudpi-config.d/nc-snapshot.sh @@ -1,4 +1,5 @@ #!/bin/bash + # Nextcloud BTRFS snapshots # # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php index f0bb591d..829c39ef 100644 --- a/ncp-web/ncp-launcher.php +++ b/ncp-web/ncp-launcher.php @@ -118,7 +118,7 @@ else if ( $_POST['action'] == "launch" && $_POST['config'] ) { $value = "[". join(",", $value) ."]"; } - preg_match( '/^[\[\]\w.,@_\/-]+$/' , $value , $matches ) + preg_match( '/^[\[\]\w.,@_\/-:]+$/' , $value , $matches ) or exit( '{ "output": "Invalid input" , "token": "' . getCSRFToken() . '" }' ); $code = preg_replace( '/\n' . $name . '_=.*' . PHP_EOL . '/' , PHP_EOL . $name . '_=' . $value . PHP_EOL , |