From 937dfbca8e2938ebe50380d72913869309df47e7 Mon Sep 17 00:00:00 2001
From: Daniel Meiburg <key@dmeiburg.de>
Date: Sun, 12 Feb 2023 23:03:06 +0100
Subject: [PATCH] Use unarmored env files

---
 gitea/.env.asc |  17 -----------------
 gitea/.env.gpg | Bin 0 -> 621 bytes
 post-receive   |  18 ++++++++++--------
 3 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 gitea/.env.asc
 create mode 100644 gitea/.env.gpg

diff --git a/gitea/.env.asc b/gitea/.env.asc
deleted file mode 100644
index 569bc1c..0000000
--- a/gitea/.env.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-hF4Dwv83pPvAyg4SAQdANBreaypls1udhziX+ECvymHPkt0b2P9ngH3sJI0Rjkcw
-Y2O074bKOLOqhamsBWeRbBrYtVAhJetY/PvsGh1sTEFtFdEXsrBIiSc7kDefAauM
-hQGMA992UAKl0QqkAQv9G1+GsPYfR46Rk690xx01YDVJOFcqzh5ePdSU9NazdmlU
-mJZb/Pw1y0swHhd23dfHphb4w4LFMbqPcYigKNr5u8H61OVkIYljsHvv8AUr5nJJ
-VJe9yRhOoUkI7rNzmOpHYtSAyaaiKGkR/LWIjMKEKIa4zJasJIaHvM5bp5wGhIuC
-q0EX0xFdZQvWlmrudzqYgxatcbFbvot9jvPH8ZqWBDdWTJ1OSbTWbFn9d1NM2xNY
-iTzBaHEUkhg9+rUp2RA8OtyelYcUX7xmT5QuoBFUACbg+JrXO27PQWIVaj6GKRLM
-RMNwmxReSR/hIai/yI32xkyGwF8USurN7URSgnnsqYEZNWmm/LX51PpMZBRvfvpq
-ixNudjN+t8eS+KAcQafU/CRADj12Zk3dfB+RF6YupPuFlrdqIcyPM6Lt9Q2OCI/4
-Jay+6BSKVQg+zhXde+yQE7DFFbyuzZqm5EYxfh3ts2iaBcCZ/yVU7XosgaMMSFv5
-yFMAZ/CL9g5BgCfB4iNT0nwBrssc7eQ2ApJajM6N8J+U75rOIDzL4lkz8dvw3S22
-L3dZgT9CpJXJADvTJhkTIY4scsG33WYF8gJCzpLdWvzviY0a378DiZhK7hypQVp+
-T+qRDxfd4zhDx19silhYFrhnCxwdcSPQhnohnGF+VBeztb2iDNObKpvbATkF
-=AVlt
------END PGP MESSAGE-----
diff --git a/gitea/.env.gpg b/gitea/.env.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..bbbc3522fca82b06015df19e2b620df5a70ed88b
GIT binary patch
literal 621
zcmV-z0+RiNUIW7aH>CT($_^3%2SC_e@WAt;t!R14N@Xr|9&qT0BD9;v3r)^{FmmDY
zi(W8%H__O*L~{^CUD(hCu|@e4nhmbrf*NPqtv2}l_<Jk*Im9X*?R<6;sg{iW;d*<8
z0gMCRc2EMP(F&vi3;$Ms&d`cI<cl!j!K1OZ8Nt7WiaYrLswN-dlF*aKc|s9h&SJJ`
zI^{!6hHaFsgFuSa4qmXPYj4+$Y)TfR_gShSLbxQl!)-B)_9zI4HZgKoF!y($hM9Ot
z3EH~^MZ!<fWHpO&7EzJbE0Nl@#X0gF+z)mVwn03)9HNT&OJBh}BF}fjetyYU`3-_G
zf`&51310|(-%IH8@B7eCTGYVr_5s$jZ6~JwR&l}Gv<s}*4AMe?7DB40&TK${_fM8S
z%dFO9<nQ~)mKffjUu5*Nz|dOr<1-O^#EUbBeJYKVR_}xdZMVz)279;T<6w=?FaJ0A
zt4p#qbK%0?sP9fLi&@ipiO<{793l=u$k<3vw*wq^rfW36`~-lk;AMRF265mYhm*96
zx3rfC;ijHJX{H>PFuw`ZklBybWYFqL1U_!(UABL;8%r75nd9f<SI;3Vx-+l-QFlO>
zR$ZuKbY->cRIJIA+3e=T#p!T`<7aEmX*$AO7=3Gn-zU<10eb^s#+{%sHfG$D13xq8
zyEvSwg)o<TlKBondW^3zXZGmXzowS=>JWtsB+t$F7AIn0L;b}HZ~>?a!^|O~2E^$@
zV#ZK$PdyXUhW|V?P@K6PoRHg;eZhXtF3v!RJ=;Vx4RmGa8E@0BMw=k1ZvdJ|X7A93
HjH@6BG)O+?

literal 0
HcmV?d00001

diff --git a/post-receive b/post-receive
index bafbabe..09d246f 100755
--- a/post-receive
+++ b/post-receive
@@ -3,26 +3,28 @@
 # This hook updates the working repository on dmeiburg.de
 # It is meant to update the docker configs of my servers.
 
-echo "post-receive hook started"
 WORK_TREE=~/container
 
 # get changed folders
-changed=`GIT_WORK_TREE=$WORK_TREE git diff --dirstat=files,0 HEAD | cut -f3 -d' '`
-echo "change apps:"
-echo $changed
+changed=`GIT_WORK_TREE=$WORK_TREE git diff --dirstat=files,0 HEAD | awk '{print $NF}' `
+
+[ -n "$changed" ] && echo -e "Changed apps:\n$changed\n"
 
 # update files in working direcotry
 GIT_WORK_TREE=~/container git checkout -f
 
 # restart changed docker compose stacks
 for app in $changed; do
-  echo "restarting $app"
 	cd $WORK_TREE/$changed
+	echo "Update $app"
 
-	# decrypt .env
-	[ -f .env.asc ] && gpg -d env.asc > .env
-
+	# remove old .env if no .env.gpg is supplied
+	[ -f .env ] && [ -f .env.gpg ] || rm .env
+	# decrypt .env.gpg
+	[ -f .env.gpg ] && gpg -d .env.gpg > .env
+	
 	docker compose down	
 	docker compose up -d
+	echo ""
 done
 exit