diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ad1bd2a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab
+tab_width = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/README.adoc b/README.adoc
index 9c86652..2ae5d71 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,6 @@
/////
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
/////
@@ -132,6 +132,6 @@ $ ansible-playbook -i production site.yml
[literal.small]
.....
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
.....
diff --git a/bootstrap.adoc b/bootstrap.adoc
index 820fd56..8450238 100644
--- a/bootstrap.adoc
+++ b/bootstrap.adoc
@@ -1,6 +1,6 @@
/////
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
/////
@@ -538,6 +538,6 @@ I decided to do a clean import, especially since I configured Dovecot in a way
[literal.small]
.....
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
.....
diff --git a/roles/_maintenance_start/tasks/main.yml b/roles/_maintenance_start/tasks/main.yml
index 864fd8d..88b641d 100644
--- a/roles/_maintenance_start/tasks/main.yml
+++ b/roles/_maintenance_start/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: stop some services
diff --git a/roles/_maintenance_stop/tasks/main.yml b/roles/_maintenance_stop/tasks/main.yml
index da1cbd5..31be02a 100644
--- a/roles/_maintenance_stop/tasks/main.yml
+++ b/roles/_maintenance_stop/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: stop again services that may got started by handlers
diff --git a/roles/acme_back/files/dehydrated.timer b/roles/acme_back/files/dehydrated.timer
index 2c2211e..41b09aa 100644
--- a/roles/acme_back/files/dehydrated.timer
+++ b/roles/acme_back/files/dehydrated.timer
@@ -1,5 +1,5 @@
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
[Unit]
diff --git a/roles/acme_back/handlers/main.yml b/roles/acme_back/handlers/main.yml
index 9325b2b..a6fc7e4 100644
--- a/roles/acme_back/handlers/main.yml
+++ b/roles/acme_back/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart dehydrated.service
diff --git a/roles/acme_back/meta.OK/main.yml b/roles/acme_back/meta.OK/main.yml
index a7b2107..d48b258 100644
--- a/roles/acme_back/meta.OK/main.yml
+++ b/roles/acme_back/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/acme_back/tasks/main.yml b/roles/acme_back/tasks/main.yml
index fa614f2..b74a518 100644
--- a/roles/acme_back/tasks/main.yml
+++ b/roles/acme_back/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/acme_back/templates/dehydrated.config.j2 b/roles/acme_back/templates/dehydrated.config.j2
index c6b2263..d7a9ef7 100644
--- a/roles/acme_back/templates/dehydrated.config.j2
+++ b/roles/acme_back/templates/dehydrated.config.j2
@@ -1,5 +1,5 @@
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
#CA="https://acme-staging.api.letsencrypt.org/directory"
diff --git a/roles/acme_back/templates/hook.sh.j2 b/roles/acme_back/templates/hook.sh.j2
index 41baf79..e86e25d 100644
--- a/roles/acme_back/templates/hook.sh.j2
+++ b/roles/acme_back/templates/hook.sh.j2
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
RSH=/usr/local/bin/{{DMZ}}
diff --git a/roles/acme_front/handlers/main.yml b/roles/acme_front/handlers/main.yml
index 8f91f95..f09e84f 100644
--- a/roles/acme_front/handlers/main.yml
+++ b/roles/acme_front/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart nginx.service
diff --git a/roles/acme_front/meta.OK/main.yml b/roles/acme_front/meta.OK/main.yml
index 7f3de13..8e93caa 100644
--- a/roles/acme_front/meta.OK/main.yml
+++ b/roles/acme_front/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/acme_front/tasks/main.yml b/roles/acme_front/tasks/main.yml
index 8207a3b..00f08b6 100644
--- a/roles/acme_front/tasks/main.yml
+++ b/roles/acme_front/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: ensure /srv/acme exists
diff --git a/roles/aur.inc/tasks/install.yml b/roles/aur.inc/tasks/install.yml
index d6a70c3..1bcfa19 100644
--- a/roles/aur.inc/tasks/install.yml
+++ b/roles/aur.inc/tasks/install.yml
@@ -1,9 +1,9 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
-# mandatory parameters: pkg_name, pre_cmd, aur_user
+# mandatory parameters: pkg_name, pre_cmd, aur_name, aur_home
- name: AUR → {{pkg_name}} → read current version
shell: |
@@ -14,7 +14,7 @@
- name: AUR → {{pkg_name}} → get metadata from AurJson
uri:
url: https://aur.archlinux.org/rpc/?v=5&type=info&arg={{pkg_name | mandatory}}
- connection: local
+ delegate_to: localhost
register: aurjson
changed_when: false
@@ -22,7 +22,7 @@
get_url:
url: https://aur.archlinux.org{{aurjson.json.results[0].URLPath}}
dest: /tmp/
- connection: local
+ delegate_to: localhost
when:
- (aurjson.json.results[0].Version != (pacmanQi.stdout | default()))
register: aur_recipe
@@ -45,6 +45,8 @@
args:
chdir: /var/tmp/{{aurjson.json.results[0].PackageBase}}
when: pre_cmd
+ environment:
+ HOME: "{{aur_home}}"
register: debugCustom
- name: AUR → {{pkg_name}} → see custom pre-processing commands’ result
@@ -86,6 +88,8 @@
- (pacman_output.stdout is defined)
- (pacman_output.stdout.find('there is nothing to do') == -1)
+ environment:
+ HOME: "{{aur_home}}"
when:
- (realVersion.stdout != (pacmanQi.stdout | default()))
@@ -97,7 +101,7 @@
changed_when: false
become: true
- become_user: "{{aur_user}}"
+ become_user: "{{aur_name}}"
when:
- (aurjson.json.results[0].Version != (pacmanQi.stdout | default()))
@@ -106,6 +110,6 @@
file:
path: '{{aur_recipe.dest}}'
state: absent
- connection: local
+ delegate_to: localhost
become: false
changed_when: false
diff --git a/roles/aur.inc/tasks/main.yml b/roles/aur.inc/tasks/main.yml
index af78355..fd43350 100644
--- a/roles/aur.inc/tasks/main.yml
+++ b/roles/aur.inc/tasks/main.yml
@@ -1,28 +1,61 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
# mandatory parameters:
# - pkg_names (json-encoded list)
# - aur_user
-- name: AUR → base-devel needed while building
- become: false
- command: |
- pacman -S --noconfirm --noprogressbar --asdeps --needed base-devel
+- name: AUR → read (or create) requested HOME while running AUR tasks
+ shell: |
+ case "$aur_requested_home" in
+ '') printf '%s' "$HOME" ;;
+ '!mktemp') sudo -u "$aur_user_name" mktemp -d /tmp/AUR-TEMP-HOME-XXXX ;;
+ *) printf '%s' "$aur_requested_home" ;;
+ esac
+ environment:
+ aur_requested_home: "{{(aur_user is mapping) | ternary(aur_user.home, '')}}"
+ aur_user_name: "{{(aur_user is mapping) | ternary(aur_user.name, aur_user)}}"
+ register: requestedHome
changed_when: false
-- name: AUR → proceed with installation
+- name: AUR → run AUR tasks
block:
- - name: AUR → installation
- include_tasks: install.yml
- vars:
- pkg_name: "{{(item is mapping) | ternary(item.pkg, item)}}"
- pre_cmd: "{{(item is mapping) | ternary(item.pre, '')}}"
- with_items: "{{packages}}"
- always:
- - name: AUR → remove base-devel and dependencies
- shell: |
- pacman -Rns --noconfirm --noprogressbar $(pacman -Qtdqg base-devel) || true
+
+ - name: AUR → see effective HOME
+ debug:
+ var: requestedHome
+ changed_when: false
+
+ - name: AUR → base-devel needed while building
+ become: false
+ command: |
+ pacman -S --noconfirm --noprogressbar --asdeps --needed base-devel
+ changed_when: false
+
+ - name: AUR → proceed with installation
+ block:
+ - name: AUR → installation
+ include_tasks: install.yml
+ vars:
+ aur_name: "{{(aur_user is mapping) | ternary(aur_user.name, aur_user)}}"
+ aur_home: "{{requestedHome.stdout}}"
+ pkg_name: "{{(item is mapping) | ternary(item.pkg, item)}}"
+ pre_cmd: "{{(item is mapping) | ternary(item.pre, '')}}"
+ with_items: "{{packages}}"
+ always:
+ - name: AUR → remove base-devel and dependencies
+ shell: |
+ pacman -Rns --noconfirm --noprogressbar base-devel || true
+ changed_when: false
+
+ always:
+ - name: AUR → remove temporary HOME
+ file:
+ path: "{{requestedHome.stdout}}"
+ state: absent
+ when:
+ - (aur_user is mapping)
+ - (aur_user.home == '!mktemp')
changed_when: false
diff --git a/roles/cleanupdate/meta.OK/main.yml b/roles/cleanupdate/meta.OK/main.yml
index a03553a..8a1f183 100644
--- a/roles/cleanupdate/meta.OK/main.yml
+++ b/roles/cleanupdate/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/cleanupdate/tasks/main.yml b/roles/cleanupdate/tasks/main.yml
index 7e03e5b..51c1c6a 100644
--- a/roles/cleanupdate/tasks/main.yml
+++ b/roles/cleanupdate/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/ddclient.inc/meta.OK/main.yml b/roles/ddclient.inc/meta.OK/main.yml
index 511dd25..69e59c7 100644
--- a/roles/ddclient.inc/meta.OK/main.yml
+++ b/roles/ddclient.inc/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/ddclient.inc/tasks/main.yml b/roles/ddclient.inc/tasks/main.yml
index 1d0240a..9fcbce0 100644
--- a/roles/ddclient.inc/tasks/main.yml
+++ b/roles/ddclient.inc/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/ddclient_FreeDNS_example/handlers/main.yml b/roles/ddclient_FreeDNS_example/handlers/main.yml
index d34a94a..f91d36a 100644
--- a/roles/ddclient_FreeDNS_example/handlers/main.yml
+++ b/roles/ddclient_FreeDNS_example/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart ddclient@fdns.service
diff --git a/roles/ddclient_FreeDNS_example/meta.OK/main.yml b/roles/ddclient_FreeDNS_example/meta.OK/main.yml
index a03553a..8a1f183 100644
--- a/roles/ddclient_FreeDNS_example/meta.OK/main.yml
+++ b/roles/ddclient_FreeDNS_example/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/ddclient_FreeDNS_example/tasks/main.yml b/roles/ddclient_FreeDNS_example/tasks/main.yml
index 77ae82b..c3ee653 100644
--- a/roles/ddclient_FreeDNS_example/tasks/main.yml
+++ b/roles/ddclient_FreeDNS_example/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: initialize the ddclient software
diff --git a/roles/ddclient_HE_example/handlers/main.yml b/roles/ddclient_HE_example/handlers/main.yml
index 19a00b1..83ad548 100644
--- a/roles/ddclient_HE_example/handlers/main.yml
+++ b/roles/ddclient_HE_example/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart ddclient@henet.service
diff --git a/roles/ddclient_HE_example/meta.OK/main.yml b/roles/ddclient_HE_example/meta.OK/main.yml
index f5b99db..33b9a1e 100644
--- a/roles/ddclient_HE_example/meta.OK/main.yml
+++ b/roles/ddclient_HE_example/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/ddclient_HE_example/tasks/main.yml b/roles/ddclient_HE_example/tasks/main.yml
index 485de4e..68a6261 100644
--- a/roles/ddclient_HE_example/tasks/main.yml
+++ b/roles/ddclient_HE_example/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: initialize the ddclient software
diff --git a/roles/dmz_dotclear_front/handlers/main.yml b/roles/dmz_dotclear_front/handlers/main.yml
index 8f91f95..f09e84f 100644
--- a/roles/dmz_dotclear_front/handlers/main.yml
+++ b/roles/dmz_dotclear_front/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart nginx.service
diff --git a/roles/dmz_dotclear_front/meta.OK/main.yml b/roles/dmz_dotclear_front/meta.OK/main.yml
index 7f3de13..8e93caa 100644
--- a/roles/dmz_dotclear_front/meta.OK/main.yml
+++ b/roles/dmz_dotclear_front/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/dmz_dotclear_front/tasks/main.yml b/roles/dmz_dotclear_front/tasks/main.yml
index 0fb982b..c91b3ae 100644
--- a/roles/dmz_dotclear_front/tasks/main.yml
+++ b/roles/dmz_dotclear_front/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: make sure the path to dotclear exists
@@ -13,7 +13,7 @@
get_url:
url: 'http://download.dotclear.org/latest.tar.gz'
dest: /tmp/
- connection: local
+ delegate_to: localhost
register: targz
changed_when: false
diff --git a/roles/dmz_dotclear_front/templates/config.php.j2 b/roles/dmz_dotclear_front/templates/config.php.j2
index 484003c..63e926d 100644
--- a/roles/dmz_dotclear_front/templates/config.php.j2
+++ b/roles/dmz_dotclear_front/templates/config.php.j2
@@ -1,6 +1,6 @@
pacstrap -c -d {{front_dir}}
$(
- pacman -Qg base
- | grep -vE
- ' (bzip2|dhcpcd|gzip|licenses|linux|lvm2|mdadm|pciutils|reiserfsprogs|systemd-sysvcompat|texinfo|usbutils|xfsprogs)$'
- | cut -d' ' -f2
+ LANG=C pacman -Si base
+ | sed -nr 's/^Depends[^:]*: *//;t ok;b;: ok;s/ +/\n/g;p;q'
+ | grep -vxE
+ 'bzip2|dhcpcd|gzip|licenses|linux|lvm2|mdadm|pciutils|reiserfsprogs|systemd-sysvcompat|texinfo|usbutils|xfsprogs'
)
busybox openssh python etckeeper
args:
@@ -55,6 +55,8 @@
arch-chroot {{front_dir}} /usr/bin/busybox --install
args:
creates: "{{front_dir}}/usr/bin/ash"
+ when:
+ - (arch.changed)
- name: … but not for some binaries
file:
diff --git a/roles/front/templates/DMZ.j2 b/roles/front/templates/DMZ.j2
index 5399a67..8e99081 100644
--- a/roles/front/templates/DMZ.j2
+++ b/roles/front/templates/DMZ.j2
@@ -2,7 +2,7 @@
# $1: bash script; $2…: arguments (bash -c "…script…" 'bash' …arguments…)
#
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
cmd="$1"; shift
diff --git a/roles/front/vars/main.yml b/roles/front/vars/main.yml
index 2d51058..d42223c 100644
--- a/roles/front/vars/main.yml
+++ b/roles/front/vars/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
front_dir: /var/lib/machines/{{DMZ}}
diff --git a/roles/front_run/handlers/main.yml b/roles/front_run/handlers/main.yml
index 53f0a33..6f6dc51 100644
--- a/roles/front_run/handlers/main.yml
+++ b/roles/front_run/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart DMZ
diff --git a/roles/front_run/meta.OK/main.yml b/roles/front_run/meta.OK/main.yml
index 5bed625..c4c3990 100644
--- a/roles/front_run/meta.OK/main.yml
+++ b/roles/front_run/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/front_run/tasks/main.yml b/roles/front_run/tasks/main.yml
index 6b6c45d..4d350ff 100644
--- a/roles/front_run/tasks/main.yml
+++ b/roles/front_run/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: start systemd-nspawn@{{DMZ}}.service
diff --git a/roles/ihmgit_back/handlers/main.yml b/roles/ihmgit_back/handlers/main.yml
index 23f4a10..0d65f74 100644
--- a/roles/ihmgit_back/handlers/main.yml
+++ b/roles/ihmgit_back/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart gitea.service
diff --git a/roles/ihmgit_back/meta.OK/main.yml b/roles/ihmgit_back/meta.OK/main.yml
index 22c0d48..787287e 100644
--- a/roles/ihmgit_back/meta.OK/main.yml
+++ b/roles/ihmgit_back/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/ihmgit_back/tasks/main.yml b/roles/ihmgit_back/tasks/main.yml
index 35273f9..b09e35a 100644
--- a/roles/ihmgit_back/tasks/main.yml
+++ b/roles/ihmgit_back/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
@@ -44,7 +44,7 @@
- name: create Gitea configuration file
file:
path: /etc/gitea/app.ini
- state: file
+ state: touch
- name: make sure the Gitea user owns its work-directories
file:
diff --git a/roles/init/files/bin/.etc_checkroot.inc b/roles/init/files/bin/.etc_checkroot.inc
index 1bc3ad7..eb17ac4 100644
--- a/roles/init/files/bin/.etc_checkroot.inc
+++ b/roles/init/files/bin/.etc_checkroot.inc
@@ -1,5 +1,5 @@
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
if [ ${0:0:1} == / ]; then
diff --git a/roles/init/files/bin/etc_start_upstream b/roles/init/files/bin/etc_start_upstream
index 4505202..ce00793 100644
--- a/roles/init/files/bin/etc_start_upstream
+++ b/roles/init/files/bin/etc_start_upstream
@@ -1,6 +1,6 @@
#!/bin/bash
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
. "$(dirname "$0")/.etc_checkroot.inc"
diff --git a/roles/init/files/bin/etc_stop_local b/roles/init/files/bin/etc_stop_local
index 8945cfb..35fa768 100644
--- a/roles/init/files/bin/etc_stop_local
+++ b/roles/init/files/bin/etc_stop_local
@@ -1,6 +1,6 @@
#!/bin/bash
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
. "$(dirname "$0")/.etc_checkroot.inc"
diff --git a/roles/init/files/bin/etc_stop_upstream b/roles/init/files/bin/etc_stop_upstream
index f635fcf..2b55dac 100644
--- a/roles/init/files/bin/etc_stop_upstream
+++ b/roles/init/files/bin/etc_stop_upstream
@@ -1,6 +1,6 @@
#!/bin/bash
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
. "$(dirname "$0")/.etc_checkroot.inc"
diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml
index 0e8cd7e..0686230 100644
--- a/roles/init/tasks/main.yml
+++ b/roles/init/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
# WARNING: This file may be used inside a mounted chroot.
diff --git a/roles/init/templates/etc_init.j2 b/roles/init/templates/etc_init.j2
index 9befdd1..b4a1d5e 100644
--- a/roles/init/templates/etc_init.j2
+++ b/roles/init/templates/etc_init.j2
@@ -1,6 +1,6 @@
#!/bin/bash
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
. "$(dirname "$0")/.etc_checkroot.inc"
diff --git a/roles/iodine/handlers/main.yml b/roles/iodine/handlers/main.yml
index 4a245e9..04eab19 100644
--- a/roles/iodine/handlers/main.yml
+++ b/roles/iodine/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart iodined.service
diff --git a/roles/iodine/meta.OK/main.yml b/roles/iodine/meta.OK/main.yml
index 511dd25..69e59c7 100644
--- a/roles/iodine/meta.OK/main.yml
+++ b/roles/iodine/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/iodine/tasks/main.yml b/roles/iodine/tasks/main.yml
index 07e1ed9..c6aebac 100644
--- a/roles/iodine/tasks/main.yml
+++ b/roles/iodine/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/ldap/handlers/main.yml b/roles/ldap/handlers/main.yml
index 6f8e600..f11d77d 100644
--- a/roles/ldap/handlers/main.yml
+++ b/roles/ldap/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart nslcd.service
diff --git a/roles/ldap/meta.OK/main.yml b/roles/ldap/meta.OK/main.yml
index 3cbf8f1..9f62fc5 100644
--- a/roles/ldap/meta.OK/main.yml
+++ b/roles/ldap/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/ldap/tasks/main.yml b/roles/ldap/tasks/main.yml
index 8d81418..e5672d4 100644
--- a/roles/ldap/tasks/main.yml
+++ b/roles/ldap/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/mediaplayer/handlers/main.yml b/roles/mediaplayer/handlers/main.yml
index f5b8c14..91a7137 100644
--- a/roles/mediaplayer/handlers/main.yml
+++ b/roles/mediaplayer/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: enforce max_user_watches limit
diff --git a/roles/mediaplayer/meta.OK/main.yml b/roles/mediaplayer/meta.OK/main.yml
index 0c2f272..3596e66 100644
--- a/roles/mediaplayer/meta.OK/main.yml
+++ b/roles/mediaplayer/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/mediaplayer/tasks/main.yml b/roles/mediaplayer/tasks/main.yml
index 0c826b5..91c14ef 100644
--- a/roles/mediaplayer/tasks/main.yml
+++ b/roles/mediaplayer/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
@@ -43,8 +43,8 @@
file:
path: /var/lib/minidlna
state: directory
- owner: minidlna
- group: minidlna
+ owner: "{{kodi_user}}"
+ group: "{{media_group}}"
- name: disable the default media_dir
lineinfile:
diff --git a/roles/motion_back/handlers/main.yml b/roles/motion_back/handlers/main.yml
index a92a1dc..58bd302 100644
--- a/roles/motion_back/handlers/main.yml
+++ b/roles/motion_back/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart motion.service
diff --git a/roles/motion_back/meta.OK/main.yml b/roles/motion_back/meta.OK/main.yml
index 38034be..2047a8f 100644
--- a/roles/motion_back/meta.OK/main.yml
+++ b/roles/motion_back/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/motion_back/tasks/main.yml b/roles/motion_back/tasks/main.yml
index 900caf8..8102407 100644
--- a/roles/motion_back/tasks/main.yml
+++ b/roles/motion_back/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/movim_back/meta.OK/main.yml b/roles/movim_back/meta.OK/main.yml
index 5d48b7c..ff9a1ac 100644
--- a/roles/movim_back/meta.OK/main.yml
+++ b/roles/movim_back/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/movim_back/tasks/main.yml b/roles/movim_back/tasks/main.yml
index 2ebe5b8..195758a 100644
--- a/roles/movim_back/tasks/main.yml
+++ b/roles/movim_back/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: PostgreSQL user for movim
diff --git a/roles/msmtp/meta.OK/main.yml b/roles/msmtp/meta.OK/main.yml
index 511dd25..69e59c7 100644
--- a/roles/msmtp/meta.OK/main.yml
+++ b/roles/msmtp/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/msmtp/tasks/main.yml b/roles/msmtp/tasks/main.yml
index f846d1d..523b9ac 100644
--- a/roles/msmtp/tasks/main.yml
+++ b/roles/msmtp/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
diff --git a/roles/nextcloud_back/handlers/main.yml b/roles/nextcloud_back/handlers/main.yml
index 4da8e85..b7d2163 100644
--- a/roles/nextcloud_back/handlers/main.yml
+++ b/roles/nextcloud_back/handlers/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
- name: restart coolwsd.service
diff --git a/roles/nextcloud_back/meta.OK/main.yml b/roles/nextcloud_back/meta.OK/main.yml
index cdbd3cc..be7fa19 100644
--- a/roles/nextcloud_back/meta.OK/main.yml
+++ b/roles/nextcloud_back/meta.OK/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
dependencies:
diff --git a/roles/nextcloud_back/tasks/main.yml b/roles/nextcloud_back/tasks/main.yml
index 9cf0515..e7fd041 100644
--- a/roles/nextcloud_back/tasks/main.yml
+++ b/roles/nextcloud_back/tasks/main.yml
@@ -1,6 +1,6 @@
---
# The home-server project produces a multi-purpose setup using Ansible.
-# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
+# Copyright © 2018–2023 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
### UPSTREAM BEGIN ⇒ ###
@@ -21,19 +21,19 @@
- nextcloud
- ffmpeg
-- name: install AUR software
- include_role:
- name: aur.inc
- allow_duplicates: true
- vars:
- packages:
- - pkg: collabora-online-server-nodocker
- pre: |
- LANG=C sed -ri '
- s/^(_I18N_EREGEX=).*$/\1{{loolwsd_lang}}/
- ' PKGBUILD
- cat PKGBUILD
- aur_user: git
+#COLLABORA#- name: install AUR software
+#COLLABORA# include_role:
+#COLLABORA# name: aur.inc
+#COLLABORA# allow_duplicates: true
+#COLLABORA# vars:
+#COLLABORA# packages:
+#COLLABORA# - pkg: collabora-online-server-nodocker
+#COLLABORA# pre: |
+#COLLABORA# LANG=C sed -ri '
+#COLLABORA# s/^(_I18N_EREGEX=).*$/\1{{loolwsd_lang}}/
+#COLLABORA# ' PKGBUILD
+#COLLABORA# cat PKGBUILD
+#COLLABORA# aur_user: git
- name: create the nextcloud user
user:
@@ -85,36 +85,36 @@
# notify:
# - restart coolwsd.service
-- name: change some coolwsd settings
- lineinfile:
- path: /etc/coolwsd/coolwsd.xml
- owner: cool
- group: cool
- backrefs: true
- regexp: '^(.*<{{item.key}}\s[^>]*>)[^<]*(<.*)$'
- line: '\g<1>{{item.value}}\2'
- with_dict:
- server_name: '{{net_soa}}:443'
- memproportion: '{{loolwsd_maxmem_asdouble}}'
- 'enable\s[^>]*SSL[^>]*between coolwsd and the network': 'false'
- termination: 'true'
- 'as_scheme\s[^>]*SSL': 'false'
- 'enable\s[^>]*SSL[^>]*between storage and coolwsd': 'false'
- username: '{{loolwsd_admin_user}}'
- password: '{{loolwsd_admin_password}}'
- notify:
- - restart coolwsd.service
-
-- name: allow Nextcloud to connect to coolwsd
- lineinfile:
- path: /etc/coolwsd/coolwsd.xml
- owner: cool
- group: cool
- regexp: '(?:.*\.)?{{net_soa | replace(".", "\.")}}'
- insertafter: '(?:.*\.)?{{net_soa | replace(".", "\.")}}'
+#COLLABORA# insertafter: '