From a35d78be37c5de558d8099b2060764a12da8dda9 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 2 Jan 2024 17:06:49 +0100 Subject: [PATCH 1/3] Handle new parameters --- roles/happydomain/defaults/main.yml | 6 +++++- roles/happydomain/tasks/docker.yml | 4 ++++ roles/happydomain/templates/happydomain.conf.j2 | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/roles/happydomain/defaults/main.yml b/roles/happydomain/defaults/main.yml index c2e7202..3f8cfce 100644 --- a/roles/happydomain/defaults/main.yml +++ b/roles/happydomain/defaults/main.yml @@ -13,20 +13,24 @@ happydomain_baseurl: "" happydomain_custom_body_html: "" happydomain_custom_head_html: "" happydomain_default_nameserver: "127.0.0.1:53" +happydomain_disable_providers_edit: "false" happydomain_endpoint: ":8081" happydomain_external_auth: "" happydomain_external_url: "http://localhost:8081" +happydomain_hide_feedback_button: "false" happydomain_jwt_secret_key: "" -happydomain_storage_leveldb_path: "./happydomain.db" happydomain_mail_from: "happyDomain " happydomain_mail_smtp_host: "" happydomain_mail_smtp_port: "465" happydomain_mail_smtp_username: "" happydomain_mail_smtp_password: "" happydomain_mail_smtp_tls_no_verify: "" +happydomain_msg_header_text: "" +happydomain_msg_header_color: "danger" happydomain_newsletter_server_url: "" happydomain_newsletter_id: "" happydomain_no_auth: "false" happydomain_ovh_application_key: "" happydomain_ovh_application_secret: "" happydomain_storage_engine: "leveldb" +happydomain_storage_leveldb_path: "./happydomain.db" diff --git a/roles/happydomain/tasks/docker.yml b/roles/happydomain/tasks/docker.yml index d1fbbc8..83c8e51 100644 --- a/roles/happydomain/tasks/docker.yml +++ b/roles/happydomain/tasks/docker.yml @@ -16,10 +16,14 @@ HAPPYDOMAIN_BASEURL: "{{ happydomain_baseurl }}" HAPPYDOMAIN_CUSTOM_HEAD_HTML: "{{ happydomain_custom_head_html }}" HAPPYDOMAIN_DEFAULT_NS: "{{ happydomain_default_nameserver }}" + HAPPYDOMAIN_DISABLE_PROVIDERS_EDIT: "{{ happydomain_disable_providers_edit }}" HAPPYDOMAIN_EXTERNAL_AUTH: "{{ happydomain_external_auth }}" HAPPYDOMAIN_EXTERNALURL: "{{ happydomain_external_url }}" + HAPPYDOMAIN_HIDE_FEEDBACK_BUTTON: "{{ happydomain_hide_feedback_button }}" HAPPYDOMAIN_JWT_SECRET_KEY: "{{ happydomain_jwt_secret_key }}" HAPPYDOMAIN_LEVELDB_PATH: "{{ happydomain_storage_leveldb_path }}" + HAPPYDOMAIN_MSG_HEADER_TEXT: "{{ happydomain_msg_header_text }}" + HAPPYDOMAIN_MSG_HEADER_COLOR: "{{ happydomain_msg_header_color }}" HAPPYDOMAIN_NEWSLETTER_SERVER_URL: "{{ happydomain_newsletter_server_url }}" HAPPYDOMAIN_NEWSLETTER_ID: "{{ happydomain_newsletter_id }}" HAPPYDOMAIN_MAIL_FROM: "{{ happydomain_mail_from }}" diff --git a/roles/happydomain/templates/happydomain.conf.j2 b/roles/happydomain/templates/happydomain.conf.j2 index 3c7832e..7613276 100644 --- a/roles/happydomain/templates/happydomain.conf.j2 +++ b/roles/happydomain/templates/happydomain.conf.j2 @@ -16,6 +16,9 @@ custom-body-html={{ happydomain_custom_body_html }} {% if happydomain_default_nameserver is defined and happydomain_default_nameserver != "" %} default-ns={{ happydomain_default_nameserver }} {% endif %} +{% if happydomain_disable_providers_edit is defined and happydomain_disable_providers_edit != "" %} +disable-providers-edit={{ happydomain_disable_providers_edit }} +{% endif %} {% if happydomain_external_auth is defined and happydomain_external_auth != "" %} external-auth={{ happydomain_external_auth }} {% endif %} @@ -25,6 +28,9 @@ externalurl={{ happydomain_external_url }} {% if happydomain_jwt_secret_key is defined and happydomain_jwt_secret_key != "" %} jwt-secret-key={{ happydomain_jwt_secret_key }} {% endif %} +{% if happydomain_hide_feedback_button is defined and happydomain_hide_feedback_button %} +hide-feedback-button={{ happydomain_hide_feedback_button }} +{% endif %} leveldb-path={{ happydomain_storage_leveldb_path | default(happydomain_data_dir + '/happydomain.db') }} {% if happydomain_mail_from is defined and happydomain_mail_from != "" %} mail-from={{ happydomain_mail_from }} @@ -44,6 +50,12 @@ mail-smtp-password={{ happydomain_mail_smtp_password }} {% if happydomain_mail_smtp_tls_no_verify is defined and happydomain_mail_smtp_tls_no_verify != "" %} mail-smtp-tls-no-verify={{ happydomain_mail_smtp_tls_no_verify }} {% endif %} +{% if happydomain_msg_header_text is defined and happydomain_msg_header_text != "" %} +msg-header-text={{ happydomain_msg_header_text }} +{% endif %} +{% if happydomain_msg_header_color is defined and happydomain_msg_header_color != "" %} +msg-header-color={{ happydomain_msg_header_color }} +{% endif %} {% if happydomain_newsletter_server_url is defined and happydomain_newsletter_server_url != "" %} newsletter-server-url={{ happydomain_newsletter_server_url }} {% endif %} From 67d954473a08c6059e8aaf941caf0845439f46e2 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 8 Jan 2024 18:52:44 +0100 Subject: [PATCH 2/3] Use mounts instead of volumes + exposes volumes and network --- roles/happydomain/defaults/main.yml | 4 ++++ roles/happydomain/tasks/docker.yml | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/happydomain/defaults/main.yml b/roles/happydomain/defaults/main.yml index 3f8cfce..4dea191 100644 --- a/roles/happydomain/defaults/main.yml +++ b/roles/happydomain/defaults/main.yml @@ -7,6 +7,10 @@ happydomain_version: "latest" happydomain_data_dir: "" # defaults to /var/lib/happydomain.{{ instance_name }} if not filled happydomain_inner_data_dir: "/data" +happydomain_docker_network: "default" +happydomain_docker_mounts: + - source: "{% if happydomain_data_dir != '' %}{{ happydomain_data_dir }}{% else %}/var/lib/{% if instance_name != 'happyDomain' %}happydomain.{% endif %}{{ instance_name }}{% endif %}" + target: "{{ happydomain_inner_data_dir }}" happydomain_admin_bind: "./happydomain.sock" happydomain_baseurl: "" diff --git a/roles/happydomain/tasks/docker.yml b/roles/happydomain/tasks/docker.yml index 83c8e51..98b4bb7 100644 --- a/roles/happydomain/tasks/docker.yml +++ b/roles/happydomain/tasks/docker.yml @@ -4,12 +4,14 @@ name: "{{ instance_name }}" image: "happydomain/happydomain:{{ happydomain_version }}" pull: true - volumes: - - "{% if happydomain_data_dir != '' %}{{ happydomain_data_dir }}{% else %}/var/lib/{% if instance_name != 'happyDomain' %}happydomain.{% endif %}{{ instance_name }}{% endif %}:{{ happydomain_inner_data_dir }}" state: started + restart: "{{ happydomain_docker_restart | default('no') }}" restart_policy: unless-stopped memory: 256M memory_swap: 512M + mounts: "{{ happydomain_docker_mounts }}" + tmpfs: "{{ happydomain_docker_tmpfs | default([]) }}" + networks: "{{ happydomain_docker_network | default({}) }}" env: HAPPYDOMAIN_ADMIN_BIND: "{{ happydomain_admin_bind }}" HAPPYDOMAIN_BIND: "0.0.0.0:8081" From a69b4364fdbec14d32e6065062bccd4cda1d8ea7 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 8 Jan 2024 18:53:34 +0100 Subject: [PATCH 3/3] Prepare 0.4.2 --- galaxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index 2b60f2a..ac93ae9 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ --- namespace: happydns name: happydomain -version: 0.4.1 +version: 0.4.2 readme: README.md authors: - happyDomain Team