use ansible controller to detect latest version

bodsch · Sep 13, 2022 · 62ebf70 · 62ebf70
1 parent ef1ffc8
commit 62ebf70
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 102 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,8 +10,8 @@ on:
       - "code linter"
     branches:
       - main
-      - feature/*
-      - fix/*
+      - feature/**
+      - fix/**
     types:
       - completed
 

diff --git a/molecule/default/group_vars/all/vars.yml b/molecule/default/group_vars/all/vars.yml
@@ -1,95 +1,3 @@
 ---
 
-# glauth_version: latest
-
-glauth_service:
-  listen:
-    ldap: ""
-    ldaps: ""
-  tls:
-    cert_file: "/etc/glauth/certs/molecule.lan.pem"
-    key_file: "/etc/glauth/certs/molecule.lan.key"
-
-glauth_config:
-  ldaps:
-    enabled: false
-    listen:
-      address: "0.0.0.0"
-      port: "636"
-    tls:
-      cert_file: "/etc/glauth/certs/molecule.lan.pem"
-      key_file: "/etc/glauth/certs/molecule.lan.key"
-
-glauth_backends:
-  config:
-    base_dn: "dc=molecule,dc=lan"
-    name_format: "cn"
-    group_format: "ou"
-
-glauth_groups:
-  admins:
-    gid: 3000
-  vpn:
-    gid: 3001
-  users:
-    gid: 6000
-    include_groups:
-      - 3001
-
-glauth_users:
-  admin:
-    enabled: true
-    given_name: Admin
-    sn: ""
-    mail: "[email protected]"
-    uid: 3000
-    primary_group: 3000
-    other_groups: []
-    pass:
-      sha256: "6b7556f632dc73ea7470a0116d6e55880fda6ca50575b72c7cc5f13df53a2623"
-      sha256_apps: []
-      bcrypt: ""
-      bcrypt_apps: []
-    ssh_keys: []
-    otp_secret: ""
-    yubikey: ""
-    login_shell: ""
-    home_dir: ""
-    capabilities:
-#      "*":
-#        object: "dc=matrix,dc=lan"
-      "*":
-        object: "dc=molecule,dc=lan"
-    custom_attrs: {}
-
-  bodsch:
-    given_name: "B."
-    sn: "Schulz"
-    uid: 6000
-    primary_group: 6000
-    other_groups:
-      - 3001
-    pass:
-      sha256: "6b7556f632dc73ea7470a0116d6e55880fda6ca50575b72c7cc5f13df53a2623"
-      sha256_apps:
-        - "fc6be9b218afa2ce37409580b8a4907feb6c1ea878d1222e4d2b84e81c1c0e47"
-        - "cd2eb0837c9b4c962c22d2ff8b5441b7b45805887f051d39bf133b583baf6860"
-    ssh_keys:
-      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPHUuPrbu9kSKL1u0gfViSa/P7FkZPk8hYbv7hegpTcY [email protected]"
-    login_shell: "/bin/bash"
-    home_dir: "/home/bodsch"
-    capabilities:
-#      "search":
-#        object: "dc=matrix,dc=lan"
-      "search":
-        object: "dc=molecule,dc=lan"
-
-glauth_behaviors:
-  ignore_capabilities: true
-
-glauth_api:
-  enabled: true
-  listen:
-    address: "0.0.0.0"
-
 ...
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -32,7 +32,7 @@ provisioner:
     # - -vv
   config_options:
     defaults:
-      deprecation_warnings: True
+      deprecation_warnings: true
       stdout_callback: yaml
 
 scenario:

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -36,6 +36,5 @@
 
   roles:
     - role: syslog-ng
-    - role: snakeoil
 
 ...
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
@@ -1,10 +1,7 @@
 ---
 
-- name: snakeoil
-  src: bodsch.snakeoil
-  version: 1.2.4
-
 - name: syslog-ng
   src: bodsch.syslog_ng
+  version: 1.4.0
 
 ...
diff --git a/tasks/download.yml b/tasks/download.yml
@@ -14,6 +14,7 @@
 - name: download glauth binary archive
   become: false
   delegate_to: "{{ glauth_delegate_to }}"
+  run_once: "{{ 'false' if glauth_direct_download else 'true' }}"
   get_url:
     url: "{{ glauth_release_download_url }}/download/v{{ glauth_version }}/{{ ansible_facts.system }}{{ system_architecture }}.zip"
     dest: "{{ glauth_local_tmp_directory }}/glauth-{{ system_architecture }}.zip"
@@ -27,6 +28,7 @@
 - name: extract glauth archive
   become: false
   delegate_to: "{{ glauth_delegate_to }}"
+  run_once: "{{ 'false' if glauth_direct_download else 'true' }}"
   unarchive:
     src: "{{ glauth_local_tmp_directory }}/glauth-{{ system_architecture }}.zip"
     dest: "{{ glauth_local_tmp_directory }}"

diff --git a/tasks/prepare.yml b/tasks/prepare.yml
@@ -40,6 +40,9 @@
 
 - block:
     - name: get latest release
+      delegate_to: localhost
+      become: false
+      run_once: true
       uri:
         url: "https://api.github.com/repos/glauth/glauth/releases/latest"
         method: GET

diff --git a/templates/init/openrc/conf.d/glauth.j2 b/templates/init/openrc/conf.d/glauth.j2
@@ -8,7 +8,6 @@ group="{{ glauth_system_group }}"
 
 command_args="
 {% if glauth_service is defined %}
-  --config {{ glauth_config_dir }}/glauth.conf
 {% endif %}
+  --config {{ glauth_config_dir }}/glauth.conf
 "
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,5 @@ @@
       roles:
         - role: syslog-ng
-        - role: snakeoil
     ...