diff --git a/.gitignore b/.gitignore index 688d48a..da921ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ DuckRevamp/* -server/node_modules/* -gitUpdate.sh \ No newline at end of file +server/node_modules/* \ No newline at end of file diff --git a/gitUpdate.sh b/gitUpdate.sh new file mode 100644 index 0000000..379bd40 --- /dev/null +++ b/gitUpdate.sh @@ -0,0 +1,4 @@ +cd /var/www/DancingDuck +git pull gitea master +git push origin master +systemctl restart duckSite.service diff --git a/gitlabSync.sh b/gitlabSync.sh new file mode 100644 index 0000000..3a7a6de --- /dev/null +++ b/gitlabSync.sh @@ -0,0 +1,4 @@ +cd /var/www/DancingDuck +git pull origin master +git push gitea master +systemctl restart duckSite.service diff --git a/server/server.js b/server/server.js index 60690de..1fdb4b5 100644 --- a/server/server.js +++ b/server/server.js @@ -42,6 +42,17 @@ app.post('/receiveUpdate', (req, res) => { }); }); +app.post('/gitlabUpdate', (req, res) => { + res.status(200).json({success:true}); + let updater = exec(`sh ${__dirname}/../gitlabSync.sh`, (error, stdout, stderr) => { + console.log(stdout); + console.error(stderr); + if (error !== null) { + console.error(`exec error: ${error}`); + } + }); +}); + function sleep(ms) { return new Promise(r => { setTimeout(r, ms);