infrastructure/neutral-old
infrastructure/neutral-old
2
1
Fork 0
Code Issues 3 Pull Requests Projects 1 Releases 2 Wiki Activity

Correct Fixes from files component + Jenkins First Ver
All checks were successful
Neutral/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
CICD - Pipeline 2023-03-19 15:48:14 +01:00
parent fd1270857d
commit 6b8a1cb6b5
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -2,7 +2,7 @@ pipeline {
agent any agent any
stages { stages {
stage('Test Neutral') { stage('[Neutral] - Test') {
steps { steps {
echo "[Neutral-Deploy] - Test Stage" echo "[Neutral-Deploy] - Test Stage"
// sh "git clone git clone https://git.raphix.fr/infrastructure/neutral.git neutral" // sh "git clone git clone https://git.raphix.fr/infrastructure/neutral.git neutral"
@ -10,12 +10,12 @@ pipeline {
} }
} }
stage('Deploy Neutral') { stage('[Neutral] - Deploy') {
steps { steps {
echo "[Neutral-Deploy] - Deploy Stage" echo "[Neutral-Deploy] - Deploy Stage"
sh "ssh raphix@raphix.fr sudo apt update -y" sh "ssh raphix@raphix.fr sudo apt update -y"
sh "ssh raphix@raphix.fr sudo apt upgrade -y" sh "ssh raphix@raphix.fr sudo apt upgrade -y"
sh "ssh raphix@raphix.fr sudo -u 'gitlab-ci' /home/gitlab-ci/neutral_deploy.sh" sh "ssh raphix@raphix.fr sudo -S -u gitlab-ci /home/gitlab-ci/neutral_deploy.sh"
} }
} }
} }

1
neutral-functions.js
View File

@ -3,7 +3,6 @@ var uuid = require('uuid')
var path = require("path") var path = require("path")
var CryptoJS = require("crypto-js") var CryptoJS = require("crypto-js")
var Jimp = require("jimp") var Jimp = require("jimp")
const { compileString } = require("sass")
module.exports.checkUser = () => { module.exports.checkUser = () => {

7
public/templates/files.html
View File

@ -28,7 +28,7 @@
const currentDir = document.getElementById("fi_current_directory") const currentDir = document.getElementById("fi_current_directory")
const fileExplorer = document.getElementById("fileExplorer") const fileExplorer = document.getElementById("fileExplorer")
const fileExplorerError = fileExplorer.outerHTML const fileExplorerError = '<div id="last_directory" class="fi_file"><p style="margin-left: 1vw;text-align:start;margin-bottom: 1vw !important;"><i class="fa fa-arrow-left"></i> Revenir au dossier parent</p></div>' + fileExplorer.outerHTML
getDirectory(currentDir.value) getDirectory(currentDir.value)
@ -65,6 +65,7 @@
if(response.result == "failed") { if(response.result == "failed") {
fileExplorerList.push('<div id="last_directory" class="fi_file"><p style="margin-left: 1vw;text-align:start;margin-bottom: 1vw !important;"><i class="fa fa-arrow-left"></i> Revenir au dossier parent</p></div>')
content.innerHTML = ' <h1 style="color:red;"><i style="color:yellow; font-size: 2vw;" class="fa fa-warning"></i> Erreur de chargement des données - Erreur : ' + response.content + '</h1>' content.innerHTML = ' <h1 style="color:red;"><i style="color:yellow; font-size: 2vw;" class="fa fa-warning"></i> Erreur de chargement des données - Erreur : ' + response.content + '</h1>'
console.log("FAILED") console.log("FAILED")
@ -255,6 +256,10 @@
currentDir.value = cdSplit.join("/") currentDir.value = cdSplit.join("/")
if(currentDir.value == "") {
currentDir.value = "/"
}
getDirectory(currentDir.value) getDirectory(currentDir.value)

3
script/neutral_deploy.sh
View File

@ -1,7 +1,6 @@
echo "[Neutral-Deploy] - Stage - Déploiement - START " echo "[Neutral-Deploy] - Stage - Déploiement - START "
echo "[Neutral-Deploy] - Arrêt de Neutral : Processing" echo "[Neutral-Deploy] - Arrêt de Neutral : Processing"
cd /home/gitlab-ci cd /home/gitlab-ci
pwd
pm2 stop Neutral pm2 stop Neutral
pm2 delete Neutral pm2 delete Neutral
echo "[Neutral-Deploy] - Arrêt de Neutral : Success" echo "[Neutral-Deploy] - Arrêt de Neutral : Success"
@ -13,12 +12,10 @@ git clone https://git.raphix.fr/infrastructure/neutral.git
echo "[Neutral-Deploy] - Installation de Neutral : Success" echo "[Neutral-Deploy] - Installation de Neutral : Success"
echo "[Neutral-Deploy] - Installation des dépendances : Processing" echo "[Neutral-Deploy] - Installation des dépendances : Processing"
cd /home/gitlab-ci/neutral cd /home/gitlab-ci/neutral
pwd
npm install npm install
echo "[Neutral-Deploy] - Installation des dépendances : Success" echo "[Neutral-Deploy] - Installation des dépendances : Success"
echo "[Neutral-Deploy] - Démarrage de Neutral : Processing" echo "[Neutral-Deploy] - Démarrage de Neutral : Processing"
cd /home/gitlab-ci cd /home/gitlab-ci
pwd
pm2 start neutral.config.js pm2 start neutral.config.js
echo "[Neutral-Deploy] - Démarrage de Neutral : Success" echo "[Neutral-Deploy] - Démarrage de Neutral : Success"
echo "[Neutral-Deploy] - Stage - Déploiement - END" echo "[Neutral-Deploy] - Stage - Déploiement - END"