re ok, erase useless thing

2025-12-16 14:07:49 +01:00 · 2024-08-13 14:12:30 +02:00 · 2024-08-13 14:12:30 +02:00 · 7d1426d7a1
commit 7d1426d7a1
parent b1c865acae
8 changed files with 27 additions and 395 deletions
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -1,128 +0,0 @@
-services:
-  backend:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: backend
-    container_name: backend
-    restart: always
-    command: /bin/sh -c "sleep 5 &&
-      venv/bin/python manage.py makemigrations --noinput &&
-      venv/bin/python manage.py migrate --noinput && 
-      venv/bin/python manage.py collectstatic --noinput &&
-      venv/bin/daphne -b 0.0.0.0 -p 8080 pong.asgi:application"
-    volumes:
-      - pong:/transcendence/pong
-    ports:
-      - "8080:8080"
-    networks:
-      - app-network
-    environment:
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB}
-      DB_USER: ${POSTGRES_USER}
-      DB_PASSWORD: ${POSTGRES_PASSWORD}
-    depends_on:
-      - db
-
-  db:
-    image: postgres:latest
-    container_name: postgres
-    restart: always
-    volumes:
-      - pong_pg_data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-    networks:
-      - app-network
-    environment:
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-    #healthcheck:
-      #test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      #interval: 10s
-      #timeout: 5s
-      #retries: 5
-
-  es01:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-    container_name: es01
-    volumes:
-      - pong_logstash_data_01:/usr/share/elasticsearch/data
-    ports:
-      - "127.0.0.1:9200:9200"
-    networks:
-      - app-network
-    environment:
-      - node.name=es01
-      - cluster.name=${CLUSTER_NAME}
-      - discovery.type=single-node
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - xpack.security.enabled=false 
-      - xpack.license.self_generated.type=trial
-    depends_on:
-      - logstash01
-
-  logstash01:
-    image: docker.elastic.co/logstash/logstash:${STACK_VERSION}
-    container_name: logstash01
-    volumes:
-      - ./logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    ports:
-      - "5044:5044"
-    networks:
-      - app-network
-    environment:
-      - ELASTIC_HOSTS=http://es01:9200
-      - ELASTIC_USER=${ELASTIC_USERNAME}
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - xpack.monitoring.enabled=false
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:${STACK_VERSION}
-    container_name: kibana
-    volumes:
-      - pong_kibana:/usr/share/kibana/data
-    user: "1000:1000"
-    ports:
-      - 5601:5601
-    networks:
-      - app-network
-    environment:
-      - SERVERNAME=pong.kibana.org
-      - ELASTICSEARCH_HOSTS=http://es01:9200
-      - ELASTICSEARCH_USERNAME=${ELASTIC_USERNAME}
-      - ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}
-    depends_on:
-      - es01
-    #healthcheck:
-      #test: ["CMD-SHELL", "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'"]
-      #interval: 20s
-      #timeout: 10s
-      #retries: 120
-
-volumes:
-  pong:
-    driver: local
-    driver_opts:
-      type: none
-      device: ${PROJECT_PATH}
-      o: bind
-  pong_pg_data:
-    driver: local
-  pong_es_data_01:
-    driver: local
-  pong_kibana:
-    driver: local
-  pong_logstash_data_01:
-    driver: local
-  pong_filebeat_data_01:
-    driver: local
-
-networks:
-  app-network:
-    driver: bridge
--- a/docker-compose.yaml-simle
+++ b/docker-compose.yaml-simle
@ -1,61 +0,0 @@
-services:
-  backend:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: backend
-    container_name: backend
-    restart: always
-    command: /bin/sh -c "sleep 5 &&
-      venv/bin/python manage.py makemigrations --noinput &&
-      venv/bin/python manage.py migrate --noinput && 
-      venv/bin/python manage.py collectstatic --noinput &&
-      venv/bin/daphne -b 0.0.0.0 -p 8080 pong.asgi:application"
-    volumes:
-      - pong:/transcendence/pong
-    ports:
-      - "8080:8080"
-    networks:
-      - app-network
-    environment:
-      DB_HOST: db
-      DB_PORT: 5432
-      DB_NAME: ${POSTGRES_DB}
-      DB_USER: ${POSTGRES_USER}
-      DB_PASSWORD: ${POSTGRES_PASSWORD}
-    depends_on:
-      - db
-
-  db:
-    image: postgres:latest
-    container_name: postgres
-    restart: always
-    volumes:
-      - pong_pg_data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-    networks:
-      - app-network
-    environment:
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-volumes:
-  pong:
-    driver: local
-    driver_opts:
-      type: none
-      device: ${PROJECT_PATH}
-      o: bind
-  pong_pg_data:
-    driver: local
-
-networks:
-  app-network:
-    driver: bridge
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,59 +1,4 @@
 services:
-  setup:
-   image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-   volumes:
-     - certs:/usr/share/elasticsearch/config/certs
-   user: "0"
-   command: >
-     bash -c '
-       if [ x${ELASTIC_PASSWORD} == x ]; then
-         echo "Set the ELASTIC_PASSWORD environment variable in the .env file";
-         exit 1;
-       elif [ x${KIBANA_PASSWORD} == x ]; then
-         echo "Set the KIBANA_PASSWORD environment variable in the .env file";
-         exit 1;
-       fi;
-       if [ ! -f config/certs/ca.zip ]; then
-         echo "Creating CA";
-         bin/elasticsearch-certutil ca --silent --pem -out config/certs/ca.zip;
-         unzip config/certs/ca.zip -d config/certs;
-       fi;
-       if [ ! -f config/certs/certs.zip ]; then
-         echo "Creating certs";
-         echo -ne \
-         "instances:\n"\
-         "  - name: es01\n"\
-         "    dns:\n"\
-         "      - es01\n"\
-         "      - localhost\n"\
-         "    ip:\n"\
-         "      - 127.0.0.1\n"\
-         "  - name: kibana\n"\
-         "    dns:\n"\
-         "      - kibana\n"\
-         "      - localhost\n"\
-         "    ip:\n"\
-         "      - 127.0.0.1\n"\
-         > config/certs/instances.yml;
-         bin/elasticsearch-certutil cert --silent --pem -out config/certs/certs.zip --in config/certs/instances.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key;
-         unzip config/certs/certs.zip -d config/certs;
-       fi;
-       echo "Setting file permissions"
-       chown -R root:root config/certs;
-       find . -type d -exec chmod 750 \{\} \;;
-       find . -type f -exec chmod 640 \{\} \;;
-       echo "Waiting for Elasticsearch availability";
-       until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
-       echo "Setting kibana_system password";
-       until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done;
-       echo "All done!";
-     '
-   healthcheck:
-     test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"]
-     interval: 1s
-     timeout: 5s
-     retries: 120 
-
  backend:
    build:
      context: .
@ -95,101 +40,13 @@ services:
      POSTGRES_DB: ${POSTGRES_DB}
      POSTGRES_USER: ${POSTGRES_USER}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-    #healthcheck:
-      #test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      #interval: 10s
-      #timeout: 5s
-      #retries: 5
-
-  es01:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
-    container_name: es01
-    volumes:
-      - certs:/usr/share/elasticsearch/config/certs
-      - pong_logstash_data_01:/usr/share/elasticsearch/data
-    ports:
-      - "127.0.0.1:9200:9200"
-    networks:
-      - app-network
-    environment:
-      - node.name=es01
-      - cluster.name=${CLUSTER_NAME}
-      - discovery.type=single-node
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - bootstrap.memory_lock=true
-      - xpack.security.enabled=true
-      - xpack.security.http.ssl.enabled=true
-      - xpack.security.http.ssl.key=certs/es01/es01.key
-      - xpack.security.http.ssl.certificate=certs/es01/es01.crt
-      - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt
-      - xpack.security.transport.ssl.enabled=true
-      - xpack.security.transport.ssl.key=certs/es01/es01.key
-      - xpack.security.transport.ssl.certificate=certs/es01/es01.crt
-      - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt
-      - xpack.security.transport.ssl.verification_mode=certificate
-      - xpack.license.self_generated.type=${LICENSE}
-    depends_on:
-      - logstash01
-
-  logstash01:
-    image: docker.elastic.co/logstash/logstash:${STACK_VERSION}
-    container_name: logstash01
-    volumes:
-      - ./logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro
-    ports:
-      - "5044:5044"
-    networks:
-      - app-network
-    environment:
-      - ELASTIC_HOSTS=http://es01:9200
-      - ELASTIC_USER=${ELASTIC_USERNAME}
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - xpack.monitoring.enabled=false
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:${STACK_VERSION}
-    container_name: kibana
-    volumes:
-      - pong_kibana:/usr/share/kibana/data
-    user: "1000:1000"
-    ports:
-      - 5601:5601
-    networks:
-      - app-network
-    environment:
-      - SERVERNAME=pong.kibana.org
-      - ELASTICSEARCH_HOSTS=http://es01:9200
-      - ELASTICSEARCH_USERNAME=${ELASTIC_USERNAME}
-      - ELASTICSEARCH_PASSWORD=${ELASTIC_PASSWORD}
-    depends_on:
-      - es01
-    #healthcheck:
-      #test: ["CMD-SHELL", "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'"]
-      #interval: 20s
-      #timeout: 10s
-      #retries: 120
-
-  filebeat01:
-    depends_on:
-      - es01
-    image: docker.elastic.co/beats/filebeat:${STACK_VERSION}
-    volumes:
-      - pong_filebeat_data_01:/usr/share/filebeat/data
-      - ./filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      - ELASTIC_USER=elastic
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - ELASTIC_HOSTS=https://es01:9200
-      - KIBANA_HOSTS=http://kibana:5601
-      - LOGSTASH_HOSTS=http://logstash01:9600
-    networks:
-      - app-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5

 volumes:
-  certs:
-    driver: local
  pong:
    driver: local
    driver_opts:
@ -198,14 +55,6 @@ volumes:
      o: bind
  pong_pg_data:
    driver: local
-  pong_es_data_01:
-    driver: local
-  pong_kibana:
-    driver: local
-  pong_logstash_data_01:
-    driver: local
-  pong_filebeat_data_01:
-    driver: local

 networks:
  app-network:
--- a/filebeat.yml
+++ b/filebeat.yml
@ -1,10 +0,0 @@
-filebeat.inputs:
- type: docker
-  containers.ids:
-    - "*"
-
-processors:
- add_docker_metadata: ~
-
-output.logstash:
-  hosts: ["http://logstash01:5044"]
--- a/logstash.conf
+++ b/logstash.conf
@ -1,21 +0,0 @@
-input {
-	file {
-		path => "/var/lib/docker/containers/*/*.log"
-		start_position => "beginning"
-		sincedb_path => "/usr/share/logstash/data/sincedb"
-		type => "docker"
-		codec => "json"
-	}
-}
-
-filter {
-}
-
-output {
-	elasticsearch {
-		hosts => ["http://es01:9200"]
-		index => "docker-logs-%{+YYYY.MM.dd}"
-		user=> "${ELASTIC_USER}"
-		password=> "${ELASTIC_PASSWORD}"
-	}
-}
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-COMPOSE_FILE=docker-compose.yaml
+COMPOSE_FILE=docker-compose.yml
 COMPOSE=docker compose -f $(COMPOSE_FILE)
 CONTAINER=$(c)

@ -20,8 +20,8 @@ down:

 destroy:
 	$(COMPOSE) down -v --rmi all
-	sudo lsof -i :5432 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true
-	sudo lsof -i :80 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true
+	#sudo lsof -i :5432 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true
+	#sudo lsof -i :80 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true

 logs:
 	$(COMPOSE) logs -f $(CONTAINER)
--- a/pong/static/game.js
+++ b/pong/static/game.js
@ -15,7 +15,7 @@ document.addEventListener('DOMContentLoaded', () => {
    //const viewSelector = document.getElementById('view-selector');
    //const viewPlayersButton = document.getElementById('view-players');
    //const viewMatchesButton = document.getElementById('view-matches');
-    const menuButton = document.querySelector('.burger-menu');
+    const menuButton = document.querySelector('burger-menu');
    const playerList = document.getElementById('player-list');
    const matchList = document.getElementById('match-list');
    const tournoiList = document.getElementById('tournoi-list');
@ -271,8 +271,6 @@ document.addEventListener('DOMContentLoaded', () => {
        //}
    //}) 

-    console.log('Here');
-
    function toggleMenu() {
        console.log('Menu toggled');
        if (dropdownMenu.style.display === "block") {
@ -284,7 +282,6 @@ document.addEventListener('DOMContentLoaded', () => {

    function showTable(tableId) {
        // Masquer tous les tableaux
-        printf('Entering showTable')
        console.log('Entering showTable', tableId);
        if (playerList) playerList.style.display = 'none';
        if (matchList) matchList.style.display = 'none';
@ -311,18 +308,24 @@ document.addEventListener('DOMContentLoaded', () => {
    }

    // Ajouter les gestionnaires d'événements
-    if (menuButton) {
    menuButton.addEventListener('click', toggleMenu);
-    }
+
+    /* if (menuButton) {
+        menuButton.addEventListener('click', toggleMenu);

        const links = document.querySelectorAll('#dropdown-menu a');
+        console.log("Here !!!!!!!!!!!!");
+        console.log(links);
+
        links.forEach(link => {
            link.addEventListener('click', (event) => {
                event.preventDefault(); // Empêche le comportement par défaut du lien
                const tableId = link.getAttribute('data-table');
-            showTable(tableId);
+                //showTable(tableId);
            });
        });
+    } */
+    

    function fetchMatches() {
        fetch('/api/match_list/')
--- a/pong/static/index.html
+++ b/pong/static/index.html
@ -129,10 +129,10 @@
        <div class="paddle paddle-right"></div>
        <div class="ball_anim"></div>
    </div>
-    <button id="settings-btn">⚙️ Réglages</button>
+    <button id="settings-btn">⚙️ Réglages TzOTO</button>
    <div id="settings-menu" style="display: none;">
        <button id="close-settings">✖️</button>
-        <h2>Réglages</h2>
+        <h2>Reglages</h2>
        <label for="color-picker">Couleur:</label>
        <input type="color" id="color-picker">
        <br>