From c99d1f62a2024e60dc90d023d654f9b432af3e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Tue, 3 May 2022 15:36:49 +0200
Subject: [PATCH] [UPD] README and variables in defaults
---
README.md | 5 +++--
defaults/main.yml | 4 ++++
templates/nextcloud.yaml.j2 | 26 +++++++++++++-------------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 45e67a4..95a4367 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,9 @@ Variables from default directory :
* cloud_url: URL on which NextCloud will be listening
* cloud_db_root: Database root password
* cloud_db_pass: Database password
-* cloud_admin_user: Owncloud Admin user
-* cloud_admin_pass: Owncloud Admin password
+* cloud_admin_user: NextCloud Admin user
+* cloud_admin_pass: NextCloud Admin password
+* extra_cloud_urls: Allows NextCloud to connect to listed URLS (OPTIONAL whitelists)
* Collaborative edition
* Collabora :
diff --git a/defaults/main.yml b/defaults/main.yml
index ec08f6f..de05fcc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,6 +12,10 @@ cloud_db_pass: "veryUnsecurePassToBeModified"
## NextCloud Admin User / Password
cloud_admin_user: "admin"
cloud_admin_pass: "veryUnsecureAdminPassToBeModified"
+## OPTIONAL - For allowing NextCloud to reach extra URLs
+# extra_cloud_urls:
+# - url: "mail.ovh.net"
+# port: "465 587"
## OPTIONAL - Collabora and/or OnlyOffice deployment options
cloud_collabora: false
diff --git a/templates/nextcloud.yaml.j2 b/templates/nextcloud.yaml.j2
index 9e6d398..2c2fb48 100644
--- a/templates/nextcloud.yaml.j2
+++ b/templates/nextcloud.yaml.j2
@@ -129,19 +129,19 @@ services:
restart: unless-stopped
{% for server in extra_cloud_urls %}
- {{ server.url }}:
- image: tecnativa/whitelist
- container_name: nextcloud_{{ server.url }}
- networks:
- proxy:
- aliases:
- - "{{ server.url }}"
- public:
- environment:
- PORT: "{{ server.port }}"
- TARGET: "{{ server.url }}"
- PRE_RESOLVE: 1
- restart: unless-stopped
+ {{ server.url }}:
+ image: tecnativa/whitelist
+ container_name: nextcloud_{{ server.url }}
+ networks:
+ proxy:
+ aliases:
+ - "{{ server.url }}"
+ public:
+ environment:
+ PORT: "{{ server.port }}"
+ TARGET: "{{ server.url }}"
+ PRE_RESOLVE: 1
+ restart: unless-stopped
{% endfor %}
{% endif %}
--
GitLab