From eadb17d8c1270b0f8c87613074bfd7449640cfe3 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:50:23 +0200 Subject: [PATCH] Get the env loading right for gitea --- second.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/second.py b/second.py index 4bc7492..f769cd5 100644 --- a/second.py +++ b/second.py @@ -104,10 +104,14 @@ def stack_deploy(app_name, stack_name, env): def get_loaded_env(app_name, request_form): """Load environment from install form for compose.yml injection.""" - environment = environ.copy() + env = environ.copy() + for key in request_form.keys(): - environment[key.upper()] = request.form[key] - return environment + env[key.upper()] = request.form[key] + + env["LETS_ENCRYPT_ENV"] = "staging" + + return env class GiteaInstallForm(FlaskForm): @@ -136,7 +140,7 @@ class GiteaInstallForm(FlaskForm): secret_key = PasswordField( "Secret key", validators=[DataRequired(), Length(min=64)], ) - ssh_port = StringField("SSH port", default="2222") + ssh_host_port = StringField("SSH host port", default="2225") @app.route("/")