itchanged var names because of conflicts with tomb - coffin - secure lan file storage on a device	Err	parazyd.org	70
hgit clone git://parazyd.org/coffin.git	URL:git://parazyd.org/coffin.git	parazyd.org	70
1Log	/git/coffin/log.gph	parazyd.org	70
1Files	/git/coffin/files.gph	parazyd.org	70
1Refs	/git/coffin/refs.gph	parazyd.org	70
1Submodules	/git/coffin/file/.gitmodules.gph	parazyd.org	70
1README	/git/coffin/file/README.md.gph	parazyd.org	70
1LICENSE	/git/coffin/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 9f9672d40ff940a46df63523aeeab501c2ebd79b	/git/coffin/commit/9f9672d40ff940a46df63523aeeab501c2ebd79b.gph	parazyd.org	70
1parent 80bb8a40f1e53059404cd13a0d321127b0f8d072	/git/coffin/commit/80bb8a40f1e53059404cd13a0d321127b0f8d072.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Mon, 22 Feb 2016 15:09:24 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
ichanged var names because of conflicts with tomb	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M bin/sacrist                         |      36 ++++++++++++++++----------------	Err	parazyd.org	70
i	Err	parazyd.org	70
i1 file changed, 18 insertions(+), 18 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/bin/sacrist b/bin/sacrist	/git/coffin/file/bin/sacrist.gph	parazyd.org	70
it@@ -9,7 +9,7 @@ happenz=$2	Err	parazyd.org	70
i keyuuid=$(blkid $device | awk -F\" '{print $2}')	Err	parazyd.org	70
i 	Err	parazyd.org	70
i # Vars	Err	parazyd.org	70
i-tmptombs="/tmp/tombs" # Info about opened tombs, holds keyuuid, keyhash and tombname	Err	parazyd.org	70
i+tmptombs="/tmp/tombs" # Info about opened tombs, holds keyuuid, keyhash and tombid	Err	parazyd.org	70
i tmptombs2="/tmp/tombs2" # Temp tempfile, for updating $tmptombs	Err	parazyd.org	70
i graveyard="/home/graveyard" # Our graveyard, with all the tombs	Err	parazyd.org	70
i keymount="/media/tombkey" # Directory where keys get mounted	Err	parazyd.org	70
it@@ -41,24 +41,24 @@ _ttabmagic() {	Err	parazyd.org	70
i             _msg info "Working on tomb from line $line..."	Err	parazyd.org	70
i             undertaker=$(echo $entry | awk -F: '{print $1}')	Err	parazyd.org	70
i             echo "Username: $undertaker"	Err	parazyd.org	70
i-            tombname=$(echo $entry | awk -F: '{print $2}')	Err	parazyd.org	70
i-            echo "Tomb name: $tombname"	Err	parazyd.org	70
i+            tombid=$(echo $entry | awk -F: '{print $2}')	Err	parazyd.org	70
i+            echo "Tomb name: $tombid"	Err	parazyd.org	70
i             _comparekey	Err	parazyd.org	70
i             if [[ $happenz == "close" ]]; then	Err	parazyd.org	70
i                 _msg warn "Comparekey true"	Err	parazyd.org	70
i-                sudo -u $undertaker $tomb slam $tombname    	Err	parazyd.org	70
i+                sudo -u $undertaker $tomb slam $tombid    	Err	parazyd.org	70
i                 cp $tmptombs $tmptombs2	Err	parazyd.org	70
i                 grep -v $keyhash $tmptombs2 > $tmptombs; chmod 600 $tmptombs; _msg info "Updated $tmptombs"	Err	parazyd.org	70
i                 rm $tmptombs2	Err	parazyd.org	70
i                 continue	Err	parazyd.org	70
i             fi	Err	parazyd.org	70
i             _msg warn "Comparekey false"	Err	parazyd.org	70
i-            tombpass=$(echo $entry | awk -F: '{print $3}')	Err	parazyd.org	70
i-            echo "Tomb passphrase: $tombpass"	Err	parazyd.org	70
i-            sudo -u $undertaker $tomb open $graveyard/$tombname.tomb -k $coffindot/$tombname.key \	Err	parazyd.org	70
i-                --unsafe --tomb-pwd $tombpass # Deal with this shit somehow!	Err	parazyd.org	70
i+            keypass=$(echo $entry | awk -F: '{print $3}')	Err	parazyd.org	70
i+            echo "Tomb passphrase: $keypass"	Err	parazyd.org	70
i+            sudo -u $undertaker $tomb open $graveyard/$tombid.tomb -k $coffindot/$tombname.key \	Err	parazyd.org	70
i+                --unsafe --tomb-pwd $keypass # Deal with this shit somehow!	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-            if [[ -d "/media/$tombname" ]]; then	Err	parazyd.org	70
i+            if [[ -d "/media/$tombid" ]]; then	Err	parazyd.org	70
i                 echo "$undertaker:$keyhash:$keyuuid" >> $tmptombs; chmod 600 $tmptombs; _msg info "Added info to $tmptombs" 	Err	parazyd.org	70
i             else	Err	parazyd.org	70
i                 _msg warn "Nothing added to $tmptombs"	Err	parazyd.org	70
it@@ -69,7 +69,7 @@ _ttabmagic() {	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i _hashkey() {	Err	parazyd.org	70
i-    cat $coffindot/$tombname.key | sha512sum | awk -F" " '{print $1}'	Err	parazyd.org	70
i+    cat $coffindot/$tombid.key | sha512sum | awk -F" " '{print $1}'	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i _comparekey() {	Err	parazyd.org	70
it@@ -84,8 +84,8 @@ _comparekey() {	Err	parazyd.org	70
i _create_new_tomb() {	Err	parazyd.org	70
i     _msg info "Creating new tomb!"	Err	parazyd.org	70
i     undertaker=$(cat $createme | awk -F: '{print $1}')	Err	parazyd.org	70
i-    tombname=$(cat $createme | awk -F: '{print $2}')	Err	parazyd.org	70
i-    tombpass=$(cat $createme | awk -F: '{print $3}')	Err	parazyd.org	70
i+    tombid=$(cat $createme | awk -F: '{print $2}')	Err	parazyd.org	70
i+    keypass=$(cat $createme | awk -F: '{print $3}')	Err	parazyd.org	70
i     tombsize=$(cat $createme | awk -F: '{print $4}')	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     if ! [[ ( $(id $undertaker) ) ]]; then	Err	parazyd.org	70
it@@ -94,13 +94,13 @@ _create_new_tomb() {	Err	parazyd.org	70
i         _msg info "Created user $undertaker"	Err	parazyd.org	70
i     fi	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-    sudo -u $undertaker $tomb dig -s $tombsize $graveyard/$tombname.tomb    	Err	parazyd.org	70
i-    sudo -u $undertaker $tomb forge $graveyard/$tombname.key --unsafe --tomb-pwd "$tombpass"	Err	parazyd.org	70
i-    sudo -u $undertaker $tomb lock $graveyard/$tombname.tomb -k $graveyard/$tombname.key \	Err	parazyd.org	70
i-        --unsafe --tomb-pwd "$tombpass"	Err	parazyd.org	70
i-    mv $graveyard/$tombname.key $coffindot/ && chown $undertaker:$undertaker $coffindot/$tombname.key && \	Err	parazyd.org	70
i+    sudo -u $undertaker $tomb dig -s $tombsize $graveyard/$tombid.tomb    	Err	parazyd.org	70
i+    sudo -u $undertaker $tomb forge $graveyard/$tombid.key --unsafe --tomb-pwd "$keypass"	Err	parazyd.org	70
i+    sudo -u $undertaker $tomb lock $graveyard/$tombid.tomb -k $graveyard/$tombname.key \	Err	parazyd.org	70
i+        --unsafe --tomb-pwd "$keypass"	Err	parazyd.org	70
i+    mv $graveyard/$tombid.key $coffindot/ && chown $undertaker:$undertaker $coffindot/$tombname.key && \	Err	parazyd.org	70
i         _msg info "Moved and chowned keyfile"	Err	parazyd.org	70
i-    echo "$undertaker:$tombname:$tombpass:true" >> $ttab 	Err	parazyd.org	70
i+    echo "$undertaker:$tombid:$keypass:true" >> $ttab 	Err	parazyd.org	70
i     _msg info "Wrote to $ttab"	Err	parazyd.org	70
i     rm $createme && _msg info "Removed $createme"	Err	parazyd.org	70
i }	Err	parazyd.org	70
.