itsmall fixes to installation - 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 07c540384311cd9f4ab6badc9b454cfa71b842c8 /git/coffin/commit/07c540384311cd9f4ab6badc9b454cfa71b842c8.gph parazyd.org 70 1parent c4ed1f8e424d2a2aa952640be61bf13eb6171c22 /git/coffin/commit/c4ed1f8e424d2a2aa952640be61bf13eb6171c22.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Tue, 29 Mar 2016 17:47:26 +0200 Err parazyd.org 70 i Err parazyd.org 70 ismall fixes to installation Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M conf/config.sh | 20 +++++++++++--------- Err parazyd.org 70 i M src/coffinrc | 7 ++++++- Err parazyd.org 70 i M src/zlibs/hooks | 2 ++ Err parazyd.org 70 i Err parazyd.org 70 i3 files changed, 19 insertions(+), 10 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/conf/config.sh b/conf/config.sh /git/coffin/file/conf/config.sh.gph parazyd.org 70 it@@ -47,9 +47,8 @@ edit-sudo() { Err parazyd.org 70 i [[ $1 == "snowman" ]] && { Err parazyd.org 70 i pushd `pwd`/conf Err parazyd.org 70 i Err parazyd.org 70 i- # install files Err parazyd.org 70 i- install -m640 coffindav.conf /etc/apache2/sites-available/ Err parazyd.org 70 i- install -m600 davpasswd /etc/apache2/ Err parazyd.org 70 i+ print "Creating coffin group..." Err parazyd.org 70 i+ groupadd coffin && print "Done!" Err parazyd.org 70 i Err parazyd.org 70 i # ssl Err parazyd.org 70 i print "Generating ssl certificate..." Err parazyd.org 70 it@@ -60,12 +59,17 @@ edit-sudo() { Err parazyd.org 70 i return 1 Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i- mkdir -p /etc/ssl/coffin Err parazyd.org 70 i- install -m 444 coffin.pem /etc/ssl/coffin/ Err parazyd.org 70 i+ install -m 640 -d /etc/ssl/coffin Err parazyd.org 70 i+ install -m 440 coffin.pem /etc/ssl/coffin/ Err parazyd.org 70 i install -m 400 coffin.key /etc/ssl/coffin/ Err parazyd.org 70 i print "Done!" Err parazyd.org 70 i Err parazyd.org 70 i # Apache Err parazyd.org 70 i+ install -m 774 -g www-data -d /etc/apache2/DAV Err parazyd.org 70 i+ print "DAVLockDB /etc/apache2/DAV/DAVLock" >> /etc/apache2/apache2.conf Err parazyd.org 70 i+ install -m600 davpasswd /etc/apache2/DAV Err parazyd.org 70 i+ install -m640 coffindav.conf /etc/apache2/sites-available/ Err parazyd.org 70 i+ Err parazyd.org 70 i apachemods=(dav dav_fs dav_lock ssl) Err parazyd.org 70 i print "Enabling Apache modules..." Err parazyd.org 70 i for i in $apachemods; do Err parazyd.org 70 it@@ -73,15 +77,13 @@ edit-sudo() { Err parazyd.org 70 i done Err parazyd.org 70 i Err parazyd.org 70 i a2ensite coffindav.conf Err parazyd.org 70 i- Err parazyd.org 70 i- print "Creating coffin group..." Err parazyd.org 70 i- groupadd coffin && print "Done!" Err parazyd.org 70 i- Err parazyd.org 70 i /etc/init.d/apache2 restart Err parazyd.org 70 i [[ -f /etc/init.d/ssh ]] && { /etc/init.d/ssh start } Err parazyd.org 70 i Err parazyd.org 70 i edit-sudo Err parazyd.org 70 i Err parazyd.org 70 i+ install -m 770 -g coffin -d /home/graveyard Err parazyd.org 70 i+ Err parazyd.org 70 i # TODO: add initscript Err parazyd.org 70 i Err parazyd.org 70 i print "Successfully installed and configured coffin!" Err parazyd.org 70 1diff --git a/src/coffinrc b/src/coffinrc /git/coffin/file/src/coffinrc.gph parazyd.org 70 it@@ -1,10 +1,15 @@ 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+ Err parazyd.org 70 i # Directory where you keep all your tombs and data Err parazyd.org 70 i+# Reminder that the default is already installed, Err parazyd.org 70 i+# and the directory group owner must be 'coffin' Err parazyd.org 70 i+# with permissions 770 Err parazyd.org 70 i GRAVEYARD /home/graveyard Err parazyd.org 70 i+ Err parazyd.org 70 i # Directory where your keys get mounted Err parazyd.org 70 i KEYMOUNT /media/tombkey Err parazyd.org 70 i+ 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/zlibs/hooks b/src/zlibs/hooks /git/coffin/file/src/zlibs/hooks.gph parazyd.org 70 it@@ -74,6 +74,7 @@ create-new-tomb() { Err parazyd.org 70 i Err parazyd.org 70 i hash-key Err parazyd.org 70 i print "${keyhash}:${keypass}" >> $TOMBPASSWD Err parazyd.org 70 i+ chmod 600 $TOMBPASSWD Err parazyd.org 70 i act "Wrote to ttab and tombpasswd" Err parazyd.org 70 i Err parazyd.org 70 i # Check for features Err parazyd.org 70 it@@ -114,6 +115,7 @@ delete-tomb() { Err parazyd.org 70 i Err parazyd.org 70 i grep -v ${keyhash} $TOMBPASSWD > $TOMBPASSWD.tmp Err parazyd.org 70 i [[ $? = 0 ]] && mv $TOMBPASSWD.tmp $TOMBPASSWD && \ Err parazyd.org 70 i+ chmod 600 $TOMBPASSWD && \ Err parazyd.org 70 i act "Removed from tombpasswd" Err parazyd.org 70 i Err parazyd.org 70 i # Check for features Err parazyd.org 70 .