[All] Test embedded templates

nervo · nervo · commit a954bdbb19b8 · 2025-10-30T10:07:59.000+01:00
diff --git a/extensions/molecule/backup_manager/converge.yml b/extensions/molecule/backup_manager/converge.yml
@@ -12,6 +12,10 @@
         - name: Role
           ansible.builtin.import_role:
             name: manala.roles.backup_manager
+          vars:
+            manala_backup_manager_configs:
+              - file: backup-manager.conf
+                template: configs/debian/backup-manager.conf.j2
       always:
         - name: Goss
           ansible.builtin.command:
diff --git a/extensions/molecule/haproxy/converge.yml b/extensions/molecule/haproxy/converge.yml
@@ -12,6 +12,8 @@
         - name: Role
           ansible.builtin.import_role:
             name: manala.roles.haproxy
+          vars:
+            manala_haproxy_environment_template: environment/debian/haproxy.j2
       always:
         - name: Goss
           ansible.builtin.command:
diff --git a/extensions/molecule/influxdb/converge.yml b/extensions/molecule/influxdb/converge.yml
@@ -24,6 +24,7 @@
               - "{{ tests_dir }}/meta"
               - "{{ tests_dir }}/data"
               - "{{ tests_dir }}/wal"
+            manala_influxdb_config_template: config/influxdata/influxdb.conf.j2
             manala_influxdb_databases:
               - my_db
             manala_influxdb_users:
diff --git a/extensions/molecule/keepalived/converge.yml b/extensions/molecule/keepalived/converge.yml
@@ -13,6 +13,7 @@
           ansible.builtin.import_role:
             name: manala.roles.keepalived
           vars:
+            manala_keepalived_environment_template: environment/debian/keepalived.j2
             manala_keepalived_config: |
               global_defs {
                   router_id LVS_DEVEL
diff --git a/extensions/molecule/nginx/converge.yml b/extensions/molecule/nginx/converge.yml
@@ -12,6 +12,11 @@
         - name: Role
           ansible.builtin.import_role:
             name: manala.roles.nginx
+          vars:
+            manala_nginx_config_template: config/nginx/nginx.conf.j2
+            manala_nginx_configs:
+              - file: default.conf
+                template: configs/nginx/default.conf.j2
       always:
         - name: Goss
           ansible.builtin.command:
diff --git a/extensions/molecule/php.5.6/converge.yml b/extensions/molecule/php.5.6/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.7.0/converge.yml b/extensions/molecule/php.7.0/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.7.1/converge.yml b/extensions/molecule/php.7.1/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.7.2/converge.yml b/extensions/molecule/php.7.2/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.7.3/converge.yml b/extensions/molecule/php.7.3/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.7.4/converge.yml b/extensions/molecule/php.7.4/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.8.0/converge.yml b/extensions/molecule/php.8.0/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.8.1/converge.yml b/extensions/molecule/php.8.1/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.8.2/converge.yml b/extensions/molecule/php.8.2/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.8.3/converge.yml b/extensions/molecule/php.8.3/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/php.8.4/converge.yml b/extensions/molecule/php.8.4/converge.yml
@@ -58,6 +58,9 @@
                   state: absent
                 - extension: bcmath  # Native extension
                   state: ignore
+            manala_php_fpm_pools:
+              - file: www.conf
+                template: fpm_pools/sury/pools.conf.j2
             manala_php_applications:
               - phpcs
               # Flatten
diff --git a/extensions/molecule/supervisor/converge.yml b/extensions/molecule/supervisor/converge.yml
@@ -12,6 +12,13 @@
         - name: Role
           ansible.builtin.import_role:
             name: manala.roles.supervisor
+          vars:
+            manala_supervisor_config_template: config/debian/supervisord.conf.j2
+            manala_supervisor_configs:
+              - file: inet_http_server.conf
+                template: configs/inet_http_server.conf.j2
+                config:
+                  port: 1234
       always:
         - name: Goss
           ansible.builtin.command:
diff --git a/extensions/molecule/telegraf/converge.yml b/extensions/molecule/telegraf/converge.yml
@@ -13,6 +13,7 @@
           ansible.builtin.import_role:
             name: manala.roles.telegraf
           vars:
+            manala_telegraf_config_template: config/telegraf/base/telegraf.conf.j2
             manala_telegraf_configs:
               - file: outputs.conf
                 config:
diff --git a/roles/nginx/templates/config/nginx/nginx.conf.j2 b/roles/nginx/templates/config/nginx/nginx.conf.j2
@@ -1,9 +1,9 @@
 
 user  nginx;
-worker_processes  1;
+worker_processes  auto;
 
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
+error_log  /var/log/nginx/error.log notice;
+pid        /run/nginx.pid;
 
 
 events {
diff --git a/roles/nginx/templates/configs/nginx/default.conf.j2 b/roles/nginx/templates/configs/nginx/default.conf.j2
@@ -2,7 +2,6 @@ server {
     listen       80;
     server_name  localhost;
 
-    #charset koi8-r;
     #access_log  /var/log/nginx/host.access.log  main;
 
     location / {
diff --git a/roles/ohmyzsh/templates/users/manala/.zshrc.j2 b/roles/ohmyzsh/templates/users/manala/.zshrc.j2
@@ -1,20 +1,13 @@
 {%- set config = item.config | default({}) -%}
 
 # If you come from bash you might have to change your $PATH.
-{{ config | manala.roles.zsh_config_parameter('export PATH', comment='# export PATH=$HOME/bin:/usr/local/bin:$PATH') }}
+{{ config | manala.roles.zsh_config_parameter('export PATH', comment='# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH') }}
 
-# Path to your oh-my-zsh installation.
+# Path to your Oh My Zsh installation.
 {{ config | manala.roles.zsh_config_parameter('export ZSH', default=manala_ohmyzsh_dir) }}
 
-# Ensure per-user cache
-{{ config | manala.roles.zsh_config_parameter('ZSH_CACHE_DIR', default='$HOME/.oh-my-zsh/cache') }}
-
-if [[ ! -d $ZSH_CACHE_DIR ]]; then
-  mkdir -p $ZSH_CACHE_DIR
-fi
-
 # Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
+# load a random theme each time Oh My Zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
 {{ config | manala.roles.zsh_config_parameter('ZSH_THEME', default='robbyrussell') }}
@@ -32,14 +25,13 @@ fi
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 {{ config | manala.roles.zsh_config_parameter('HYPHEN_INSENSITIVE', default=true, comment=true) }}
 
-# Uncomment the following line to disable bi-weekly auto-update checks.
-{{ config | manala.roles.zsh_config_parameter('DISABLE_AUTO_UPDATE', default=true, comment=true) }}
-
-# Uncomment the following line to automatically update without prompting.
-{{ config | manala.roles.zsh_config_parameter('DISABLE_UPDATE_PROMPT', default=true, comment=true) }}
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
 # Uncomment the following line to change how often to auto-update (in days).
-{{ config | manala.roles.zsh_config_parameter('export UPDATE_ZSH_DAYS', default=13, comment=true) }}
+# zstyle ':omz:update' frequency 13
 
 # Uncomment the following line if pasting URLs and other text is messed up.
 {{ config | manala.roles.zsh_config_parameter('DISABLE_MAGIC_FUNCTIONS', default=true, comment=true) }}
@@ -95,29 +87,28 @@ source $ZSH/oh-my-zsh.sh
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else
-#   export EDITOR='mvim'
+#   export EDITOR='nvim'
 # fi
 
 # Compilation flags
-{{ config | manala.roles.zsh_config_parameter('export ARCHFLAGS', default='-arch x86_64', comment=true) }}
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+{{ config | manala.roles.zsh_config_parameter('export ARCHFLAGS', default='-arch $(uname -m)', comment=true) }}
+
+# Set personal aliases, overriding those provided by Oh My Zsh libs,
+# plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# users are encouraged to define aliases within a top-level file in
+# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# - $ZSH_CUSTOM/aliases.zsh
+# - $ZSH_CUSTOM/macos.zsh
 # For a full list of active aliases, run `alias`.
 {{ config | manala.roles.zsh_config_parameter('alias', comment='#\n# Example aliases\n# alias zshconfig="mate ~/.zshrc"\n# alias ohmyzsh="mate ~/.oh-my-zsh"') }}
 
 {{ config | manala.roles.zsh_config(exclude=[
   'export PATH',
   'export ZSH',
-  'ZSH_CACHE_DIR',
   'ZSH_THEME',
   'ZSH_THEME_RANDOM_CANDIDATES',
   'CASE_SENSITIVE',
   'HYPHEN_INSENSITIVE',
-  'DISABLE_AUTO_UPDATE',
-  'DISABLE_UPDATE_PROMPT',
-  'UPDATE ZSH_DAYS',
   'DISABLE_MAGIC_FUNCTIONS',
   'DISABLE_LS_COLORS',
   'DISABLE_AUTO_TITLE',
