itadded override config file - 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 c4ed1f8e424d2a2aa952640be61bf13eb6171c22 /git/coffin/commit/c4ed1f8e424d2a2aa952640be61bf13eb6171c22.gph parazyd.org 70 1parent f93af1133909fc68bb6a6d4aa83a219750a197b8 /git/coffin/commit/f93af1133909fc68bb6a6d4aa83a219750a197b8.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Tue, 29 Mar 2016 17:27:26 +0200 Err parazyd.org 70 i Err parazyd.org 70 iadded override config file Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i A src/coffinrc | 10 ++++++++++ Err parazyd.org 70 i M src/sacrist | 18 +++++++++++------- Err parazyd.org 70 i A src/zlibs/config | 19 +++++++++++++++++++ Err parazyd.org 70 i Err parazyd.org 70 i3 files changed, 40 insertions(+), 7 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/src/coffinrc b/src/coffinrc /git/coffin/file/src/coffinrc.gph parazyd.org 70 it@@ -0,0 +1,10 @@ Err parazyd.org 70 i+# Configuration file for coffin. If you want to override any defaults, Err parazyd.org 70 i+# please do so here, and rename the file to '.coffinrc'. Err parazyd.org 70 i+# Careful! Err parazyd.org 70 i+# Err parazyd.org 70 i+# Directory where you keep all your tombs and data Err parazyd.org 70 i+GRAVEYARD /home/graveyard Err parazyd.org 70 i+# Directory where your keys get mounted Err parazyd.org 70 i+KEYMOUNT /media/tombkey Err parazyd.org 70 i+# Path to tomb executable Err parazyd.org 70 i+TOMB /usr/local/bin/tomb Err parazyd.org 70 1diff --git a/src/sacrist b/src/sacrist /git/coffin/file/src/sacrist.gph parazyd.org 70 it@@ -16,7 +16,7 @@ swapoff -a # Security Err parazyd.org 70 i zkv=1 Err parazyd.org 70 i helpers=1 Err parazyd.org 70 i Err parazyd.org 70 i-R=${COFFIN_PATH:-`pwd`} Err parazyd.org 70 i+R=`pwd` Err parazyd.org 70 i source $R/zlibs/zuper Err parazyd.org 70 i Err parazyd.org 70 i # USB key Err parazyd.org 70 it@@ -33,24 +33,28 @@ source $R/zlibs/hooks Err parazyd.org 70 i source $R/zlibs/keyfiles Err parazyd.org 70 i source $R/zlibs/mounts Err parazyd.org 70 i source $R/zlibs/ttab Err parazyd.org 70 i+source $R/zlibs/config Err parazyd.org 70 i Err parazyd.org 70 i LOCK=$R/.lock Err parazyd.org 70 i [[ -f $LOCK ]] && { warn "Lock found. Wait until finished." && exit } Err parazyd.org 70 i touch $LOCK Err parazyd.org 70 i Err parazyd.org 70 i+# Check for a configuration file Err parazyd.org 70 i+[[ -f ".coffinrc" ]] && parse-config Err parazyd.org 70 i+ Err parazyd.org 70 i device=$1 && xxx "Device: $device" Err parazyd.org 70 i happenz=$2 && xxx "Happenz: $happenz" Err parazyd.org 70 i keyuuid=$(lsblk -no uuid $device) && xxx "Key UUID: $keyuuid" Err parazyd.org 70 i Err parazyd.org 70 i GRAVEYARD="${GRAVEYARD:-/home/graveyard}" # Our graveyard, with all the tombs Err parazyd.org 70 i-TOMBS="${TOMBS:-$GRAVEYARD/tombs}" # Info about opened tombs, holds keyuuid, keyhash and tombid Err parazyd.org 70 i-TMPTOMBS="${TMPTOMBS:-$GRAVEYARD/tmptombs}" # Temp tempfile, for updating $tombs Err parazyd.org 70 i+TOMBS="$GRAVEYARD/tombs" # Info about opened tombs, holds keyuuid, keyhash and tombid Err parazyd.org 70 i+TMPTOMBS="$GRAVEYARD/tmptombs" # Temp tempfile, for updating $tombs Err parazyd.org 70 i+TOMBPASSWD="$GRAVEYARD/passwd" Err parazyd.org 70 i KEYMOUNT="${KEYMOUNT:-/media/tombkey}" # Directory where keys get mounted Err parazyd.org 70 i-COFFINDOT="${COFFINDOT:-$KEYMOUNT/.coffin}" # .coffin directory on the usb key Err parazyd.org 70 i-TTAB="${TTAB:-$COFFINDOT/ttab}" # Our ttab Err parazyd.org 70 i-HOOKS="${HOOKS:-$COFFINDOT/hook}" Err parazyd.org 70 i+COFFINDOT="$KEYMOUNT/.coffin" # .coffin directory on the usb key Err parazyd.org 70 i+TTAB="$COFFINDOT/ttab" # Our ttab Err parazyd.org 70 i+HOOKS="$COFFINDOT/hook" Err parazyd.org 70 i TOMB="${TOMB:-/usr/local/bin/tomb}" Err parazyd.org 70 i-TOMBPASSWD="${TOMBPASSWD:-$GRAVEYARD/passwd}" Err parazyd.org 70 i Err parazyd.org 70 i # Main Err parazyd.org 70 i req=(happenz device) Err parazyd.org 70 1diff --git a/src/zlibs/config b/src/zlibs/config /git/coffin/file/src/zlibs/config.gph parazyd.org 70 it@@ -0,0 +1,19 @@ Err parazyd.org 70 i+#!/usr/bin/env zsh Err parazyd.org 70 i+ Err parazyd.org 70 i+parse-config() { Err parazyd.org 70 i+ act "Found config file. Parsing..." Err parazyd.org 70 i+ Err parazyd.org 70 i+ ttmp=`awk ' Err parazyd.org 70 i+ /^#/ { next } Err parazyd.org 70 i+ /^GRAVEYARD / { printf "GRAVEYARD=\"%s\";", $2 } Err parazyd.org 70 i+ /^KEYMOUNT / { printf "KEYMOUNT=\"%s\";", $2 } Err parazyd.org 70 i+ /^TOMB / { printf "TOMB=\"%s\";", $2 } Err parazyd.org 70 i+ ' "$R/.coffinrc"` Err parazyd.org 70 i+ { test $? = 0 } || { Err parazyd.org 70 i+ die "Error parsing config file." Err parazyd.org 70 i+ return 1 Err parazyd.org 70 i+ } Err parazyd.org 70 i+ Err parazyd.org 70 i+ eval "$ttmp" Err parazyd.org 70 i+ act "Success parsing config file!" Err parazyd.org 70 i+} Err parazyd.org 70 .