From 03f70d2e9886d83b8b2b470874945d43689eae94 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 30 Jan 2022 13:00:05 +0100 Subject: [PATCH] Update to 2022-01-30 13:00 --- roles/babashka/defaults/main.yml | 8 +++++ roles/babashka/meta/main.yml | 4 +++ roles/babashka/tasks/cleanup.yml | 8 +++++ roles/babashka/tasks/facts.yml | 30 +++++++++++++++++++ roles/babashka/tasks/install.yml | 25 ++++++++++++++++ roles/babashka/tasks/main.yml | 5 ++++ roles/clojure/tasks/facts.yml | 2 +- roles/clojure/tasks/install.yml | 2 +- roles/grafana/defaults/main.yml | 2 +- .../squid/files/acl/software_various.domains | 2 ++ roles/taiga/defaults/main.yml | 2 +- 11 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 roles/babashka/defaults/main.yml create mode 100644 roles/babashka/meta/main.yml create mode 100644 roles/babashka/tasks/cleanup.yml create mode 100644 roles/babashka/tasks/facts.yml create mode 100644 roles/babashka/tasks/install.yml create mode 100644 roles/babashka/tasks/main.yml diff --git a/roles/babashka/defaults/main.yml b/roles/babashka/defaults/main.yml new file mode 100644 index 0000000..306eefc --- /dev/null +++ b/roles/babashka/defaults/main.yml @@ -0,0 +1,8 @@ +--- + +# Babashka version to deploy +bb_version: 0.7.4 +# URL of the archive +bb_archive_url: https://github.com/babashka/babashka/releases/download/v{{ bb_version }}/babashka-{{ bb_version }}-linux-amd64-static.tar.gz +# Expected sha256sum of the archive +bb_archive_sha256: 707aab21b40921d0d3323e24ebc7330680e650e6bb3aab6ba67abdcf4f2f146c diff --git a/roles/babashka/meta/main.yml b/roles/babashka/meta/main.yml new file mode 100644 index 0000000..ed8ce7d --- /dev/null +++ b/roles/babashka/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - role: clojure diff --git a/roles/babashka/tasks/cleanup.yml b/roles/babashka/tasks/cleanup.yml new file mode 100644 index 0000000..ec98442 --- /dev/null +++ b/roles/babashka/tasks/cleanup.yml @@ -0,0 +1,8 @@ +--- + +- name: Remove tmp and obsolete files + file: path={{ item }} state=absent + loop: + - /tmp/babashka-{{ bb_version }}-linux-amd64-static.tar.gz + - /tmp/bb + tags: bb diff --git a/roles/babashka/tasks/facts.yml b/roles/babashka/tasks/facts.yml new file mode 100644 index 0000000..5c9a539 --- /dev/null +++ b/roles/babashka/tasks/facts.yml @@ -0,0 +1,30 @@ +--- + +- name: Set default install mode + set_fact: bb_install_mode='none' + tags: bb + +- name: Check if bb is installed + stat: path=/usr/local/bin/bb + register: bb_bin + changed_when: False + tags: bb + +- name: Set install mode to install + set_fact: bb_install_mode='install' + when: not bb_bin.stat.exists + tags: bb + +- name: Detect installed version + block: + - shell: bb --version | perl -ne 'm/babashka\s+v(\d+(\.\d+)*)/ && print "$1"' + changed_when: False + register: bb_current_version + - set_fact: bb_current_version={{ bb_current_version.stdout }} + tags: bb + +- name: Set install mode to upgrade + set_fact: bb_install_mode='upgrade' + when: bb_current_version != bb_version + tags: bb + diff --git a/roles/babashka/tasks/install.yml b/roles/babashka/tasks/install.yml new file mode 100644 index 0000000..9c7da49 --- /dev/null +++ b/roles/babashka/tasks/install.yml @@ -0,0 +1,25 @@ +--- + +- when: bb_install_mode != 'none' + block: + + - name: Download babashka archive + get_url: + url: "{{ bb_archive_url }}" + dest: /tmp/ + checksum: sha256:{{ bb_archive_sha256 }} + + - name: Extract archive + unarchive: + src: /tmp/babashka-{{ bb_version }}-linux-amd64-static.tar.gz + dest: /tmp/ + remote_src: True + + - name: Install babashka binary + copy: + src: /tmp/bb + dest: /usr/local/bin/bb + remote_src: True + mode: 755 + + tags: bb diff --git a/roles/babashka/tasks/main.yml b/roles/babashka/tasks/main.yml new file mode 100644 index 0000000..fcd5af4 --- /dev/null +++ b/roles/babashka/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: facts.yml +- include: install.yml +- include: cleanup.yml diff --git a/roles/clojure/tasks/facts.yml b/roles/clojure/tasks/facts.yml index 808c582..e4ec0da 100644 --- a/roles/clojure/tasks/facts.yml +++ b/roles/clojure/tasks/facts.yml @@ -16,7 +16,6 @@ - name: Check if clojure is installed stat: path=/usr/local/bin/clojure register: clojure_bin - changed_when: False tags: clojure - name: Set install mode to install @@ -27,6 +26,7 @@ - name: Detect installed version block: - shell: clojure --version | perl -ne 'm/version\s(\d+(\.\d+)*)/ && print "$1"' + changed_when: False register: clojure_current_version - set_fact: clojure_current_version={{ clojure_current_version.stdout }} tags: clojure diff --git a/roles/clojure/tasks/install.yml b/roles/clojure/tasks/install.yml index 32c2426..ea55fa8 100644 --- a/roles/clojure/tasks/install.yml +++ b/roles/clojure/tasks/install.yml @@ -28,7 +28,7 @@ - src: deps.edn dest: /usr/local/lib/clojure/ - src: example-deps.edn - dest: /use/local/lib/clojure/ + dest: /usr/local/lib/clojure/ - src: tools.edn dest: /usr/local/lib/clojure/ - src: exec.jar diff --git a/roles/grafana/defaults/main.yml b/roles/grafana/defaults/main.yml index fc0d2db..237e298 100644 --- a/roles/grafana/defaults/main.yml +++ b/roles/grafana/defaults/main.yml @@ -49,7 +49,7 @@ grafana_auth_base: # - 192.168.7.12 ldap: enabled: "{{ (ad_auth | default(False) or ldap_auth | default(False)) | ternary(True,False) }}" - servers: "{{ (ad_ldap_servers is defined) | ternary(ad_ldap_servers,[ldap.example.org]) }}" + servers: "{{ (ad_ldap_servers is defined) | ternary(ad_ldap_servers, ['ldap.example.org']) }}" port: 389 use_ssl: True start_tls: True diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains index 0707ef1..45173e3 100644 --- a/roles/squid/files/acl/software_various.domains +++ b/roles/squid/files/acl/software_various.domains @@ -365,3 +365,5 @@ go.zextras.com www.zulip.org packages.groonga.org +# Clojure +download.clojure.org diff --git a/roles/taiga/defaults/main.yml b/roles/taiga/defaults/main.yml index 6a75d60..692c3ba 100644 --- a/roles/taiga/defaults/main.yml +++ b/roles/taiga/defaults/main.yml @@ -67,7 +67,7 @@ taiga_public_url: https://{{ inventory_hostname }}/ # Registration enabled ? taiga_user_registration: False # If registration is enabled (or if oidc auth is enabled), you can restrict email domains accepted by taiga -taiga_user_registration_allowed_domains: [] +taiga_user_registration_allowed_domains: [ "{{ ansible_domain }}" ] # Max upload file size (in MB) taiga_max_upload_file_size: 20