diff --git a/.gitignore b/.gitignore index d7f5cc5..96c5c94 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ collections/* !collections/ansible_collections !collections/requirements.yml collections/ansible_collections/* -!collections/ansible_collections/aperature_ansible -collections/ansible_collections/aperature_ansible/* -!collections/ansible_collections/aperature_ansible/aperature +!collections/ansible_collections/tar-valon_ansible +collections/ansible_collections/tar-valon_ansible/* +!collections/ansible_collections/tar-valon_ansible/tar-valon # https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/ansible.cfg b/ansible.cfg index 7455504..e43d1f2 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,5 @@ [defaults] inventory = inventory/hosts.yml -collections_paths = ./collections +collections_path = ./collections host_key_checking = False retry_files_enabled = False diff --git a/app-configs/rinoa/libredesk/config.toml.j2 b/app-configs/rinoa/libredesk/config.toml.j2 deleted file mode 100644 index 462cad9..0000000 --- a/app-configs/rinoa/libredesk/config.toml.j2 +++ /dev/null @@ -1,124 +0,0 @@ -[app] -# Log level: info, debug, warn, error, fatal -log_level = "debug" -# Environment: dev, prod. -# Setting to "dev" will enable color logging in terminal. -env = "dev" -# Whether to automatically check for application updates on start up, app updates are shown as a banner in the admin panel. -check_updates = true - -# HTTP server. -[app.server] -# Address to bind the HTTP server to. -address = "0.0.0.0:9000" -# Unix socket path (leave empty to use TCP address instead) -socket = "" -# Do NOT disable secure cookies in production environment if you don't know exactly what you're doing! -disable_secure_cookies = false -# Request read and write timeouts. -read_timeout = "5s" -write_timeout = "5s" -# Maximum request body size in bytes (100MB) -# If you are using proxy, you may need to configure them to allow larger request bodies. -max_body_size = 104857600 -# Size of the read buffer for incoming requests -read_buffer_size = 4096 -# Keepalive settings. -keepalive_timeout = "10s" - -# File upload provider to use, either `fs` or `s3`. -[upload] -provider = "s3" - -# Filesystem provider. -[upload.fs] -# Directory where uploaded files are stored, make sure this directory exists and is writable by the application. -upload_path = 'uploads' - -# S3 provider. -[upload.s3] -# S3 endpoint URL (required only for non-AWS S3-compatible providers like MinIO). -# Leave empty to use default AWS endpoints. -url = "http://minio:9000" - -# AWS S3 credentials, keep empty to use attached IAM roles. -access_key = "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['LIBREDESK_S3_ACCESS_KEY'] }}" -secret_key = "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['LIBREDESK_S3_SECRET_KEY'] }}" - -# AWS region, e.g., "us-east-1", "eu-west-1", etc. -region = "us-east-fh-pln" -# S3 bucket name where files will be stored. -bucket = "libredesk" -# Optional prefix path within the S3 bucket where files will be stored. -# Example, if set to "uploads/media", files will be stored under that path. -# Useful for organizing files inside a shared bucket. -bucket_path = "" -# S3 signed URL expiry duration (e.g., "30m", "1h") -expiry = "30m" - -# Postgres. -[db] -# If running locally, use `localhost`. -host = "libredesk-pg-db" -# Database port, default is 5432. -port = 5432 -# Update the following values with your database credentials. -user = "libredesk" -password = "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['LIBREDESK_PG_DB_PASSWD'] }}" -database = "libredesk" -ssl_mode = "disable" -# Maximum number of open database connections -max_open = 30 -# Maximum number of idle connections in the pool -max_idle = 30 -# Maximum time a connection can be reused before being closed -max_lifetime = "300s" - -# Redis. -[redis] -# If running locally, use `localhost:6379`. -address = "libredesk-valkey:6379" -password = "" -db = 0 - -[message] -# Number of workers processing outgoing message queue -outgoing_queue_workers = 10 -# Number of workers processing incoming message queue -incoming_queue_workers = 10 -# How often to scan for outgoing messages to process, keep it low to process messages quickly. -message_outgoing_scan_interval = "50ms" -# Maximum number of messages that can be queued for incoming processing -incoming_queue_size = 5000 -# Maximum number of messages that can be queued for outgoing processing -outgoing_queue_size = 5000 - -[notification] -# Number of concurrent notification workers -concurrency = 2 -# Maximum number of notifications that can be queued -queue_size = 2000 - -[automation] -# Number of workers processing automation rules -worker_count = 10 - -[autoassigner] -# How often to run automatic conversation assignment -autoassign_interval = "5m" - -[webhook] -# Number of webhook delivery workers -workers = 5 -# Maximum number of webhook deliveries that can be queued -queue_size = 10000 -# HTTP timeout for webhook requests -timeout = "15s" - -[conversation] -# How often to check for conversations to unsnooze -unsnooze_interval = "5m" - -[sla] -# How often to evaluate SLA compliance for conversations -evaluation_interval = "5m" diff --git a/collections/requirements.yml b/collections/requirements.yml index 65acec4..f27189d 100644 --- a/collections/requirements.yml +++ b/collections/requirements.yml @@ -1,6 +1,6 @@ --- collections: - name: community.hashi_vault - version: 6.2.0 + version: 6.2.1 - name: community.general - version: "6.*" + version: 11.2.1 diff --git a/inventory/hosts.yml b/inventory/hosts.yml index 3903031..4759ba5 100644 --- a/inventory/hosts.yml +++ b/inventory/hosts.yml @@ -1,14 +1,14 @@ all: hosts: rinoa: - ansible_host: rinoa + ansible_host: 192.168.1.254 ansible_user: charish ansible_ssh_private_key_file: "{{ lookup('env','HOME') + '/.ssh/id_rsa' }}" rikku: - ansible_host: rikku + ansible_host: 192.168.1.252 ansible_user: pi ansible_ssh_private_key_file: "{{ lookup('env','HOME') + '/.ssh/id_rsa' }}" benedikta: - ansible_host: benedikta + ansible_host: 192.168.1.250 ansible_user: ovos ansible_ssh_private_key_file: "{{ lookup('env','HOME') + '/.ssh/id_rsa' }}" diff --git a/tar-valon_config_deploy.yml b/tar-valon_config_deploy.yml index e0da1e8..f8334be 100644 --- a/tar-valon_config_deploy.yml +++ b/tar-valon_config_deploy.yml @@ -22,7 +22,7 @@ - name: Deploy Jinja2 templates (skip unchanged) ansible.builtin.template: src: "{{ item.path }}" - dest: "{{ appdata_base_path }}/{{ item.path | community.general.relpath(template_base_path + '/' + inventory_hostname) | regex_replace('\\.j2$', '') }}" + dest: "{{ appdata_base_path }}/{{ item.path | relpath(template_base_path + '/' + inventory_hostname) | regex_replace('\\.j2$', '') }}" mode: '0644' create_dirs: yes loop: "{{ host_files.files }}" @@ -33,7 +33,7 @@ - name: Deploy static files (skip unchanged) ansible.builtin.copy: src: "{{ item.path }}" - dest: "{{ appdata_base_path }}/{{ item.path | community.general.relpath(template_base_path + '/' + inventory_hostname) }}" + dest: "{{ appdata_base_path }}/{{ item.path | relpath(template_base_path + '/' + inventory_hostname) }}" mode: '0644' remote_src: no create_dirs: yes