Taskfile.yml

@@ -1,27 +0,0 @@
-# https://taskfile.dev
-
-version: '3'
-
-vars:
-  USER_ID:
-    sh: id -u
-  GROUP_ID:
-    sh: id -g
-  ANSIBLE_HOST_KEY_CHECKING: 'True'
-
-tasks:
-  configure-monitoring:
-    cmds:
-      - >- 
-        ansible-playbook
-        --user="major" 
-        --become
-        --tags="monitoring"
-        --inventory="ansible/hosts_prod"
-        --extra-vars="ansible_python_interpreter=/usr/bin/python3"
-        -vvv
-        ansible/configuration.yml
-
-  format-py-files:
-    cmds:
-      - docker run --rm -u {{.USER_ID}}:{{.GROUP_ID}} -v $PWD/app:/app -w /app pyfound/black:latest_release black .

ansible/configuration.yml

@@ -71,7 +71,7 @@
     - import_role:
         name: netdata
       vars:
-        netdata_version: 'v1.43.1'
+        netdata_version: 'v1.42.4'
         netdata_exposed_port: '{{ netdata_port }}'
       tags:
         - monitoring

app/gitea/tasks.py

@@ -4,6 +4,7 @@ import shlex
 
 APP_NAME = "gitea"
 SSH_HOST = f"{APP_NAME}@158.160.115.150"
+DOCKER_REGISTRY = "cr.yandex/crplfk0168i4o8kd7ade"
 
 
 @task
@@ -16,6 +17,4 @@ def deploy(c):
         )
         c.run("cp .env .env.prod")
         c.run("mkdir -p data")
-        c.run(
+        c.run(f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans")
-            f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans"
-        )

app/wiki/docker-compose.prod.yml

@@ -0,0 +1,33 @@
+version: "3"
+
+services:
+
+  db:
+    image: postgres:15.2-alpine
+    environment:
+      POSTGRES_DB: wiki
+      POSTGRES_PASSWORD: wikijsrocks
+      POSTGRES_USER: wikijs
+    logging:
+      driver: "none"
+    restart: unless-stopped
+    volumes:
+      - db-data:/var/lib/postgresql/data
+
+  wiki:
+    image: ghcr.io/requarks/wiki:2.5.299
+    depends_on:
+      - db
+    environment:
+      DB_TYPE: postgres
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_USER: wikijs
+      DB_PASS: wikijsrocks
+      DB_NAME: wiki
+    restart: unless-stopped
+    ports:
+      - "${WEB_SERVER_PORT}:3000"
+
+volumes:
+  db-data:

app/wiki/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - db-data:/var/lib/postgresql/data
 
   wiki:
-    image: ghcr.io/requarks/wiki:2.5.300
+    image: ghcr.io/requarks/wiki:2.5.299
     depends_on:
       - db
     environment:
@@ -27,7 +27,7 @@ services:
       DB_NAME: wiki
     restart: unless-stopped
     ports:
-      - "${WEB_SERVER_PORT}:3000"
+      - "9080:3000"
 
 volumes:
   db-data:

app/wiki/tasks.py

@@ -17,10 +17,8 @@ def deploy(c):
     print("Ready to setup remote host")
     with Connection(SSH_HOST) as c:
         c.put(
-            "docker-compose.yml",
+            "docker-compose.prod.yml",
             remote=f"/home/{APP_NAME}/docker-compose.yml",
         )
         c.run("cp .env .env.prod")
-        c.run(
+        c.run(f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans")
-            f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans"
-        )