master
Jeffrey Paul 2 years ago
parent 71a52ec3d3
commit c1300f968d
  1. 38
      bin/encrypt-for-sneak
  2. 39
      bin/encrypt-for-sneak-ascii
  3. 11
      homedir.makefile/Makefile
  4. 25
      libvirt/diskpools.sh
  5. 10
      osxbackup/rsyncbackup.command

@ -1,38 +0,0 @@
#!/bin/bash
set -x
KEYSERVER="hkps.pool.sks-keyservers.net"
#KEYSERVER="pgp.mit.edu"
KEYS=""
KEYS+=" 5539AD00DE4C42F3AFE11575052443F4DF2A55C2" #sneak@sneak.berlin
KEYS+=" FF2530A4F3F152E8865FC17CA833B7CE3F2CC6FC" #JP Yubi 6192
KEYS+=" 078BBD04FBE35D665180EF8A476509F749BFD1AD" #JP Yubi 2811
KEYS+=" 7D1123A022FC90DF389EC65F233196C180B1C28F" #JP Yubi 6643
KEYS+=" F5A3A83B9E65EA3E1A2A48E5FDA763BDDCFAB8AC" #Yubikey 4928206 20160927
KEYS+=" B044B27DCB86641AFE3AB274779D07C54EB7CF85" #Yubikey 4953582 20160927
#KEYS+=" 3FF8DE63855070F8B9CB0D9A67B4CD26470681DA" #Yubikey 4CNano 06931602 20171018
KEYS+=" 1CA168D7E842DFD1745815006F291E6D9AA87738"
KEYS+=" 726D577AFB82E64049B62A8DA763B92AD841A706" # Yubi 7192344 20180613 pris
KEYS+=" 04630E42D244BC80717D28D51280F730A9AD633C"
KEYS+=" 5D48805E38B8C2E04103C7728CBD64834BC043EA"
KEYS+=" 8904EE6400E7B7409CE00AA92084C4563F360B45"
KEYS+=" FE65DB157D8BF9E4FEDF50DA927353E2C4507A5B"
KEYS+=" 27CF8E00190D7AF340D8AE55A6C1C5C2083CB579"
GARGS=""
GARGS+=" --trust-model always"
#GARGS+=" --compress-algo bzip2"
GARGS+=" --compress-algo none"
#GARGS+=" --bzip2-compress-level 9"
for KEY in $KEYS ; do
if ! gpg --list-key $KEY 2>&1 > /dev/null ; then
gpg --recv-key --keyserver $KEYSERVER $KEY
fi
GARGS+=" -r $KEY"
done
gpg $GARGS --encrypt "$*"

@ -1,39 +0,0 @@
#!/bin/bash
set -x
KEYSERVER="hkps.pool.sks-keyservers.net"
#KEYSERVER="pgp.mit.edu"
KEYS=""
KEYS+=" 5539AD00DE4C42F3AFE11575052443F4DF2A55C2" #sneak@sneak.berlin
KEYS+=" FF2530A4F3F152E8865FC17CA833B7CE3F2CC6FC" #JP Yubi 6192
KEYS+=" 078BBD04FBE35D665180EF8A476509F749BFD1AD" #JP Yubi 2811
KEYS+=" 7D1123A022FC90DF389EC65F233196C180B1C28F" #JP Yubi 6643
KEYS+=" F5A3A83B9E65EA3E1A2A48E5FDA763BDDCFAB8AC" #Yubikey 4928206 20160927
KEYS+=" B044B27DCB86641AFE3AB274779D07C54EB7CF85" #Yubikey 4953582 20160927
#KEYS+=" 3FF8DE63855070F8B9CB0D9A67B4CD26470681DA" #Yubikey 4CNano 06931602 20171018
KEYS+=" 1CA168D7E842DFD1745815006F291E6D9AA87738"
KEYS+=" 726D577AFB82E64049B62A8DA763B92AD841A706" # Yubi 7192344 20180613 pris
KEYS+=" 04630E42D244BC80717D28D51280F730A9AD633C"
KEYS+=" 5D48805E38B8C2E04103C7728CBD64834BC043EA"
KEYS+=" 8904EE6400E7B7409CE00AA92084C4563F360B45"
KEYS+=" FE65DB157D8BF9E4FEDF50DA927353E2C4507A5B"
KEYS+=" 27CF8E00190D7AF340D8AE55A6C1C5C2083CB579"
GARGS=""
GARGS+=" -a"
GARGS+=" --trust-model always"
#GARGS+=" --compress-algo bzip2"
GARGS+=" --compress-algo none"
#GARGS+=" --bzip2-compress-level 9"
for KEY in $KEYS ; do
if ! gpg --list-key $KEY 2>&1 > /dev/null ; then
gpg --recv-key --keyserver $KEYSERVER $KEY
fi
GARGS+=" -r $KEY"
done
gpg $GARGS --encrypt "$*"

@ -76,14 +76,5 @@ verify:
remotebackup:
RBACKUPDEST="scp://jp.eeqj.de/backup" $(HOME)/.local/bin/backup.command
packages:
brew install $(BREWPACKAGES)
# this copies instead of linking because the 'hacks' repo is part of the
# sneak-sync shared folder which is synced with machines off-prem
# and they are not allowed impending RCE on workstations
update:
cat $(HACKSREPO)/homedir.makefile/Makefile > Makefile
brew upgrade
ln -s $(HACKSREPO)/homedir.makefile/Makefile $(HOME)/Makefile

@ -0,0 +1,25 @@
#!/bin/bash
SSH="ssh root@las1"
$SSH virsh pool-define-as flashpool-root dir --target /srv/flash/virt/root
$SSH virsh pool-start flashpool-root
$SSH virsh pool-autostart flashpool-root
$SSH virsh pool-define-as flashpool-storage dir --target /srv/flash/virt/storage
$SSH virsh pool-start flashpool-storage
$SSH virsh pool-autostart flashpool-storage
$SSH virsh pool-define-as pool-root dir --target /srv/storage/virt/root
$SSH virsh pool-start pool-root
$SSH virsh pool-autostart pool-root
$SSH virsh pool-define-as pool-storage dir --target /srv/storage/virt/storage
$SSH virsh pool-start pool-storage
$SSH virsh pool-autostart pool-storage
$SSH virsh pool-list
SSH="ssh root@lstor1"
$SSH virsh pool-define-as pool-root dir --target /srv/lstor1/virt/root
$SSH virsh pool-start pool-root
$SSH virsh pool-autostart pool-root
$SSH virsh pool-define-as pool-storage dir --target /srv/lstor1/virt/storage
$SSH virsh pool-start pool-storage
$SSH virsh pool-autostart pool-storage
$SSH virsh pool-list

@ -44,8 +44,8 @@ RE+=" --exclude=/.cpan/sources/"
RE+=" --exclude=/.docker/"
RE+=" --exclude=/.dropbox/"
RE+=" --exclude=/.minikube/cache/"
RE+=" --exclude=/Applications/Fortnite/"
RE+=" --exclude=/Desktop/" # desktop is like a visible tempdir.
RE+=" --exclude=/Library/VoiceTrigger/SAT"
RE+=" --exclude=/Documents/Dropbox/.dropbox.cache/"
RE+=" --exclude=/Documents/Steam?Content/"
RE+=" --exclude=/Downloads/"
@ -62,16 +62,19 @@ RE+=" --exclude=/Library/Caches/"
RE+=" --exclude=/Library/Containers/com.docker.docker/"
RE+=" --exclude=/Library/Cookies/"
RE+=" --exclude=/Library/Developer/"
RE+=" --exclude=/Library/Google/GoogleSoftwareUpdate/"
RE+=" --exclude=/Library/Homebrew/"
RE+=" --exclude=/Library/Syncthing/folders/" # syncthing is its own backup
RE+=" --exclude=/Library/Logs/"
RE+=" --exclude=/Library/Mail/" # keep your mail on the server!
RE+=" --exclude=/Library/Mail?Downloads/"
RE+=" --exclude=/Library/Parallels/"
RE+=" --exclude=/Library/Preferences/Macromedia/Flash?Player/"
RE+=" --exclude=/Library/Preferences/SDMHelpData/"
RE+=" --exclude=/Library/PubSub/"
RE+=" --exclude=/Library/Safari/"
RE+=" --exclude=/Library/Safari/HistoryIndex.sk"
RE+=" --exclude=/Library/Syncthing/folders/" # syncthing is its own backup
RE+=" --exclude=/Library/VoiceTrigger/SAT"
RE+=" --exclude=/Library/iTunes/iPad?Software?Updates/"
RE+=" --exclude=/Library/iTunes/iPhone?Software?Updates/"
RE+=" --exclude=/Music/iTunes/Album?Artwork/"
@ -79,9 +82,6 @@ RE+=" --exclude=/Pictures/iPod?Photo?Cache/"
RE+=" --exclude=/Receivd/"
RE+=" --exclude=/VirtualBox?VMs/"
# apps in homedir
RE+=" --exclude=/Applications/Fortnite/"
MINRE=""
MINRE+=" --exclude=/.fseventsd/"
MINRE+=" --exclude=/.Spotlight-V100/"

Loading…
Cancel
Save