From 9611fbb459b89c7250f338b9be135be1531223bd Mon Sep 17 00:00:00 2001 From: trash07 Date: Sun, 1 Mar 2026 13:05:27 -0500 Subject: [PATCH 1/5] fix: remove unused nginx configs --- .github/workflows/promote-to-rc.yml | 3 +-- .github/workflows/publish-changes.yml | 3 +-- .github/workflows/pull-request.yml | 3 +-- ci/nginx/nginx.conf | 13 ------------- 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 ci/nginx/nginx.conf diff --git a/.github/workflows/promote-to-rc.yml b/.github/workflows/promote-to-rc.yml index 153ded8..4e729ef 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 . diff --git a/.github/workflows/publish-changes.yml b/.github/workflows/publish-changes.yml index 60cc0b1..8682983 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 . diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 42bf20d..04adfb8 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 . 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 From c14f59e5dfdc6f08a76607106e0067b00aa522d6 Mon Sep 17 00:00:00 2001 From: trash07 Date: Sun, 1 Mar 2026 13:11:54 -0500 Subject: [PATCH 2/5] fix: reoganize posts --- .../du-monolitique-aux-microservices.mdx} | 2 +- .../exposer-une-application-locale-sur-internet.mdx} | 2 +- .../installer-jenkins-avec-docker-compose.mdx} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename mdx/{2022-09-27-du-monolitique-aux-microservices.mdx => general/du-monolitique-aux-microservices.mdx} (98%) rename mdx/{2022-09-30-exposer-une-application-locale-sur-internet.mdx => general/exposer-une-application-locale-sur-internet.mdx} (98%) rename mdx/{2022-10-01-installer-jenkins-avec-docker-compose.mdx => general/installer-jenkins-avec-docker-compose.mdx} (98%) 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 From 18de0173259c1d107d649f4aaa23b860c9859d59 Mon Sep 17 00:00:00 2001 From: trash07 Date: Sun, 1 Mar 2026 13:24:15 -0500 Subject: [PATCH 3/5] feat: basic post layout --- src/components/PostLayout.jsx | 10 ++++++++++ src/pages/blog-posts/{mdx.frontmatter__slug}.jsx | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/components/PostLayout.jsx 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} +
+ ); +} diff --git a/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx b/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx index b87a4f1..9ec4364 100644 --- a/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx +++ b/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx @@ -1,7 +1,14 @@ import * as React from 'react'; +import { PostLayout } from '../../components/PostLayout'; -const PostPage = (props) => { - return <>{props.children}; +const PostPage = ({ pageContext, children }) => { + const { frontmatter } = pageContext; + return {children}; }; export default PostPage; + +export const Head = ({ pageContext }) => { + const { frontmatter } = pageContext; + return {frontmatter.title}; +}; From 8d7f9f8a5f6a62d045daf24a0cdf0d86d884e8e9 Mon Sep 17 00:00:00 2001 From: trash07 Date: Sun, 1 Mar 2026 13:33:48 -0500 Subject: [PATCH 4/5] feat: update page layout --- src/pages/blog-posts/{mdx.frontmatter__slug}.jsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx b/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx index 9ec4364..061142e 100644 --- a/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx +++ b/src/pages/blog-posts/{mdx.frontmatter__slug}.jsx @@ -1,14 +1,12 @@ import * as React from 'react'; import { PostLayout } from '../../components/PostLayout'; -const PostPage = ({ pageContext, children }) => { - const { frontmatter } = pageContext; - return {children}; -}; - -export default PostPage; - export const Head = ({ pageContext }) => { const { frontmatter } = pageContext; return {frontmatter.title}; }; + +export default function PostPage({ pageContext, children }) { + const { frontmatter } = pageContext; + return {children}; +} From 24b79c7ea9b63b74c2ee4f98643823f54b69ea4d Mon Sep 17 00:00:00 2001 From: trash07 Date: Sun, 1 Mar 2026 13:50:41 -0500 Subject: [PATCH 5/5] fix: restart pods after deploy --- .github/workflows/promote-to-rc.yml | 2 +- .github/workflows/publish-changes.yml | 2 +- .github/workflows/pull-request.yml | 2 +- ci/ansible/playbooks/deploy-output.yml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/promote-to-rc.yml b/.github/workflows/promote-to-rc.yml index 4e729ef..b71c6ef 100644 --- a/.github/workflows/promote-to-rc.yml +++ b/.github/workflows/promote-to-rc.yml @@ -79,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 8682983..3e9aed7 100644 --- a/.github/workflows/publish-changes.yml +++ b/.github/workflows/publish-changes.yml @@ -54,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 04adfb8..90b58bc 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -86,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 }}'