From dd10cb8bf95458bafc55d296d5bfdc9156fd1455 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sat, 21 Nov 2020 15:10:42 +0100 Subject: [PATCH 1/2] Ajout d'un readme et d'un docker-compose --- .gitignore | 1 + README.md | 14 ++++++++++++ docker-compose.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++++ nginx.conf | 18 ++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 docker-compose.yml create mode 100644 nginx.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea26ec2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.data diff --git a/README.md b/README.md new file mode 100644 index 0000000..9b5071a --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# Halo-Battle + +## Développer +HB peut petre lancé localement via un docker. Pour cela, vous devez avoir installé Docker et docker-compose. +une fois installé, lancez un `docker-compouse up` à la racine du repo. Une fois que tout à boot, vous devez +injecter le code SQL avec `docker exec -i game_mariadb_1 mysql --user=hb --password=hb hb_game < schema.sql` + +HB est alors disponible sur http://localhost:8080. + +À la création du compte, aucun email n'est envoyé. Pour récupérer votre code de confirmation, vous devez +vous connecter au serveur MySQL via `docker exec -it game_mariadb_1 mysql --user=hb --password=hb hb_game` +et récupérer votre jeton d'activation via `select id_activ from user_inscriptions WHERE pseudo LIKE 'VOTRE_PSEUDO_A_REMPLACER';` +une fois l'ID récupérer, rendez-vous à l'adresse http://localhost:8080/?p=validation&i=VOTRE_ID (pensez +bien à modifier l'id dans l'URL). diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c70d317 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,53 @@ +version: '3.2' + +networks: + halonet: + driver: bridge + +services: + mariadb: + restart: always + image: mariadb:10.5.8-focal + networks: + - halonet + volumes: + - .data:/var/lib/mysql + environment: + - MYSQL_USER=hb + - MYSQL_PASSWORD=hb + - MYSQL_ROOT_PASSWORD=hb + - MYSQL_DATABASE=hb_game + + hb: + image: hb + container_name: hb + depends_on: + - mariadb + networks: + - halonet + volumes: + - ./htdocs:/usr/src/hb-main/htdocs:rw + - ./onyx2:/usr/src/hb-main/onyx2:rw + # make cache and compile writable + don't add file to local host + - /usr/src/hb-main/onyx2/cache + - /usr/src/hb-main/onyx2/log + - /usr/src/hb-main/onyx2/modules/templates/compile + environment: + - MYSQL_DATABASE=hb_game + - MYSQL_HOST=mariadb + - MYSQL_USER=hb + - MYSQL_PASSWORD=hb + - DISABLE_TLS=true + - DEV=true + + nginx: + image: nginx:1.19.4-alpine + depends_on: + - hb + networks: + - halonet + volumes: + - ./nginx.conf:/etc/nginx/conf.d/default.conf + - ./htdocs:/usr/src/hb-main/htdocs:ro + ports: + - "8080:80" diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..f50c647 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,18 @@ +server { + listen 80; + server_name localhost; + root /usr/src/hb-main/htdocs; + + location / { + try_files $uri $uri?$query_string /index.php?$query_string; + } + + location ~* \.php$ { + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_NAME $fastcgi_script_name; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_index index.php; + fastcgi_pass hb:9000; + } +} -- 2.47.2 From af280ac4fe90034a6ac30281042a44383d422353 Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sat, 21 Nov 2020 19:53:43 +0100 Subject: [PATCH 2/2] Corrections suite aux retours de Nemu --- docker-compose.yml | 4 ++-- nginx.conf | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c70d317..1f8e5f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ networks: services: mariadb: restart: always - image: mariadb:10.5.8-focal + image: mariadb:10-focal networks: - halonet volumes: @@ -41,7 +41,7 @@ services: - DEV=true nginx: - image: nginx:1.19.4-alpine + image: nginx:1-alpine depends_on: - hb networks: diff --git a/nginx.conf b/nginx.conf index f50c647..5df62c8 100644 --- a/nginx.conf +++ b/nginx.conf @@ -4,13 +4,16 @@ server { root /usr/src/hb-main/htdocs; location / { - try_files $uri $uri?$query_string /index.php?$query_string; + index index.php; + try_files $uri $uri/ /index.php; } location ~* \.php$ { include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_NAME $fastcgi_script_name; + fastcgi_param HTTP_HOST $server_name; + fastcgi_param REMOTE_ADDR $remote_addr; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; fastcgi_pass hb:9000; -- 2.47.2