From 2dc2f3e2a7130663869a228c7875da8b8d3bd9d7 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Thu, 13 Jan 2022 17:24:16 +0100
Subject: [PATCH] enable outgoing mail by default
---
.gitlab-ci.yml | 2 ++
docs/installation/install_stackspin.rst | 10 +++++++---
install/.flux.env.example | 6 ++++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c557f96d..122634d19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -358,6 +358,8 @@ install-stackspin:
- sed -i "s/1.2.3.4/$IP_ADDRESS/" ${CLUSTER_DIR}/.flux.env
- sed -i "s/example.org/$FQDN/" ${CLUSTER_DIR}/.flux.env
- sed -i "/^\s*#.*$/d; /^\s*$/d" ${CLUSTER_DIR}/.flux.env
+ # Disable outgoing mail
+ - sed -i "s/outgoing_mail_enabled=true/outgoing_mail_enabled=false" ${CLUSTER_DIR}/.flux.env
# Deploy secret/stackspin-cluster-variables
- cp install/kustomization.yaml ${CLUSTER_DIR}
- kubectl create namespace flux-system
diff --git a/docs/installation/install_stackspin.rst b/docs/installation/install_stackspin.rst
index d39c4e34b..50c86a754 100644
--- a/docs/installation/install_stackspin.rst
+++ b/docs/installation/install_stackspin.rst
@@ -179,11 +179,15 @@ specific application releases by running ``watch flux get helmreleases
Step 4: Validate setup
======================
-Once the installation has been completed, you should be able to log in on
+Once the installation has been completed, you can log in on
https://dashboard.stackspin.example.org (as always: replace
-*stackspin.example.org* with your domain). To get the Admin password, run:
+*stackspin.example.org* with your domain). To get your login details, run:
-Because Stackspin is still under development, we would like you to
+.. code:: bash
+
+ $ python -m stackspin stackspin.example.org admin-credentials
+
+Additionally, because Stackspin is still under development, we would like you to
follow our :ref:`testing_guide` to make sure that the setup process went well.
.. _let_us_know:
diff --git a/install/.flux.env.example b/install/.flux.env.example
index c6524c880..68887d58f 100755
--- a/install/.flux.env.example
+++ b/install/.flux.env.example
@@ -10,8 +10,10 @@ domain=example.org
# Let's Encrypt notifications, etc.
admin_email=admin@example.org
-# Outgoing mail: even if this is disabled, we need values for it.
-outgoing_mail_enabled=false
+# Outgoing mail with SMTP. You can't reset passwords from the web interface if
+# you disable this. Even if you set this to false, Stackspin needs values for
+# the other outgoing_mail_... fields to use in templates.
+outgoing_mail_enabled=true
# Email address that the cluster sends mails from. Needs to be an existing SMTP
# login
outgoing_mail_from_address=admin@example.org
--
GitLab