diff --git a/.github/workflows/promote-to-rc.yml b/.github/workflows/promote-to-rc.yml
index 153ded8..b71c6ef 100644
--- a/.github/workflows/promote-to-rc.yml
+++ b/.github/workflows/promote-to-rc.yml
@@ -60,9 +60,8 @@ jobs:
- name: Build and compress output
run: |
set -x
- mkdir -p output/{k8s,public,nginx}
+ mkdir -p output/{k8s,public}
cp -fr ci/k8s/*.yml output/k8s
- cp -fr ci/nginx/*.conf output/nginx
cp -fr public/* output/public
cp -f ci/Dockerfile output/Dockerfile
tar -cjf output.tar.bz2 -C output .
@@ -80,4 +79,4 @@ jobs:
ansible-playbook -i ci/ansible/inventory.ini \
ci/ansible/playbooks/deploy-output.yml \
--extra-vars="ansible_user=${{ secrets.ANSIBLE_USER }} ansible_password=${{ secrets.ANSIBLE_PASS }} current_directory=$(pwd) \
- remote_folder=${REMOTE_FOLDER}"
+ remote_folder=${REMOTE_FOLDER} env=${{ vars.ENV }}"
diff --git a/.github/workflows/publish-changes.yml b/.github/workflows/publish-changes.yml
index 60cc0b1..3e9aed7 100644
--- a/.github/workflows/publish-changes.yml
+++ b/.github/workflows/publish-changes.yml
@@ -35,9 +35,8 @@ jobs:
- name: Build and compress output
run: |
set -x
- mkdir -p output/{k8s,public,nginx}
+ mkdir -p output/{k8s,public}
cp -fr ci/k8s/*.yml output/k8s
- cp -fr ci/nginx/*.conf output/nginx
cp -fr public/* output/public
cp -f ci/Dockerfile output/Dockerfile
tar -cjf output.tar.bz2 -C output .
@@ -55,4 +54,4 @@ jobs:
ansible-playbook -i ci/ansible/inventory.ini \
ci/ansible/playbooks/deploy-output.yml \
--extra-vars="ansible_user=${{ secrets.ANSIBLE_USER }} ansible_password=${{ secrets.ANSIBLE_PASS }} current_directory=$(pwd) \
- remote_folder=${REMOTE_FOLDER}"
+ remote_folder=${REMOTE_FOLDER} env=${{ vars.ENV }}"
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 42bf20d..90b58bc 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -67,9 +67,8 @@ jobs:
- name: Build and compress output
run: |
set -x
- mkdir -p output/{k8s,public,nginx}
+ mkdir -p output/{k8s,public}
cp -fr ci/k8s/*.yml output/k8s
- cp -fr ci/nginx/*.conf output/nginx
cp -fr public/* output/public
cp -f ci/Dockerfile output/Dockerfile
tar -cjf output.tar.bz2 -C output .
@@ -87,4 +86,4 @@ jobs:
ansible-playbook -i ci/ansible/inventory.ini \
ci/ansible/playbooks/deploy-output.yml \
--extra-vars="ansible_user=${{ secrets.ANSIBLE_USER }} ansible_password=${{ secrets.ANSIBLE_PASS }} current_directory=$(pwd) \
- remote_folder=${REMOTE_FOLDER}"
+ remote_folder=${REMOTE_FOLDER} env=${{ vars.ENV }}"
diff --git a/ci/ansible/playbooks/deploy-output.yml b/ci/ansible/playbooks/deploy-output.yml
index 3efa7eb..b070927 100644
--- a/ci/ansible/playbooks/deploy-output.yml
+++ b/ci/ansible/playbooks/deploy-output.yml
@@ -7,6 +7,7 @@
ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
remote_folder: null # provided in param
current_directory: null # provided in param
+ env: null # provided in param
tasks:
- name: Create folder
ansible.builtin.file:
@@ -27,6 +28,7 @@
set -x
cd {{ remote_folder }};
sudo microk8s kubectl apply -f k8s/
+ sudo microk8s kubectl rollout restart deployment/tutoriel-deployment-{{ env }}
- name: Clean up
ansible.builtin.file:
path: '{{ remote_folder }}'
diff --git a/ci/nginx/nginx.conf b/ci/nginx/nginx.conf
deleted file mode 100644
index 6c2d8a9..0000000
--- a/ci/nginx/nginx.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-server {
- listen 80;
- server_name localhost;
- root /var/www/localhost;
- add_header X-Frame-Options "SAMEORIGIN";
- location / {
- try_files $uri $uri/ $uri/index.html /index.html =404;
- }
- error_page 404 /404.html;
- location = /404.html {
- internal;
- }
-}
\ No newline at end of file
diff --git a/mdx/2022-09-27-du-monolitique-aux-microservices.mdx b/mdx/general/du-monolitique-aux-microservices.mdx
similarity index 98%
rename from mdx/2022-09-27-du-monolitique-aux-microservices.mdx
rename to mdx/general/du-monolitique-aux-microservices.mdx
index 3b43cb3..505fbf0 100644
--- a/mdx/2022-09-27-du-monolitique-aux-microservices.mdx
+++ b/mdx/general/du-monolitique-aux-microservices.mdx
@@ -1,5 +1,5 @@
---
-title: 'Du monolitique aux microservices'
+title: Du monolitique aux microservices
slug: du-monolitique-aux-microservices
date: 2022-09-27
author: lkpeto
diff --git a/mdx/2022-09-30-exposer-une-application-locale-sur-internet.mdx b/mdx/general/exposer-une-application-locale-sur-internet.mdx
similarity index 98%
rename from mdx/2022-09-30-exposer-une-application-locale-sur-internet.mdx
rename to mdx/general/exposer-une-application-locale-sur-internet.mdx
index 1918519..65ae017 100644
--- a/mdx/2022-09-30-exposer-une-application-locale-sur-internet.mdx
+++ b/mdx/general/exposer-une-application-locale-sur-internet.mdx
@@ -1,5 +1,5 @@
---
-title: 'Comment exposer une application locale sur internet ?'
+title: Comment exposer une application locale sur internet ?
slug: comment-exposer-une-application-locale-sur-internet
date: 2022-09-30
author: lkpeto
diff --git a/mdx/2022-10-01-installer-jenkins-avec-docker-compose.mdx b/mdx/general/installer-jenkins-avec-docker-compose.mdx
similarity index 98%
rename from mdx/2022-10-01-installer-jenkins-avec-docker-compose.mdx
rename to mdx/general/installer-jenkins-avec-docker-compose.mdx
index 03b128e..147446b 100644
--- a/mdx/2022-10-01-installer-jenkins-avec-docker-compose.mdx
+++ b/mdx/general/installer-jenkins-avec-docker-compose.mdx
@@ -1,5 +1,5 @@
---
-title: 'Installer Jenkins avec docker compose'
+title: Installer Jenkins avec docker compose
slug: installer-jenkins-avec-docker-compose
date: 2022-10-01
author: lkpeto
diff --git a/src/components/PostLayout.jsx b/src/components/PostLayout.jsx
new file mode 100644
index 0000000..973ed37
--- /dev/null
+++ b/src/components/PostLayout.jsx
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+export function PostLayout({ title, children }) {
+ return (
+ {title}
+ {children}
+