Compare commits
67 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
6ce5f44a02
|
|||
|
1b856f261f
|
|||
|
3072ebe966
|
|||
|
c3293e1ec4
|
|||
| 0fc95da317 | |||
| a495b99bc5 | |||
|
cca2a255da | ||
|
|
615c347955 | ||
| e3fe13246c | |||
| 634891019e | |||
| 33d066fa39 | |||
| ae48b9e715 | |||
| 81ae2dc1e3 | |||
| 3577d867d1 | |||
| 563b252e68 | |||
| f934e1bc70 | |||
| daa9019e02 | |||
| ab00414555 | |||
| e119234161 | |||
| df5d98e67a | |||
| d85ba96a41 | |||
| f16f300f4b | |||
| ca2132f372 | |||
| 9a2f17c6c3 | |||
| 6b280d357a | |||
| 9149cfa44d | |||
| e974481688 | |||
| 0a19f3fd18 | |||
| 7819cdda0d | |||
| 88408fd904 | |||
| 38a592e29e | |||
| 08ec8f8002 | |||
| 1c3901af27 | |||
| 73e46f0ce9 | |||
| 560629e5bb | |||
| f1b329b7d7 | |||
| a0811cc7cc | |||
| ea34a46d75 | |||
| b0b73cdb45 | |||
| 7be2696c71 | |||
| ece6c19ca3 | |||
| bc1bb7fea2 | |||
| 28160bb7eb | |||
| 0cfb5e54f9 | |||
| bfba08b1db | |||
| 847407beee | |||
| 7437a9fe3b | |||
| 7fc8010a60 | |||
| 2f3dacb569 | |||
| e0963c1c29 | |||
| 3a060d5477 | |||
| 994a3297c9 | |||
| 5fef77b61f | |||
| b1a9be254b | |||
| f9b14cb38d | |||
| 591d5249cf | |||
| 7f65e0a420 | |||
| ee40dcc7f6 | |||
| 67a7f77599 | |||
| 6a27b88465 | |||
| d91df030be | |||
| 2d027afa29 | |||
|
27afb67a17 | ||
|
|
61af6f62b6 | ||
|
|
3ff71a5114 | ||
|
|
84ad1d92ec | ||
|
|
721e94e1e8 |
@ -1,17 +0,0 @@
|
||||
*~backup-*
|
||||
.c9revisions
|
||||
.c9
|
||||
.git
|
||||
.svn
|
||||
.DS_Store
|
||||
.bzr
|
||||
.cdv
|
||||
~.dep
|
||||
~.dot
|
||||
~.nib
|
||||
~.plst
|
||||
.hg
|
||||
.pc
|
||||
*.min.js
|
||||
.nakignore
|
||||
/dev
|
||||
@ -1 +0,0 @@
|
||||
{"filter":false,"title":"Immediate (Javascript (browser))","tooltip":"Immediate (Javascript (browser))","undoManager":{"mark":0,"position":0,"stack":[[{"start":{"row":8,"column":40},"end":{"row":9,"column":0},"action":"insert","lines":["",""],"id":53},{"start":{"row":9,"column":0},"end":{"row":10,"column":0},"action":"insert","lines":["",""]}]]},"immediate":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":8,"column":0},"end":{"row":8,"column":21},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0,"type":"jsbrowser","history":["\"refs/heads/template\".match(/\\/master$/)","\"refs/heads/master\".match(/\\/master$/)","s.match(/\\/master$/)","s = \"refs/heads/master\""],"pos":-1},"timestamp":1452973618356,"hash":"722c479a340a3da2396735615b87d31f3373e145"}
|
||||
@ -1 +0,0 @@
|
||||
{"filter":false,"title":"Terminal","undoManager":{"mark":-1,"position":-1,"stack":[]},"terminal":{"id":"devel_232","cwd":"","width":1328,"height":243,"scrollTop":393},"timestamp":1452978225696,"hash":"67452301efcdab8998badcfe10325476c3d2e1f0"}
|
||||
@ -1 +0,0 @@
|
||||
{"filter":false,"title":"www","tooltip":"/bin/www","undoManager":{"mark":2,"position":2,"stack":[[{"start":{"row":14,"column":47},"end":{"row":14,"column":50},"action":"remove","lines":["000"],"id":2},{"start":{"row":14,"column":47},"end":{"row":14,"column":48},"action":"insert","lines":["1"]}],[{"start":{"row":14,"column":48},"end":{"row":14,"column":49},"action":"insert","lines":["8"],"id":3}],[{"start":{"row":14,"column":49},"end":{"row":14,"column":50},"action":"insert","lines":["0"],"id":4}]]},"ace":{"folds":[],"scrolltop":120,"scrollleft":0,"selection":{"start":{"row":14,"column":50},"end":{"row":14,"column":50},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1452973670538,"hash":"d84e8bd402fee361726b1d5ab6cdf6009ed17746"}
|
||||
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
{"filter":false,"title":"test.sh","tooltip":"/test.sh","undoManager":{"mark":33,"position":33,"stack":[[{"start":{"row":0,"column":0},"end":{"row":0,"column":1},"action":"insert","lines":["e"],"id":1}],[{"start":{"row":0,"column":1},"end":{"row":0,"column":2},"action":"insert","lines":["c"],"id":2}],[{"start":{"row":0,"column":2},"end":{"row":0,"column":3},"action":"insert","lines":["h"],"id":3}],[{"start":{"row":0,"column":3},"end":{"row":0,"column":4},"action":"insert","lines":["o"],"id":4}],[{"start":{"row":0,"column":4},"end":{"row":0,"column":5},"action":"insert","lines":[" "],"id":5}],[{"start":{"row":0,"column":5},"end":{"row":0,"column":7},"action":"insert","lines":["\"\""],"id":6}],[{"start":{"row":0,"column":6},"end":{"row":0,"column":7},"action":"insert","lines":["s"],"id":7},{"start":{"row":0,"column":7},"end":{"row":0,"column":8},"action":"insert","lines":["d"]}],[{"start":{"row":0,"column":8},"end":{"row":0,"column":9},"action":"insert","lines":["f"],"id":8}],[{"start":{"row":0,"column":9},"end":{"row":0,"column":10},"action":"insert","lines":["s"],"id":9}],[{"start":{"row":0,"column":10},"end":{"row":0,"column":11},"action":"insert","lines":["d"],"id":10}],[{"start":{"row":0,"column":11},"end":{"row":0,"column":12},"action":"insert","lines":["f"],"id":11}],[{"start":{"row":0,"column":12},"end":{"row":0,"column":13},"action":"insert","lines":["s"],"id":12},{"start":{"row":0,"column":13},"end":{"row":0,"column":14},"action":"insert","lines":["d"]}],[{"start":{"row":0,"column":15},"end":{"row":0,"column":16},"action":"insert","lines":[">"],"id":13}],[{"start":{"row":0,"column":16},"end":{"row":0,"column":17},"action":"insert","lines":["t"],"id":14}],[{"start":{"row":0,"column":17},"end":{"row":0,"column":18},"action":"insert","lines":["e"],"id":15}],[{"start":{"row":0,"column":18},"end":{"row":0,"column":19},"action":"insert","lines":["s"],"id":16}],[{"start":{"row":0,"column":19},"end":{"row":0,"column":20},"action":"insert","lines":["t"],"id":17}],[{"start":{"row":0,"column":20},"end":{"row":0,"column":21},"action":"insert","lines":["."],"id":18}],[{"start":{"row":0,"column":21},"end":{"row":0,"column":22},"action":"insert","lines":["t"],"id":19}],[{"start":{"row":0,"column":22},"end":{"row":0,"column":23},"action":"insert","lines":["x"],"id":20}],[{"start":{"row":0,"column":23},"end":{"row":0,"column":24},"action":"insert","lines":["t"],"id":21}],[{"start":{"row":0,"column":0},"end":{"row":1,"column":0},"action":"insert","lines":["",""],"id":22}],[{"start":{"row":0,"column":0},"end":{"row":0,"column":1},"action":"insert","lines":["#"],"id":23}],[{"start":{"row":0,"column":1},"end":{"row":0,"column":2},"action":"insert","lines":["!"],"id":24}],[{"start":{"row":0,"column":2},"end":{"row":0,"column":3},"action":"insert","lines":["/"],"id":25}],[{"start":{"row":0,"column":3},"end":{"row":0,"column":4},"action":"insert","lines":["b"],"id":26}],[{"start":{"row":0,"column":4},"end":{"row":0,"column":5},"action":"insert","lines":["i"],"id":27}],[{"start":{"row":0,"column":5},"end":{"row":0,"column":6},"action":"insert","lines":["n"],"id":28}],[{"start":{"row":0,"column":6},"end":{"row":0,"column":7},"action":"insert","lines":["/"],"id":29}],[{"start":{"row":0,"column":7},"end":{"row":0,"column":8},"action":"insert","lines":["b"],"id":30}],[{"start":{"row":0,"column":8},"end":{"row":0,"column":9},"action":"insert","lines":["a"],"id":31}],[{"start":{"row":0,"column":9},"end":{"row":0,"column":10},"action":"insert","lines":["s"],"id":32}],[{"start":{"row":0,"column":10},"end":{"row":0,"column":11},"action":"insert","lines":["h"],"id":33}],[{"start":{"row":0,"column":11},"end":{"row":1,"column":0},"action":"insert","lines":["",""],"id":34}]]},"ace":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":1,"column":0},"end":{"row":1,"column":0},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1452978488496,"hash":"e5d88869a1d8eada9039d48fcf70c2dd29272ac7"}
|
||||
@ -1,34 +0,0 @@
|
||||
{
|
||||
"ace": {
|
||||
"@guessTabSize": "true",
|
||||
"@newLineMode": "unix",
|
||||
"@tabSize": "4",
|
||||
"@useSoftTabs": "true"
|
||||
},
|
||||
"build": {
|
||||
"@builder": "auto",
|
||||
"@path": "/.c9/builders",
|
||||
"@saveall": "true"
|
||||
},
|
||||
"find.nak": {
|
||||
"@searchLimit": 100
|
||||
},
|
||||
"general": {
|
||||
"@stripws": false
|
||||
},
|
||||
"language": {
|
||||
"@eslintrc": "true",
|
||||
"@instanceHighlight": "true",
|
||||
"@semi": "true",
|
||||
"@undeclaredVars": "true",
|
||||
"@unusedFunctionArgs": "false",
|
||||
"@warnLevel": "info"
|
||||
},
|
||||
"run": {
|
||||
"@path": "/.c9/runners",
|
||||
"configs": {
|
||||
"@inited": "true",
|
||||
"json()": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,265 +0,0 @@
|
||||
{
|
||||
"console": {
|
||||
"@expanded": true,
|
||||
"@height": 269,
|
||||
"@maximized": "false",
|
||||
"json()": {
|
||||
"meta": {
|
||||
"accessList": [
|
||||
"tab8",
|
||||
"tab1"
|
||||
]
|
||||
},
|
||||
"name": "pane1",
|
||||
"nodes": [
|
||||
{
|
||||
"type": "tab",
|
||||
"name": "tab1",
|
||||
"path": "",
|
||||
"className": [
|
||||
"tab1"
|
||||
],
|
||||
"document": {
|
||||
"filter": true,
|
||||
"title": "Immediate (Javascript (browser))",
|
||||
"tooltip": "Immediate (Javascript (browser))",
|
||||
"immediate": {
|
||||
"folds": [],
|
||||
"scrolltop": 0,
|
||||
"scrollleft": 0,
|
||||
"selection": {
|
||||
"start": {
|
||||
"row": 8,
|
||||
"column": 0
|
||||
},
|
||||
"end": {
|
||||
"row": 8,
|
||||
"column": 21
|
||||
},
|
||||
"isBackwards": true
|
||||
},
|
||||
"options": {
|
||||
"guessTabSize": true,
|
||||
"useWrapMode": false,
|
||||
"wrapToView": true
|
||||
},
|
||||
"firstLineState": 0,
|
||||
"type": "jsbrowser",
|
||||
"history": [
|
||||
"\"refs/heads/template\".match(/\\/master$/)",
|
||||
"\"refs/heads/master\".match(/\\/master$/)",
|
||||
"s.match(/\\/master$/)",
|
||||
"s = \"refs/heads/master\""
|
||||
],
|
||||
"pos": -1
|
||||
},
|
||||
"hash": "722c479a340a3da2396735615b87d31f3373e145",
|
||||
"meta": {
|
||||
"timestamp": 1452973618356
|
||||
},
|
||||
"changed": false
|
||||
},
|
||||
"editorType": "immediate",
|
||||
"active": false
|
||||
},
|
||||
{
|
||||
"type": "tab",
|
||||
"name": "tab8",
|
||||
"path": "",
|
||||
"className": [
|
||||
"tab8",
|
||||
"focus"
|
||||
],
|
||||
"document": {
|
||||
"changed": false,
|
||||
"meta": {
|
||||
"timestamp": 1452978225696
|
||||
},
|
||||
"filter": true,
|
||||
"title": "Terminal",
|
||||
"terminal": {
|
||||
"id": "devel_232",
|
||||
"cwd": "",
|
||||
"width": 1328,
|
||||
"height": 243
|
||||
}
|
||||
},
|
||||
"editorType": "terminal",
|
||||
"active": true
|
||||
}
|
||||
],
|
||||
"skin": "editor_tab",
|
||||
"skinset": "default",
|
||||
"type": "pane"
|
||||
}
|
||||
},
|
||||
"experiments": {
|
||||
"@@enabled": true,
|
||||
"@flat-dark": 0,
|
||||
"@git": 1,
|
||||
"@mount": 0,
|
||||
"@plugin-manager": 0,
|
||||
"@plugins": 0,
|
||||
"@sdk": 0,
|
||||
"@test": 0
|
||||
},
|
||||
"ext": {
|
||||
"counters": {
|
||||
"@ace": 1,
|
||||
"@acestatus": 1,
|
||||
"@divider": 5,
|
||||
"@document": 6,
|
||||
"@form": 5,
|
||||
"@immediate": 1,
|
||||
"@menu": 7,
|
||||
"@menuitem": 17,
|
||||
"@pane": 2,
|
||||
"@session": 5,
|
||||
"@tab": 1,
|
||||
"@undoManager": 6
|
||||
}
|
||||
},
|
||||
"findinfiles": {
|
||||
"@console": "true",
|
||||
"@matchcase": "false",
|
||||
"@regex": "false",
|
||||
"@wholeword": "false"
|
||||
},
|
||||
"menus": {
|
||||
"@minimized": "false"
|
||||
},
|
||||
"nak": {
|
||||
"@installed": true
|
||||
},
|
||||
"panecycle": {
|
||||
"json()": [
|
||||
"tab8",
|
||||
"tab6"
|
||||
]
|
||||
},
|
||||
"panels": {
|
||||
"@active-left": "tree",
|
||||
"@active-right": "none",
|
||||
"commands.panel": {
|
||||
"@enabled": "true",
|
||||
"@name": "commands.panel"
|
||||
},
|
||||
"debugger": {
|
||||
"@enabled": "true",
|
||||
"@name": "debugger"
|
||||
},
|
||||
"navigate": {
|
||||
"@enabled": "true",
|
||||
"@name": "navigate"
|
||||
},
|
||||
"outline": {
|
||||
"@enabled": "true",
|
||||
"@name": "outline"
|
||||
},
|
||||
"scm": {
|
||||
"@enabled": "true",
|
||||
"@name": "scm"
|
||||
},
|
||||
"tree": {
|
||||
"@enabled": "true",
|
||||
"@name": "tree"
|
||||
}
|
||||
},
|
||||
"projecttree": {
|
||||
"@showfs": true,
|
||||
"expanded": {
|
||||
"json()": [
|
||||
"/",
|
||||
"/bin",
|
||||
"/routes"
|
||||
]
|
||||
}
|
||||
},
|
||||
"recentfiles": {
|
||||
"json()": []
|
||||
},
|
||||
"tabs": {
|
||||
"json()": {
|
||||
"focus": "/routes/index.js",
|
||||
"meta": {
|
||||
"accessList": [
|
||||
"tab6",
|
||||
"tab0",
|
||||
"tab3"
|
||||
]
|
||||
},
|
||||
"name": "pane0",
|
||||
"nodes": [
|
||||
{
|
||||
"type": "tab",
|
||||
"name": "tab3",
|
||||
"path": "/bin/www",
|
||||
"className": [
|
||||
"tab3"
|
||||
],
|
||||
"document": {
|
||||
"meta": {
|
||||
"timestamp": 1452973671206
|
||||
},
|
||||
"filter": true,
|
||||
"title": "www",
|
||||
"tooltip": "/bin/www",
|
||||
"ace": {},
|
||||
"changed": false
|
||||
},
|
||||
"editorType": "ace",
|
||||
"active": false
|
||||
},
|
||||
{
|
||||
"type": "tab",
|
||||
"name": "tab6",
|
||||
"path": "/routes/index.js",
|
||||
"className": [
|
||||
"tab6",
|
||||
"focus"
|
||||
],
|
||||
"document": {
|
||||
"changed": false,
|
||||
"meta": {
|
||||
"timestamp": 1452975302950
|
||||
},
|
||||
"filter": true,
|
||||
"title": "index.js",
|
||||
"tooltip": "/routes/index.js",
|
||||
"ace": {}
|
||||
},
|
||||
"editorType": "ace",
|
||||
"active": true
|
||||
},
|
||||
{
|
||||
"type": "tab",
|
||||
"name": "tab0",
|
||||
"path": "/test.sh",
|
||||
"className": [
|
||||
"tab0"
|
||||
],
|
||||
"document": {
|
||||
"changed": false,
|
||||
"meta": {
|
||||
"timestamp": 1452978488496
|
||||
},
|
||||
"filter": true,
|
||||
"title": "test.sh",
|
||||
"tooltip": "/test.sh",
|
||||
"ace": {}
|
||||
},
|
||||
"editorType": "ace",
|
||||
"active": false
|
||||
}
|
||||
],
|
||||
"skin": "editor_tab",
|
||||
"skinset": "default",
|
||||
"type": "pane"
|
||||
}
|
||||
},
|
||||
"tree_selection": {
|
||||
"json()": [
|
||||
"/routes/index.js"
|
||||
]
|
||||
}
|
||||
}
|
||||
58
app.js
58
app.js
@ -1,29 +1,10 @@
|
||||
var express = require('express');
|
||||
var path = require('path');
|
||||
var favicon = require('serve-favicon');
|
||||
var logger = require('morgan');
|
||||
var cookieParser = require('cookie-parser');
|
||||
var bodyParser = require('body-parser');
|
||||
'use strict';
|
||||
|
||||
var routes = require('./routes/index');
|
||||
var users = require('./routes/users');
|
||||
const express = require('express');
|
||||
const app = express();
|
||||
|
||||
var app = express();
|
||||
|
||||
// view engine setup
|
||||
app.set('views', path.join(__dirname, 'views'));
|
||||
app.set('view engine', 'ejs');
|
||||
|
||||
// uncomment after placing your favicon in /public
|
||||
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
|
||||
app.use(logger('dev'));
|
||||
app.use(bodyParser.json());
|
||||
app.use(bodyParser.urlencoded({ extended: false }));
|
||||
app.use(cookieParser());
|
||||
app.use(express.static(path.join(__dirname, 'public')));
|
||||
|
||||
app.use('/', routes);
|
||||
app.use('/users', users);
|
||||
app.use(express.json());
|
||||
app.use('/', require('./routes/index'));
|
||||
|
||||
// catch 404 and forward to error handler
|
||||
app.use(function(req, res, next) {
|
||||
@ -32,29 +13,16 @@ app.use(function(req, res, next) {
|
||||
next(err);
|
||||
});
|
||||
|
||||
// error handlers
|
||||
|
||||
// development error handler
|
||||
// will print stacktrace
|
||||
if (app.get('env') === 'development') {
|
||||
app.use(function(err, req, res, next) {
|
||||
res.status(err.status || 500);
|
||||
res.render('error', {
|
||||
message: err.message,
|
||||
error: err
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// production error handler
|
||||
// no stacktraces leaked to user
|
||||
// error handler
|
||||
app.use(function(err, req, res, next) {
|
||||
// set locals, only providing error in development
|
||||
res.locals.message = err.message;
|
||||
res.locals.error = req.app.get('env') === 'development' ? err : {};
|
||||
|
||||
// render the error page
|
||||
res.status(err.status || 500);
|
||||
res.render('error', {
|
||||
message: err.message,
|
||||
error: {}
|
||||
});
|
||||
console.dir(err)
|
||||
res.json({message: err.message});
|
||||
});
|
||||
|
||||
|
||||
module.exports = app;
|
||||
|
||||
46
create.sh
46
create.sh
@ -1,46 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
name="$1"
|
||||
sshURL="$2"
|
||||
|
||||
eval "$(ssh-agent -s)"
|
||||
ssh-add /root/.ssh/id_github_rsa
|
||||
mkdir /var/www/gitwrapper/$name
|
||||
cd /var/www/gitwrapper/$name
|
||||
echo `pwd`
|
||||
|
||||
DJANGO_SETTINGS_MODULE=project.settings.prod
|
||||
export DJANGO_SETTINGS_MODULE=project.settings.prod
|
||||
|
||||
git clone $sshURL .
|
||||
virtualenv ./env
|
||||
source env/bin/activate
|
||||
pip install -r requirements.txt
|
||||
cp /var/www/local_settings.py project/settings/local_settings.py
|
||||
echo "BRANCH = '$name'" >> project/settings/local_settings.py
|
||||
|
||||
python manage.py createcachetable
|
||||
python3 manage.py migrate
|
||||
python3 manage.py loaddata "/var/www/django.json"
|
||||
|
||||
git checkout $name
|
||||
|
||||
pip install -r requirements.txt
|
||||
|
||||
python3 manage.py collectstatic --noinput
|
||||
python3 manage.py migrate
|
||||
chmod 777 .
|
||||
chmod 777 db.sqlite3
|
||||
|
||||
echo "<VirtualHost *:80>" > /etc/apache2/sites-enabled/$name.conf
|
||||
echo " ServerName $name.staging.bytedev.co" >> /etc/apache2/sites-enabled/$name.conf
|
||||
echo " Alias /static /var/www/gitwrapper/$name/staticfiles" >> /etc/apache2/sites-enabled/$name.conf
|
||||
echo " WSGIDaemonProcess $name python-path=/var/www/gitwrapper/$name:/var/www/gitwrapper/$name/env:/var/www/gitwrapper/$name/env/lib/python3.5/site-packages" >> /etc/apache2/sites-enabled/$name.conf
|
||||
echo " WSGIProcessGroup $name" >> /etc/apache2/sites-enabled/$name.conf
|
||||
echo " WSGIScriptAlias / /var/www/gitwrapper/$name/project/wsgi.py" >> /etc/apache2/sites-enabled/$name.conf
|
||||
echo "</VirtualHost>" >> /etc/apache2/sites-enabled/$name.conf
|
||||
|
||||
|
||||
service apache2 restart
|
||||
|
||||
exit 0
|
||||
10
delete.sh
10
delete.sh
@ -1,10 +0,0 @@
|
||||
#!/bin/bash
|
||||
name="$1"
|
||||
sshURL="$2"
|
||||
|
||||
rm -rf /var/www/gitwrapper/$name
|
||||
rm /etc/apache2/sites-enabled/$name.conf
|
||||
|
||||
service apache2 reload
|
||||
|
||||
exit 0
|
||||
@ -6,12 +6,7 @@
|
||||
"start": "node ./bin/www"
|
||||
},
|
||||
"dependencies": {
|
||||
"body-parser": "~1.13.2",
|
||||
"cookie-parser": "~1.3.5",
|
||||
"debug": "~2.2.0",
|
||||
"ejs": "~2.3.3",
|
||||
"express": "~4.13.1",
|
||||
"morgan": "~1.6.1",
|
||||
"serve-favicon": "~2.3.0"
|
||||
"express": "^4.16.4",
|
||||
"forever": "^0.15.3"
|
||||
}
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
body {
|
||||
padding: 50px;
|
||||
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
a {
|
||||
color: #00B7FF;
|
||||
}
|
||||
9
random_port.py
Executable file
9
random_port.py
Executable file
@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env python3
|
||||
import socket
|
||||
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.bind(('', 0))
|
||||
addr = s.getsockname()
|
||||
print (addr[1])
|
||||
s.close()
|
||||
exit(0)
|
||||
@ -1,30 +1,57 @@
|
||||
var express = require('express');
|
||||
var router = express.Router();
|
||||
var exec = require('child_process').exec;
|
||||
'use strict';
|
||||
|
||||
const router = require('express').Router();
|
||||
|
||||
const {exec} = require('child_process');
|
||||
var fs = require('fs');
|
||||
/* GET home page. */
|
||||
|
||||
var install_dir = '/var/www/gitwrapper/'
|
||||
|
||||
|
||||
// function lxc_create(name, callback) {
|
||||
// exec('lxc-create', [
|
||||
// '-n', 'name_'+(Math.random()*100).toString().slice(-4),
|
||||
// '-t' 'download', '--',
|
||||
// '--dist', 'ubuntu',
|
||||
// '--release', 'xenial',
|
||||
// '--arch', 'amd64']
|
||||
// function(err, stdout, stderr){
|
||||
|
||||
// });
|
||||
// }
|
||||
|
||||
var calls = {
|
||||
create: function(req, res, name, sshURL){
|
||||
return exec('bash /var/www/gitdeploy/create.sh '+name+' '+sshURL, function(err, stdout, stderr){
|
||||
console.log("create =========================");
|
||||
// create new container
|
||||
// install git in container
|
||||
// seed container with deploy key
|
||||
// clone repo into container
|
||||
// run <repo>/scripts/deploy/create
|
||||
// add entry to proxy
|
||||
|
||||
return res.json({ title: 'Express' });
|
||||
|
||||
|
||||
|
||||
|
||||
return exec('bash /var/www/gitdeploy/create.sh '+name+' '+sshURL, function(err, stdout, stderr){
|
||||
console.log(err, stdout, stderr);
|
||||
return res.json({ title: stdout });
|
||||
});
|
||||
},
|
||||
update: function(req, res, name, sshURL){
|
||||
console.log("update =========================");
|
||||
return exec('bash /var/www/gitdeploy/update.sh '+name+' '+sshURL, function(err, stdout, stderr){
|
||||
|
||||
return res.json({ title: 'Express' });
|
||||
console.log(err, stdout, stderr);
|
||||
return res.json({ title: stdout });
|
||||
});
|
||||
},
|
||||
delete: function(req, res, name, sshURL){
|
||||
console.log("delete =========================");
|
||||
return exec('bash /var/www/gitdeploy/delete.sh '+name+' '+sshURL, function(err, stdout, stderr){
|
||||
|
||||
return res.json({ title: 'Express' });
|
||||
console.log(err, stdout, stderr);
|
||||
return res.json({ title: stdout });
|
||||
});
|
||||
}
|
||||
|
||||
@ -36,12 +63,16 @@ router.all('/', function(req, res, next) {
|
||||
var call = (req.body.created && 'create') ||
|
||||
(req.body.deleted && 'delete') ||
|
||||
'update';
|
||||
console.log(req.body);
|
||||
|
||||
var name = req.body.ref.replace('refs/heads/', '');
|
||||
var branch = req.body.ref.replace('refs/heads/', '');
|
||||
var sshURL = req.body.repository.ssh_url;
|
||||
if(call === 'update' && !fs.existsSync('/var/www/gitwrapper/'+name)) call = 'create';
|
||||
|
||||
return calls[call](req, res, name, sshURL);
|
||||
console.log('branch', branch, 'sshURL', sshURL)
|
||||
// if(call === 'update' && !fs.existsSync('/var/wres.locals.messageww/gitwrapper/'+name)) call = 'create';
|
||||
|
||||
|
||||
// return calls[call](req, res, branch, sshURL);
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
var express = require('express');
|
||||
var router = express.Router();
|
||||
|
||||
/* GET users listing. */
|
||||
router.get('/', function(req, res, next) {
|
||||
res.send('respond with a resource');
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
23
update.sh
23
update.sh
@ -1,24 +1,39 @@
|
||||
#!/bin/bash
|
||||
name="$1"
|
||||
sshURL="$2"
|
||||
workingPath=/var/www/gitwrapper/$name
|
||||
|
||||
eval "$(ssh-agent -s)"
|
||||
ssh-add /root/.ssh/id_github_rsa
|
||||
cd $workingPath
|
||||
|
||||
|
||||
DJANGO_SETTINGS_MODULE=project.settings.prod
|
||||
export DJANGO_SETTINGS_MODULE=project.settings.prod
|
||||
cd /var/www/gitwrapper/$name
|
||||
|
||||
source env/bin/activate
|
||||
|
||||
git stash
|
||||
git pull --force origin $name
|
||||
pip install -r requirements.txt
|
||||
|
||||
./scripts/setup.sh
|
||||
source env/bin/activate
|
||||
|
||||
python3 manage.py collectstatic --noinput
|
||||
python3 manage.py migrate
|
||||
|
||||
chmod 777 .
|
||||
chmod 777 db.sqlite3
|
||||
service apache2 reload
|
||||
|
||||
echo "starting node app"
|
||||
NODE_ENV='staging'
|
||||
export NODE_ENV='staging'
|
||||
nodePort=`cat env/nodePort`
|
||||
export NODEPORT=$nodePort
|
||||
export djangoURL="http://$name.staging.bytedev.co"
|
||||
|
||||
forever stop $workingPath/node_rtc/app.js
|
||||
forever start $workingPath/node_rtc/app.js
|
||||
|
||||
/usr/sbin/service apache2 restart
|
||||
|
||||
exit 0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
<h1><%= message %></h1>
|
||||
<h2><%= error.status %></h2>
|
||||
<pre><%= error.stack %></pre>
|
||||
@ -1,11 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title><%= title %></title>
|
||||
<link rel='stylesheet' href='/stylesheets/style.css' />
|
||||
</head>
|
||||
<body>
|
||||
<h1><%= title %></h1>
|
||||
<p>Welcome to <%= title %></p>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
x
Reference in New Issue
Block a user