7 Commits
1.9.3 ... 1.9.6

8 changed files with 24 additions and 30 deletions

View File

@@ -115,18 +115,10 @@
become: true become: true
tags: ["init", "site", "install-packages"] tags: ["init", "site", "install-packages"]
- name: Install CLI tools - name: Set CLI tools
ansible.builtin.include_role: ansible.builtin.include_role:
name: "console" name: "console"
tasks_from: "services/set_cli_tools" tasks_from: "services/set_cli_tools"
apply: apply:
tags: ["init", "site", "tools"] tags: ["init", "site", "tools"]
tags: ["init", "site", "tools"] tags: ["init", "site", "tools"]
- name: Install chromium with font
ansible.builtin.include_role:
name: "console"
tasks_from: "services/set_chromium"
apply:
tags: ["init", "site", "chromium"]
tags: ["init", "site", "chromium"]

View File

@@ -12,7 +12,7 @@
- name: Reload postgresql - name: Reload postgresql
ansible.builtin.command: ansible.builtin.command:
/usr/bin/podman exec -u postgres postgresql sh -c "pg_ctl reload" /usr/bin/podman exec -u postgres postgresql sh -c "pg_ctl reload"
when: not (is_postgresql_init_run | default(false)) when: is_postgresql_init.stat.exists
changed_when: false changed_when: false
listen: "notification_reload_postgresql" listen: "notification_reload_postgresql"
ignore_errors: true # noqa: ignore-errors ignore_errors: true # noqa: ignore-errors
@@ -24,7 +24,7 @@
enabled: true enabled: true
daemon_reload: true daemon_reload: true
scope: "user" scope: "user"
when: not (is_postgresql_init_run | default(false)) when: is_postgresql_init.stat.exists
changed_when: false changed_when: false
listen: "notification_restart_postgresql" listen: "notification_restart_postgresql"
ignore_errors: true # noqa: ignore-errors ignore_errors: true # noqa: ignore-errors

View File

@@ -88,15 +88,13 @@
no_log: true no_log: true
- name: Check data directory empty - name: Check data directory empty
ansible.builtin.find: ansible.builtin.stat:
paths: "{{ node['home_path'] }}/containers/postgresql/data/" path: "{{ node['home_path'] }}/containers/postgresql/data/.init"
hidden: true
file_type: "any"
become: true become: true
register: "is_data_dir_empty" register: "is_postgresql_init"
- name: Prepare initiating DB - name: Prepare initiating DB
when: is_data_dir_empty.matched == 0 when: not is_postgresql_init.stat.exists
become: true become: true
block: block:
# `init/pg_cluster.sql` should be fetched from postgresql's backup directory before running initiating # `init/pg_cluster.sql` should be fetched from postgresql's backup directory before running initiating
@@ -118,9 +116,14 @@
loop: "{{ connected_services }}" loop: "{{ connected_services }}"
loop_control: loop_control:
index_var: index_num index_var: index_num
- name: Set is_postgresql_init_run
ansible.builtin.set_fact: - name: Create .init file
is_postgresql_init_run: true ansible.builtin.file:
path: "{{ node['home_path'] }}/containers/postgresql/data/.init"
state: "touch"
mode: "0644"
owner: "{{ ansible_user }}"
group: "svadmins"
- name: Deploy container file - name: Deploy container file
ansible.builtin.template: ansible.builtin.template:

View File

@@ -13,7 +13,7 @@ Image=docker.io/gitea/gitea:{{ version['containers']['gitea'] }}
ContainerName=gitea ContainerName=gitea
HostName=gitea HostName=gitea
PublishPort=3000:3000/tcp PublishPort={{ services['gitea']['ports']['http'] }}:3000/tcp
Volume=%h/data/containers/gitea:/data:rw Volume=%h/data/containers/gitea:/data:rw
Volume=%h/containers/gitea/ssl:/etc/ssl/gitea:ro Volume=%h/containers/gitea/ssl:/etc/ssl/gitea:ro

View File

@@ -10,7 +10,7 @@ theme: 'auto'
# Server configuration # Server configuration
server: server:
# TLS will be applied on caddy # TLS will be applied on caddy
address: 'tcp://:9091/' address: 'tcp://:{{ services['authelia']['ports']['http'] }}/'
# Log configuration # Log configuration
log: log:

View File

@@ -39,7 +39,7 @@
import crowdsec_log import crowdsec_log
route { route {
crowdsec crowdsec
reverse_proxy host.containers.internal:9091 reverse_proxy host.containers.internal:{{ services['authelia']['ports']['http'] }}
} }
} }
# test.ilnmors.com { # test.ilnmors.com {

View File

@@ -203,12 +203,11 @@ loki.relabel "caddy_relabel" {
loki.process "journal_parser" { loki.process "journal_parser" {
forward_to = [loki.write.loki.receiver] forward_to = [loki.write.loki.receiver]
// Severity parsing // Severity parsing
// If content of log includes "level" information, change the level stage.regex {
stage.logfmt { // Regex to extract the log level from the content.
mapping = { expression = "(?i)(?:level[\"\\s:=]+|\\[|\\s|^)(?P<content_level>info|warn|warning|error|debug|fatal|critical|trace)(?:[\"\\]\\s]|$)"
"content_level" = "level",
}
} }
stage.labels { stage.labels {
values = { values = {
"level" = "content_level", "level" = "content_level",

View File

@@ -21,9 +21,9 @@ ProtectHome=tmpfs
InaccessiblePaths=/boot /root InaccessiblePaths=/boot /root
{% if node['name'] == 'infra' %} {% if node['name'] == 'infra' %}
BindReadOnlyPaths=/home/infra/containers/postgresql/backups BindReadOnlyPaths=%h/containers/postgresql/backups
{% elif node['name'] == 'app' %} {% elif node['name'] == 'app' %}
BindReadOnlyPaths=/home/app/data BindReadOnlyPaths=%h/data
{% endif %} {% endif %}
# In root namescope, %u always bring 0 # In root namescope, %u always bring 0
BindPaths=/etc/kopia BindPaths=/etc/kopia