Update

:erge branch 'main' of https://dns.s-martika.com/smartika/Wordpress-Ansible

.gitea/workflows/yamllint.yml

@@ -1,9 +1,9 @@
 ---
 name: CI/CD Pipeline
 
-on:
+"on":
   push:
-    branches: [main, flip_dev]
+    branches: [main, flip_dev, hannes]
 
 jobs:
   lint:
@@ -38,21 +38,35 @@ jobs:
           apt-get update && apt-get install -y python3 python3-pip openssh-client bash git
           pip3 install --upgrade pip
           pip3 install ansible
+          ansible-galaxy collection install community.docker:">=3.5.0"
+
       
-      - name: Setup SSH key with passphrase
+      - name: Setup SSH
+        shell: bash
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
         run: |
+          set -euo pipefail
+
           mkdir -p ~/.ssh
-          printf "%s\n" "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 700 ~/.ssh
-          chmod 600 ~/.ssh/id_rsa
+
+          echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+
           ssh-keyscan -H 213.95.90.157 >> ~/.ssh/known_hosts
+
           eval "$(ssh-agent -s)"
-          ssh-add ~/.ssh/id_rsa <<< "${{ secrets.SSH_PASSPHRASE }}"
+          if [ -n "${SSH_PASSPHRASE:-}" ]; then
-
+            echo "$SSH_PASSPHRASE" | ssh-add ~/.ssh/id_ed25519
-
+          else
-      - name: Run Ansible deployment
+            ssh-add ~/.ssh/id_ed25519
-        run: |
-          if [ -n "$SSH_PASSPHRASE" ]; then
-            eval "$(ssh-agent -s)"
-            ssh-add ~/.ssh/id_rsa <<< "$SSH_PASSPHRASE"
           fi
-          ansible-playbook -i ansible/inventory.yaml site.yaml
+
+          ssh -o BatchMode=yes root@213.95.90.157 true
+
+      - name: Run Ansible
+        run: |
+          ansible-playbook -i ansible/inventory.yaml site.yaml
+  

ansible.cfg

@@ -2,3 +2,5 @@
 [defaults]
 inventory = ansible/inventory.yaml
 roles_path = ./roles
+[ssh_connection]
+ssh_args = -o BatchMode=yes -o PreferredAuthentications=publickey

ansible/inventory.yaml

@@ -4,4 +4,3 @@ all:
     server1:
       ansible_host: 213.95.90.157
       ansible_user: root
-      ansible_ssh_private_key_file: /Users/sotos/.ssh/id_rsa

ansible/playbooks/apps.yaml

@@ -1,24 +1,8 @@
----
 - hosts: all
   become: true
-  roles:
-    - docker/snake
   vars:
     app_dir: /opt/docker/snake
+    snake_image: dns.s-martika.com/smartika/snake-game:2.0
 
-  tasks:
+  roles:
-    - name: Create app directory
+    - role: docker/snake
-      file:
-        path: "{{ app_dir }}"
-        state: directory 
-
-    - name: Copy compose file
-      copy:
-        src: "{{ playbook_dir }}/roles/docker/snake/files/docker-compose.yaml"
-        dest: "{{ app_dir }}/docker-compose.yaml"
-
-
-    - name: Start snake container
-      command: docker compose up -d
-      args:
-        chdir: "{{ app_dir }}"

ansible/playbooks/docker.yaml

@@ -13,7 +13,7 @@
         update_cache: true
 
     - name: Install Docker
-      shell: curl -fsSL https://get.docker.com | sh
+      shell: curl -fsSL https://get.docker.com | bash
       args:
         creates: /usr/bin/docker
 

ansible/playbooks/monitoring.yaml

@@ -1,21 +1,33 @@
----
 - hosts: all
   become: true
   vars:
     monitor_dir: /opt/docker/monitoring
+    docker_network: monitoring
 
   tasks:
-    - name: Create monitoring directory
+    - name: Ensure monitoring directory exists
       file:
         path: "{{ monitor_dir }}"
         state: directory
+        owner: root
+        group: root
+        mode: '0755'
 
     - name: Copy monitoring stack
       copy:
         src: ../../docker/monitoring/
         dest: "{{ monitor_dir }}"
+        owner: root
+        group: root
+        mode: '0755'
 
-    - name: Start monitoring
+    - name: Ensure monitoring Docker network exists
-      command: docker compose up -d
+      docker_network:
-      args:
+        name: "{{ docker_network }}"
-        chdir: "{{ monitor_dir }}"
+        state: present
+
+    - name: Start monitoring stack
+      community.docker.docker_compose_v2:
+          project_src: "{{ monitor_dir }}"
+          project_name: monitoring
+          state: present

ansible/playbooks/roles/docker/monitoring/tasks/main.yaml

@@ -0,0 +1,11 @@
+- name: Ensure snake_net exists for monitoring
+  docker_network:
+    name: snake_net
+    state: present
+
+- name: Start monitoring stack
+  community.docker.docker_compose:
+    project_src: /opt/docker/monitoring
+    project_name: monitoring
+    state: present
+    restarted: true

ansible/playbooks/roles/docker/snake/defaults/main.yaml

@@ -3,7 +3,7 @@
 gitea_user: smartika
 gitea_token: "idNu783r4ub7ZXi"
 
-snake_image: dns.s-martika.com/smartika/snake-game
+snake_image: dns.s-martika.com/smartika/snake-game:2.0
-snake_tag: "1.0"
+app_dir: /opt/docker/snake 
 snake_container_name: snake-game
 snake_port: 8080

ansible/playbooks/roles/docker/snake/files/docker-compose.yaml

@@ -2,8 +2,12 @@
 version: "3.8"
 services:
   snake:
-    image: dns.s-martika.com/smartika/snake-game:1.0
+    image: dns.s-martika.com/smartika/snake-game:2.0
     container_name: snake-game777
     restart: unless-stopped
     ports:
       - "8080:80"
+networks:
+    snake_net:
+      external: true
+

ansible/playbooks/roles/docker/snake/tasks/main.yaml

@@ -1,22 +1,43 @@
 ---
+
+- name: Ensure app directory exists
+  file:
+    path: "{{ app_dir }}"
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
+
+- name: Ensure snake_net exists
+  docker_network:
+    name: snake_net
+    state: present
+
+# Login to private registry
 - name: Login to private registry
   docker_login:
     registry_url: dns.s-martika.com
     username: "{{ gitea_user }}"
     password: "{{ gitea_token }}"
 
+# Pull latest image
 - name: Pull snake-game image
   docker_image:
-    name: dns.s-martika.com/smartika/snake-game
+    name: "{{ snake_image }}"
-    tag: "1.0"
     source: pull
 
-
+# Run container
 - name: Run snake-game container
   docker_container:
     name: snake-game
-    image: dns.s-martika.com/smartika/snake-game:1.0
+    image: "{{ snake_image }}"
     state: started
-    restart_policy: always
+    restart_policy: unless-stopped
     ports:
-      - "8080:80"
+      - "8080:80"  # host port → container port
+    pull: yes
+    networks:
+      - name: snake_net
+
+
+

docker/monitoring/docker-compose.yaml

@@ -1,33 +1,43 @@
----
 version: '3.8'
-services:
-  prometheus:
-    image: prom/prometheus:latest
-    volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
-    ports:
-      - "9090:9090"
-    networks:
-      - snake_net
-    restart: unless-stopped
-
-  grafana:
-    image: grafana/grafana:latest
-    volumes:
-      - ./grafana/provisioning:/etc/grafana/provisioning:ro
-      - grafana_data:/var/lib/grafana
-    environment:
-      GF_SECURITY_ADMIN_PASSWORD: "admin"
-      GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH: /var/lib/grafana/dashboards/home.json
-    ports:
-      - "3000:3000"
-    networks:
-      - snake_net
-    restart: unless-stopped
-
-volumes:
-  grafana_data:
 
 networks:
   snake_net:
     external: true
+
+services:
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: monitoring-prometheus
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus.yaml:/etc/prometheus/prometheus.yml
+    networks:
+      - snake_net
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: monitoring-grafana
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning
+      - ./grafana/dashboards:/var/lib/grafana/dashboards
+    networks:
+      - snake_net
+
+  nginx-exporter:
+    image: nginx/nginx-prometheus-exporter:latest
+    container_name: nginx-exporter
+    ports:
+      - "9113:9113"
+    networks:
+      - snake_net
+
+  blackbox-exporter:
+    image: prom/blackbox-exporter:latest
+    container_name: blackbox-exporter
+    ports:
+      - "9115:9115"
+    networks:
+      - snake_net

docker/monitoring/prometheus.yaml

@@ -6,3 +6,21 @@ scrape_configs:
   - job_name: "prometheus"
     static_configs:
       - targets: ["localhost:9090"]
+
+  - job_name: 'nginx'
+    static_configs:
+      - targets: ['nginx-prometheus-exporter:9113']
+
+  - job_name: 'snake-game'
+    metrics_path: /probe
+    params:
+      module: [http_2xx]  # probe returns 1 if HTTP 200
+    static_configs:
+      - targets: ['snake-game:8080']  # snake game container + port
+    relabel_configs:
+      - source_labels: [__address__]
+        target_label: __param_target
+      - source_labels: [__param_target]
+        target_label: instance
+      - target_label: __address__
+        replacement: blackbox-exporter:9115