ansible/playbooks/setup.yml

@@ -17,17 +17,7 @@
 
   roles:
     - setup_apt
-
+    - docker
-  post_tasks:
-    - name: Install Docker
-      include_role:
-        name: docker
-      vars:
-        docker_daemon_config:
-          log-driver: fluentd
-          log-opts:
-            fluentd-address: "localhost:22222"
-            tag: "docker.{{ '{{' }}.Name{{ '}}' }}"
 
 - name: Setup Docker Swarm manager
   hosts: manager

ansible/roles/forgejo/app.ini.j2

@@ -1,7 +1,6 @@
 APP_NAME = Forgejo: Beyond coding. We forge.
 RUN_MODE = prod
 RUN_USER = git
-WORK_PATH=/data/gitea
 
 [repository]
 ROOT = /data/git/repositories
@@ -57,9 +56,8 @@ PATH = /data/gitea/attachments
 [log]
 MODE      = console
 LEVEL     = info
-logger.router.MODE = console
+ROUTER    = console
 ROOT_PATH = /data/gitea/log
-logger.access.MODE=console
 
 [security]
 INSTALL_LOCK                  = true
@@ -104,6 +102,3 @@ DEFAULT_TRUST_MODEL = committer
 
 [ui]
 DEFAULT_THEME = forgejo-light
-
-[oauth2]
-ENABLE=false

ansible/roles/forgejo/docker-stack.yml.j2

@@ -19,7 +19,7 @@ volumes:
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:1.20
+    image: codeberg.org/forgejo/forgejo:1.18
     environment:
       - USER_UID=1000
       - USER_GID=1000

ansible/roles/monitoring/docker-stack.yml.j2

@@ -122,7 +122,7 @@ services:
       - BAUTH_PASS=test
 
   fluentd:
-    image: git.kun.is/pim/fluentd:1.0.2
+    image: git.kun.is/pim/fluentd:1.0.1
     depends_on:
       - elasticsearch
     ports:

ansible/roles/monitoring/fluent.conf.j2

@@ -6,7 +6,7 @@
   port {{ fluent_forward_port }}
 </source>
 
-<match **>
+<match *>
   @type elasticsearch
   host maestro.dmz
   port {{ elasticsearch_port }}

ansible/roles/seafile/docker-stack.yml.j2

@@ -19,7 +19,7 @@ volumes:
       device: ":/mnt/data/seafile/db"
 
 services: 
-  db:
+  mariadb: 
     image: mariadb:10.5 
     environment: 
       - MYSQL_ROOT_PASSWORD={{ db_root_passwd }}
@@ -48,7 +48,7 @@ services:
         volume:
           nocopy: true
     environment: 
-      - DB_HOST=db
+      - DB_HOST=db 
       - DB_ROOT_PASSWD={{ db_root_passwd }}
       - TIME_ZONE=Europe/Amsterdam 
       - SEAFILE_ADMIN_EMAIL={{ seafile_admin_email }}

terraform/elasticsearch/main.tf

@@ -38,25 +38,3 @@ resource "elasticstack_elasticsearch_index_template" "metrics_template" {
     })
   }
 }
-
-resource "elasticstack_elasticsearch_index_lifecycle" "logs_ilm" {
-  name = "logs_ilm"
-
-  delete {
-    min_age = "2d"
-    delete {}
-  }
-}
-
-resource "elasticstack_elasticsearch_index_template" "logs_template" {
-  name = "logs_template"
-
-  priority = 42
-  index_patterns = ["fluentd.docker.**"]
-
-  template {
-    settings = jsonencode({
-      "index.lifecycle.name" = elasticstack_elasticsearch_index_lifecycle.logs_ilm.name
-    })
-  }
-}