- {{template "repo/settings/hook_gitea" .}}
- {{template "repo/settings/hook_gogs" .}}
- {{template "repo/settings/hook_slack" .}}
- {{template "repo/settings/hook_discord" .}}
- {{template "repo/settings/hook_dingtalk" .}}
+ {{template "repo/settings/webhook/gitea" .}}
+ {{template "repo/settings/webhook/gogs" .}}
+ {{template "repo/settings/webhook/slack" .}}
+ {{template "repo/settings/webhook/discord" .}}
+ {{template "repo/settings/webhook/dingtalk" .}}
- {{template "repo/settings/hook_history" .}}
+ {{template "repo/settings/webhook/history" .}}
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index 9052bf6146..825b1e941d 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -5,7 +5,7 @@
{{template "org/settings/navbar" .}}
- {{template "repo/settings/hook_list" .}}
+ {{template "repo/settings/webhook/list" .}}
From b299d7bceb808e2dc4aa2c92ba5310e73c8508a8 Mon Sep 17 00:00:00 2001
From: Fluf <36822577+flufmonster@users.noreply.github.com>
Date: Wed, 23 May 2018 11:31:12 -0400
Subject: [PATCH 6/7] Add Environment Variables to Docker template (#4012)
* Add disable registration as an environment variable
for docker
* Add REQUIRE_SIGNIN_VIEW as env var to docker
* Add variables to template
* Update docker docs
---
docker/etc/s6/gitea/setup | 2 ++
docker/etc/templates/app.ini | 4 ++++
docs/content/doc/installation/with-docker.en-us.md | 2 ++
3 files changed, 8 insertions(+)
diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup
index 6ca9b82123..500cca584c 100755
--- a/docker/etc/s6/gitea/setup
+++ b/docker/etc/s6/gitea/setup
@@ -35,6 +35,8 @@ if [ ! -f /data/gitea/conf/app.ini ]; then
DB_USER=${DB_USER:-"root"} \
DB_PASSWD=${DB_PASSWD:-""} \
INSTALL_LOCK=${INSTALL_LOCK:-"false"} \
+ DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-"false"} \
+ REQUIRE_SIGNIN_VIEW=${REQUIRE_SIGNIN_VIEW:-"false"} \
SECRET_KEY=${SECRET_KEY:-""} \
envsubst < /etc/templates/app.ini > /data/gitea/conf/app.ini
fi
diff --git a/docker/etc/templates/app.ini b/docker/etc/templates/app.ini
index 2375f8f533..9e0a3dd5c8 100644
--- a/docker/etc/templates/app.ini
+++ b/docker/etc/templates/app.ini
@@ -38,3 +38,7 @@ ROOT_PATH = /data/gitea/log
[security]
INSTALL_LOCK = $INSTALL_LOCK
SECRET_KEY = $SECRET_KEY
+
+[service]
+DISABLE_REGISTRATION = $DISABLE_REGISTRATION
+REQUIRE_SIGNIN_VIEW = $REQUIRE_SIGNIN_VIEW
diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md
index 9494fd6037..8f393f16d0 100644
--- a/docs/content/doc/installation/with-docker.en-us.md
+++ b/docs/content/doc/installation/with-docker.en-us.md
@@ -243,6 +243,8 @@ You can configure some of Gitea's settings via environment variables:
* `DB_PASSWD`: **"