summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał 'rysiek' Woźniak <rysiek@hackerspace.pl>2017-02-23 16:59:31 +0100
committerMichał 'rysiek' Woźniak <rysiek@hackerspace.pl>2017-02-23 16:59:31 +0100
commitdc8f4ee10286aba011d1712473ad41da1bd376fd (patch)
tree1df8de3ea6eb22028b349a1c4f7439fa973d4c5d
parentd6cf29c9ec1f1709b321367f9fae5a7ec24bc28b (diff)
downloadkuvert-dc8f4ee10286aba011d1712473ad41da1bd376fd.tar.gz
kuvert-dc8f4ee10286aba011d1712473ad41da1bd376fd.tar.bz2
kuvert-dc8f4ee10286aba011d1712473ad41da1bd376fd.zip
more changes in dot-kuvert.docker; bugfix in run.sh
-rw-r--r--dot-kuvert.docker26
-rw-r--r--run.sh6
2 files changed, 16 insertions, 16 deletions
diff --git a/dot-kuvert.docker b/dot-kuvert.docker
index eb183d2..fb4363d 100644
--- a/dot-kuvert.docker
+++ b/dot-kuvert.docker
@@ -34,31 +34,31 @@ preamble f
# ssl-cert, ssl-key, ssl-ca;
# authenticating as msuser, mspass
#
-# msserver smtp.example.com
-# msport 587
-# ssl starttls
+msserver smtp.example.com
+msport 587
+ssl starttls
# ssl-key mycerts/my.key.pem
# ssl-cert mycerts/my.cert.pem
-# msuser smtp-username
-# mspass smtp-password
-# mspass-from-query-secret f
+msuser kuvert@example.com
+mspass smtp-password
+mspass-from-query-secret f
#
# 2. by using the msp program
#
-msp /usr/sbin/sendmail -om -oi -oem
+#msp /usr/sbin/sendmail -om -oi -oem
can-detach f
-# maport 2587
-# ma-user yourname
-# ma-pass somethingSECRET
+maport 2587
+ma-user kuvert
+ma-pass ChangeMe
defaultaction fallback-all
alwaystrust t
-use-agent t
-query-secret /usr/bin/q-agent get %s
-flush-secret /usr/bin/q-agent delete %s
+use-agent f
+#query-secret /usr/bin/q-agent get %s
+#flush-secret /usr/bin/q-agent delete %s
# action specifications for recipients
# are given with some leading whitespace
diff --git a/run.sh b/run.sh
index 60f73e5..f68f4a2 100644
--- a/run.sh
+++ b/run.sh
@@ -127,9 +127,9 @@ chown -R "$KUVERT_USER":"$KUVERT_GROUP" "$KUVERT_LOGS_DIR"
chown -R "$KUVERT_USER":"$KUVERT_GROUP" "$KUVERT_QUEUE_DIR"
chown -R "$KUVERT_USER":"$KUVERT_GROUP" "$KUVERT_CONFIG_DIR"
echo " +-- changing permissions..."
-chmod -R u=rwX,g=rX,o= "$KUVERT_USER":"$KUVERT_GROUP" "$KUVERT_LOGS_DIR"
-chmod -R u=rwX,g=rX,o= "$KUVERT_USER":"$KUVERT_GROUP" "$KUVERT_QUEUE_DIR"
-chmod -R u=rwX,g=rX,o= "$KUVERT_USER":"$KUVERT_GROUP" "$KUVERT_CONFIG_DIR"
+chmod -R u=rwX,g=rX,o= "$KUVERT_LOGS_DIR"
+chmod -R u=rwX,g=rX,o= "$KUVERT_QUEUE_DIR"
+chmod -R u=rwX,g=rX,o= "$KUVERT_CONFIG_DIR"
#
# kuvert explicitly expects the config file to be ~/.kuvert, so we need to link it to the actual config file,