diff options
Diffstat (limited to 'share')
-rwxr-xr-x | share/hydra/deploy | 3 | ||||
-rwxr-xr-x | share/hydractl/provision | 6 | ||||
-rwxr-xr-x | share/hydractl/sync-backups | 13 | ||||
-rwxr-xr-x | share/hydractl/sync-media | 4 |
4 files changed, 18 insertions, 8 deletions
diff --git a/share/hydra/deploy b/share/hydra/deploy index b675577..e440ae5 100755 --- a/share/hydra/deploy +++ b/share/hydra/deploy @@ -300,7 +300,8 @@ if [ -e "$HYDRA_FOLDER/ansible/ansible.cfg" ]; then if [ "$NODES" == "all" ]; then hydra $HYDRA ansible-playbook site.yml $ANSIBLE_ARGS else - hydra $HYDRA ansible-playbook site.yml $ANSIBLE_ARGS --limit $NODES + NODES="`echo $NODES | tr ' ' ','`" + hydra $HYDRA ansible-playbook site.yml $ANSIBLE_ARGS --limit "$NODES" fi fi fi diff --git a/share/hydractl/provision b/share/hydractl/provision index 352e783..7d224e3 100755 --- a/share/hydractl/provision +++ b/share/hydractl/provision @@ -118,16 +118,16 @@ function hydra_provision_config { hydra_user_config interactive y "Interactive mode? (y/n)" hydra_user_config device /dev/sdb "Physical device(s) (more than one auto sets RAID mode)" hydra_user_config swap_size 2000 "Swap size (in MB, 0 to not create it)" - hydra_user_config root_size 20G "Size of root partition (-1 for all free space)" + hydra_user_config root_size 40G "Size of root partition (-1 for all free space)" if [ "$root_size" != "-1" ]; then - hydra_user_config home_size 20G "Size of home partition (0 to not create it, -1 for all free space)" + hydra_user_config home_size 40G "Size of home partition (0 to not create it, -1 for all free space)" else home_size="0" fi if [ "$root_size" != "-1" ] && [ "$home_size" != "-1" ]; then - hydra_user_config var_size 20G "Size of var partition (0 to not create it, -1 for all free space)" + hydra_user_config var_size 40G "Size of var partition (0 to not create it, -1 for all free space)" else var_size="0" fi diff --git a/share/hydractl/sync-backups b/share/hydractl/sync-backups index 844d630..9cc79de 100755 --- a/share/hydractl/sync-backups +++ b/share/hydractl/sync-backups @@ -7,12 +7,21 @@ BASENAME="`basename $0`" VOLUME="$1" MEDIA="/media/$VOLUME" -BWLIMIT=${BWLIMIT:=32000} +BWLIMIT=${BWLIMIT:=0} IMAGES="/var/data/crypt/" -RSYNC="ionice -c 3 nice -n 19 rsync -avH --delete --bwlimit=$BWLIMIT" CP="ionice -c 3 nice -n 19 cp" WHOAMI="`whoami`" +# Set bandwidth limit +if [ "$BWLIMIT" != "0" ]; then + BWLIMIT="--bwlimit=$BWLIMIT" +else + BWLIMIT="" +fi + +# Build rsync command line +RSYNC="ionice -c 3 nice -n 19 rsync -avH --delete $BWLIMIT" + # Sync backups for a node. function sync_backups_node { if [ ! -z "$NODE" ]; then diff --git a/share/hydractl/sync-media b/share/hydractl/sync-media index 554e09a..8132315 100755 --- a/share/hydractl/sync-media +++ b/share/hydractl/sync-media @@ -67,8 +67,8 @@ function sync_media_add_metadata { find -name metadata.pdf.lua.old -exec git add {} \; # Darktable sidecar files - find -name '*.xmp' -type l ! -path '*.git' -exec git annex unlock {} \; - find -name '*.xmp' ! -path '*.git' -exec git add {} \; + find -name '*.xmp' -type l -not -path '*.git*' -exec git annex unlock {} \; + find -name '*.xmp' -not -path '*.git*' -exec git add {} \; } # If there is a playlists folder, make sure mpd user can write to it |