supervisord: fix entrypoint and sogod path

sonroyaalmerol · May 15, 2024 · 7ee784a · 7ee784a
1 parent dcb25c8
commit 7ee784a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -2,15 +2,16 @@
 
 . /usr/share/GNUstep/Makefiles/GNUstep.sh
 
-#Solve libssl bug for Mail View
-if [[ -z "${LD_PRELOAD}" ]]; then
-	LIBSSL_LOCATION=$(find / -type f -name "libssl.so.*" -print -quit);echo "LD_PRELOAD=$LIBSSL_LOCATION" >> /etc/default/sogo
-	echo "LD_LIBRARY_PATH=/usr/local/lib/sogo:/usr/local/lib:$LD_LIBRARY_PATH" >> /etc/default/sogo
-	export LD_PRELOAD=$LIBSSL_LOCATION
+# Solve libssl bug for Mail View
+if [ -z "$LD_PRELOAD" ]; then
+  LIBSSL_LOCATION=$(find / -type f -name "libssl.so.*" -print -quit)
+  echo "LD_PRELOAD=$LIBSSL_LOCATION" >> /etc/default/sogo
+  echo "LD_LIBRARY_PATH=/usr/local/lib/sogo:/usr/local/lib:$LD_LIBRARY_PATH" >> /etc/default/sogo
+  export LD_PRELOAD=$LIBSSL_LOCATION
 else
-	echo "LD_PRELOAD=$LD_PRELOAD" >> /etc/default/sogo
-	echo "LD_LIBRARY_PATH=/usr/local/lib/sogo:/usr/local/lib:$LD_LIBRARY_PATH" >> /etc/default/sogo
-	export LD_PRELOAD=$LD_PRELOAD
+  echo "LD_PRELOAD=$LD_PRELOAD" >> /etc/default/sogo
+  echo "LD_LIBRARY_PATH=/usr/local/lib/sogo:/usr/local/lib:$LD_LIBRARY_PATH" >> /etc/default/sogo
+  export LD_PRELOAD=$LD_PRELOAD
 fi
 
 # Set process UID and GID at runtime

diff --git a/supervisord.conf b/supervisord.conf
@@ -5,7 +5,7 @@ logfile=/dev/null
 logfile_maxbytes=0
 
 [program:sogo]
-command=/bin/bash -c '/usr/sbin/sogod -WONoDetach YES -WOLogFile /var/log/sogo/sogo.log'
+command=/bin/bash -c '/usr/local/sbin/sogod -WONoDetach YES -WOLogFile /var/log/sogo/sogo.log'
 user=sogo
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0