mit yamllint syntax verbessert

.gitea/workflows/yamllint.yml

@@ -1,72 +0,0 @@
----
-name: CI/CD Pipeline
-
-"on":
-  push:
-    branches: [main, flip_dev, hannes]
-
-jobs:
-  lint:
-    runs-on: docker
-    container:
-      image: node:20-bullseye
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install Python & linters
-        run: |
-          apt-get update && apt-get install -y python3 python3-pip bash git
-          pip3 install --upgrade pip
-          pip3 install yamllint ansible-lint
-
-      - name: Run linters
-        run: |
-          yamllint .
-    
-  deploy:
-    runs-on: docker
-    container:
-      image: node:20-bullseye
-    needs: build
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install Ansible & dependencies
-        run: |
-          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
-        shell: bash
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
-        run: |
-          set -euo pipefail
-
-          mkdir -p ~/.ssh
-          chmod 700 ~/.ssh
-
-          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)"
-          if [ -n "${SSH_PASSPHRASE:-}" ]; then
-            echo "$SSH_PASSPHRASE" | ssh-add ~/.ssh/id_ed25519
-          else
-            ssh-add ~/.ssh/id_ed25519
-          fi
-
-          ssh -o BatchMode=yes root@213.95.90.157 true
-
-      - name: Run Ansible
-        run: |
-          ansible-playbook -i ansible/inventory.yaml site.yaml
-  

.gitlab-ci.yml

@@ -0,0 +1,11 @@
+---
+stages:
+  - lint
+
+yamllint:
+  stage: lint
+  image: python:3.12-alpine
+  before_script:
+    - pip install --no-cache-dir yamllint
+  script:
+    - yamllint .

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "ansible.python.interpreterPath": "/opt/homebrew/bin/python3"
-}

.yamllint.yml

@@ -1,19 +0,0 @@
----
-extends: default
-
-ignore: |
-  ^venv/*
-  ^\.venv/*
-  ^\.gitea/*
-  ^\.git/*
-  ^\.ansible_test/*
-  ^ansible_test/*
-  ^\.ansiblelint/*
-
-rules:
-  line-length:
-    max: 400
-    level: warning
-  trailing-spaces: disable
-  indentation:
-    spaces: 2

ansible.cfg

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

ansible/inventory.yaml

@@ -4,3 +4,4 @@ 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,8 +1,24 @@
+---
 - hosts: all
   become: true
+  roles:
+    - docker/snake
   vars:
     app_dir: /opt/docker/snake
-    snake_image: dns.s-martika.com/smartika/snake-game:2.0
 
-  roles:
+  tasks:
-    - role: docker/snake
+    - name: Create app directory
+      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 | bash
+      shell: curl -fsSL https://get.docker.com | sh
       args:
         creates: /usr/bin/docker
 

ansible/playbooks/monitoring.yaml

@@ -1,33 +1,21 @@
+---
 - hosts: all
   become: true
   vars:
     monitor_dir: /opt/docker/monitoring
-    docker_network: monitoring
 
   tasks:
-    - name: Ensure monitoring directory exists
+    - name: Create monitoring directory
       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: Ensure monitoring Docker network exists
+    - name: Start monitoring
-      docker_network:
+      command: docker compose up -d
-        name: "{{ docker_network }}"
+      args:
-        state: present
+        chdir: "{{ monitor_dir }}"
-
-    - 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

@@ -1,11 +0,0 @@
-- 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:2.0
+snake_image: dns.s-martika.com/smartika/snake-game
-app_dir: /opt/docker/snake 
+snake_tag: "1.0"
 snake_container_name: snake-game
 snake_port: 8080

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

@@ -2,12 +2,8 @@
 version: "3.8"
 services:
   snake:
-    image: dns.s-martika.com/smartika/snake-game:2.0
+    image: dns.s-martika.com/smartika/snake-game:1.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,43 +1,22 @@
 ---
-
-- 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: "{{ snake_image }}"
+    name: dns.s-martika.com/smartika/snake-game
+    tag: "1.0"
     source: pull
 
-# Run container
+
 - name: Run snake-game container
   docker_container:
     name: snake-game
-    image: "{{ snake_image }}"
+    image: dns.s-martika.com/smartika/snake-game:1.0
     state: started
-    restart_policy: unless-stopped
+    restart_policy: always
     ports:
-      - "8080:80"  # host port → container port
+      - "8080:80"
-    pull: yes
-    networks:
-      - name: snake_net
-
-
-

docker/monitoring/docker-compose.yaml

@@ -1,43 +1,33 @@
+---
 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
+    user: "472"
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning:ro
+      - grafana_data:/var/lib/grafana
+    environment:
+      GF_SECURITY_ADMIN_PASSWORD: "admin"
+    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/grafana/provisioning/dashboards.yaml

@@ -2,9 +2,9 @@
 apiVersion: 1
 
 providers:
-  - name: 'default'
+  - name: default
-    folder: 'Home'
+    orgId: 1
+    folder: ""
     type: file
-    editable: true
     options:
-      path: /var/lib/grafana/dashboards
+      path: /etc/grafana/provisioning/dashboards

docker/monitoring/prometheus.yaml

@@ -6,21 +6,3 @@ 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