From 2f5d9655444efb5c9d3548e4c1ce3b2a72bb961e Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:54:26 +0200 Subject: [PATCH 01/28] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index fe61a15f..de6f09ee 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Sample "Hello, World" Application

+

Bonjour, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From dee0cc331f3b0c591cf92f60e38f78e5af6cd6d8 Mon Sep 17 00:00:00 2001 From: Mariiousse Date: Mon, 23 Oct 2023 12:49:59 +0200 Subject: [PATCH 02/28] =?UTF-8?q?jaichang=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index de6f09ee..f029f934 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonjour, ceci est notre application Groupe 4

+

Bonsoir, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 4dd033610191b2afe38bc24facf5bec8bf40526d Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 09:43:04 +0200 Subject: [PATCH 03/28] Create main.yml SKJFD?NV.N?CKLVJDFKV.ZER? --- .github/workflows/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..3fe11dc9 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,10 @@ +name: Industrialisation continue sur le serveur AWS (Tomcat) +on: push +jobs: + Deploy: + name: Deploy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - run: | + jar cvf groupeX.war * && ls From 45eba92811f1f28bc0997a091138a37167c96ac0 Mon Sep 17 00:00:00 2001 From: Mariiousse Date: Fri, 27 Oct 2023 09:49:49 +0200 Subject: [PATCH 04/28] jsp ce que je fais --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f029f934..39d13b91 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir, ceci est notre application Groupe 4

+

Bonsoir World, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 44c24d955a383f57fa421538d7ae54dba8e63f99 Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 09:57:45 +0200 Subject: [PATCH 05/28] Update main.yml g rajt groupe 4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3fe11dc9..4ec41388 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,4 +7,4 @@ jobs: steps: - uses: actions/checkout@master - run: | - jar cvf groupeX.war * && ls + jar cvf groupe4.war * && ls From 45479065e96ab0a70b51eb172ff5e3dd84cdb926 Mon Sep 17 00:00:00 2001 From: Mariiousse Date: Fri, 27 Oct 2023 10:05:52 +0200 Subject: [PATCH 06/28] pouet pouet --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 39d13b91..29fa8f5a 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir World, ceci est notre application Groupe 4

+

Bonsoir PARIS YEAH YEAH YEAAAH, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 1e43696606446a6d18d3e7fee0c4f6063406d034 Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:11:05 +0200 Subject: [PATCH 07/28] Update index.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit j'ai ajouté sadish --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f029f934..ed5bcb38 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir, ceci est notre application Groupe 4

+

Bonsoir Sadish, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 62f05dbc82940442179f577d70bf4cc58c990fd3 Mon Sep 17 00:00:00 2001 From: Mariiousse Date: Fri, 27 Oct 2023 10:23:01 +0200 Subject: [PATCH 08/28] oui --- .vscode/settings.json | 5 +++++ index.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..b242572e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] +} \ No newline at end of file diff --git a/index.html b/index.html index 29fa8f5a..e59f4f73 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir PARIS YEAH YEAH YEAAAH, ceci est notre application Groupe 4

+

Bonsoir PARIS, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From e25b5f651ff399516f19b6700743040bc421bcdd Mon Sep 17 00:00:00 2001 From: Mariiousse Date: Fri, 27 Oct 2023 10:34:33 +0200 Subject: [PATCH 09/28] SDKJEDJKFRKLFDVKLDFVRKL --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e59f4f73..1c26e3e0 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir PARIS, ceci est notre application Groupe 4

+

Bonsoir TA MER ELA PUTE, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 7c634d789feba9522c8770f30bcec93ce46bc337 Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:40:27 +0200 Subject: [PATCH 10/28] Update main.yml --- .github/workflows/main.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ec41388..edb4de24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,4 +7,13 @@ jobs: steps: - uses: actions/checkout@master - run: | - jar cvf groupe4.war * && ls + jar cvf groupe4.war * + - name: copy file via ssh password + uses: appleboy/scp-action@master + with: + host: ${{ secrets.HOST_DNS }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + port: ${{ secrets.DEPLOY_PORT }} + source: "boris.war" + target: "/opt/tomcat/webapps" From 57dc5d521d8b3a84f2245edc9af1b6eb2858a66d Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:43:09 +0200 Subject: [PATCH 11/28] modifi --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 1c26e3e0..33c93298 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir TA MER ELA PUTE, ceci est notre application Groupe 4

+

Bonsoir ok, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 8a95aca87b795decb085c8ecd8c7591e82e500a1 Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:54:38 +0200 Subject: [PATCH 12/28] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 33c93298..73ed15ae 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Bonsoir ok, ceci est notre application Groupe 4

+

Allo Bassem, ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 5de56f61df39a85164acb047fbadaf6e2979abd5 Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:58:15 +0200 Subject: [PATCH 13/28] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 73ed15ae..ab652222 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Allo Bassem, ceci est notre application Groupe 4

+

Allo Bassem, ouai c'est Greg ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 18baa093ad1af4268b704187081df6f77c11c72f Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:00:38 +0200 Subject: [PATCH 14/28] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ab652222..c7ff2c34 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Allo Bassem, ouai c'est Greg ceci est notre application Groupe 4

+

Allo Bassem, ouai c'est le fils de Greg ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 0b66b8982497e8cdaf02aa4e9ed221fb635e86de Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:04:26 +0200 Subject: [PATCH 15/28] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edb4de24..496a6b06 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,5 +15,5 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} port: ${{ secrets.DEPLOY_PORT }} - source: "boris.war" + source: "groupe4.war" target: "/opt/tomcat/webapps" From 0773f2bf5639278e21400421f92486aba3233312 Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:04:45 +0200 Subject: [PATCH 16/28] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index c7ff2c34..1caa07b9 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ -

Allo Bassem, ouai c'est le fils de Greg ceci est notre application Groupe 4

+

Allo Bassecacacam, ouai c'est le fils de Greg ceci est notre application Groupe 4

This is the home page for a sample application used to illustrate the source directory organization of a web application utilizing the principles outlined in the Application Developer's Guide. From 8c94608210b4f668d25b902dcf5861dbe3f97d52 Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:05:56 +0200 Subject: [PATCH 17/28] Update index.html --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 1caa07b9..f720fb74 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,9 @@ +

Allo Bassecacacam, ouai c'est le fils de Greg ceci est notre application Groupe 4

-

This is the home page for a sample application used to illustrate the -source directory organization of a web application utilizing the principles -outlined in the Application Developer's Guide. +

Allo salut saidsh. From 0cbfc524726239de13357fdbb53c7baae47db911 Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:01:32 +0100 Subject: [PATCH 23/28] Update main.yml --- .github/workflows/main.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 496a6b06..53ba5db8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,19 +1,20 @@ -name: Industrialisation continue sur le serveur AWS (Tomcat) +name: Industrialisation continue sur le serveur AWS on: push jobs: Deploy: name: Deploy runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - run: | - jar cvf groupe4.war * - - name: copy file via ssh password - uses: appleboy/scp-action@master - with: - host: ${{ secrets.HOST_DNS }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.EC2_SSH_KEY }} - port: ${{ secrets.DEPLOY_PORT }} - source: "groupe4.war" - target: "/opt/tomcat/webapps" + +uses: actions/checkout@master +run: | + jar cvf sadish.war * +name: copy file via ssh password +uses: appleboy/scp-action@master +with: + host: ${{ secrets.HOST_DNS }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + port: ${{ secrets.DEPLOY_PORT }} + source: "sadish.war" + target: "/opt/tomcat/webapps" From 3e28be72fddbebd4de16b2cd129b655c66271edd Mon Sep 17 00:00:00 2001 From: Mariiousse <114913605+Mariiousse@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:06:13 +0100 Subject: [PATCH 24/28] Update main.yml --- .github/workflows/main.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53ba5db8..486403db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,16 +5,15 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - -uses: actions/checkout@master -run: | - jar cvf sadish.war * -name: copy file via ssh password -uses: appleboy/scp-action@master -with: - host: ${{ secrets.HOST_DNS }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.EC2_SSH_KEY }} - port: ${{ secrets.DEPLOY_PORT }} - source: "sadish.war" - target: "/opt/tomcat/webapps" + - uses: actions/checkout@master + - run: | + jar cvf sadish.war * + - name: copy file via ssh password + uses: appleboy/scp-action@master + with: + host: ${{ secrets.HOST_DNS }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + port: ${{ secrets.DEPLOY_PORT }} + source: "sadish.war" + target: "/opt/tomcat/webapps" From 952163d0819aa75bff5da49fee46b45ab2e60d5b Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:07:37 +0100 Subject: [PATCH 25/28] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index d82d31e0..ff8e15f6 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,6 @@ -Sample "Hello, World" Application +Sample "wesh c'est sdish" Application From 04aeefe2f54a7aa20c1b2309062a0d49dce22209 Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:02:17 +0100 Subject: [PATCH 26/28] Create BG.yml --- .github/workflows/BG.yml | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/BG.yml diff --git a/.github/workflows/BG.yml b/.github/workflows/BG.yml new file mode 100644 index 00000000..5efe7f00 --- /dev/null +++ b/.github/workflows/BG.yml @@ -0,0 +1,48 @@ +name: Industrialisation continue sur le serveur AWS (Tomcat) +on: push +jobs: + build: + name: Package AWS + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - run: | + jar cvf Senthilkumar.war * + - name: copy file via ssh password + uses: appleboy/scp-action@master + with: + host: ${{ secrets.HOST_DNS }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + port: ${{ secrets.DEPLOY_PORT }} + source: "Senthilkumar.war" + target: "/opt/tomcat/webapps" + + deploy: + name: SAV IPFS + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@master + - run: | + jar cvf Senthilkumar.war * + - uses: jirutka/setup-alpine@v1 + with: + branch: v3.15 + - run: | + apk add go-ipfs + ipfs init + ipfs daemon & + shell: alpine.sh --root {0} + - name: Sauvegarde fichier war sur IPFS + run: | + ls -la + ipfs swarm peers + ipfs add Senthilkumar.war > ipfs_key.txt + shell: alpine.sh --root {0} + - name: Notification Discord + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + run: | + ipfs_key=$(cat ipfs_key.txt | awk '{print $2}') + curl -X POST -H "Content-Type: application/json" -d "{\"content\": \"Sadish.S: Le workfl-tahmichoucroute IPFS est terminé. Clé IPFS : $ipfs_key\"}" $DISCORD_WEBHOOK From 087987e5de28a2659e893176b54f84a52beab972 Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:14:32 +0100 Subject: [PATCH 27/28] Update BG.yml --- .github/workflows/BG.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BG.yml b/.github/workflows/BG.yml index 5efe7f00..fbf4ac0e 100644 --- a/.github/workflows/BG.yml +++ b/.github/workflows/BG.yml @@ -45,4 +45,4 @@ jobs: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} run: | ipfs_key=$(cat ipfs_key.txt | awk '{print $2}') - curl -X POST -H "Content-Type: application/json" -d "{\"content\": \"Sadish.S: Le workfl-tahmichoucroute IPFS est terminé. Clé IPFS : $ipfs_key\"}" $DISCORD_WEBHOOK + curl -X POST -H "Content-Type: application/json" -d "{\"content\": \"Sadish.S: Le workfl-vousetespasfatigueronestpasfatiguer IPFS est terminé. Clé IPFS : $ipfs_key\"}" $DISCORD_WEBHOOK From cb9a673527ab05eb196f90f41624ab33cb59cf2d Mon Sep 17 00:00:00 2001 From: Sadish95 <148758864+Sadish95@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:41:39 +0100 Subject: [PATCH 28/28] Createnew.yml --- .github/workflows/new.yml | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/new.yml diff --git a/.github/workflows/new.yml b/.github/workflows/new.yml new file mode 100644 index 00000000..f92cd948 --- /dev/null +++ b/.github/workflows/new.yml @@ -0,0 +1,65 @@ +name: Continuous Deployment and Database Backup + +on: push + +jobs: + setup_and_backup: + name: Setup SSH and Backup Database + runs-on: ubuntu-latest + steps: + + - uses: actions/checkout@v2 + + + - name: Setup SSH Keys + run: | + mkdir -p ~/.ssh + echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan ${{ secrets.HOST_DNS }} >> ~/.ssh/known_hosts + + + - name: Create SSH Tunnel + run: | + ssh -i ~/.ssh/id_rsa -L 3307:127.0.0.1:3306 admin@${{ secrets.HOST_DNS }} -N & + SSH_TUNNEL_PID=$! + sleep 10 + if ps -p $SSH_TUNNEL_PID > /dev/null; then + echo "SSH tunnel established, PID: $SSH_TUNNEL_PID" + else + echo "SSH tunnel failed" + exit 1 + fi + + + - name: Dump MySQL Database + env: + MYSQL_PWD: ${{ secrets.MYSQLDUMP_PASSWORD }} + run: | + mysqldump -ucnam -h127.0.0.1 -P3307 --password="${MYSQL_PWD}" films > sauvegarde_films.sql + if [ $? -ne 0 ]; then + echo "Failed to dump MySQL" + exit 1 + fi + + + - name: Kill SSH Tunnel + if: always() + run: | + kill $SSH_TUNNEL_PID || echo "SSH tunnel fin." + + + - name: Install IPFS + run: | + wget https://dist.ipfs.io/go-ipfs/v0.9.1/go-ipfs_v0.9.1_linux-amd64.tar.gz + tar xvfz go-ipfs_v0.9.1_linux-amd64.tar.gz + cd go-ipfs + sudo bash install.sh + ipfs init + + + - name: Add to IPFS + run: | + ipfs daemon --init & + sleep 10 + ipfs add sauvegarde_films.sql