new beta config
parent
54ff19dcec
commit
b6f24e6f99
|
@ -1,33 +1,29 @@
|
|||
var environment = {
|
||||
path : '/usr/share/cybafelo',
|
||||
path : '/usr/share/fs',
|
||||
protocol : 'https',
|
||||
websocketProtocol : 'wss',
|
||||
websocketApp : 'websocket',
|
||||
domain : 'r3js.org',
|
||||
remoteDomain : 'cybafelo.com',
|
||||
remoteEnvironment : 'live'
|
||||
websocketApp : 'beta-websocket',
|
||||
domain : 'flyingspoon.de',
|
||||
remoteDomain : 'cybafelo.com'
|
||||
};
|
||||
|
||||
var protocol = environment.protocol;
|
||||
var domain = environment.domain;
|
||||
var remoteDomain = environment.remoteDomain;
|
||||
var remoteEnvironment = environment.remoteEnvironment;
|
||||
var websocketProtocol = environment.websocketProtocol;
|
||||
var websocketApp = environment.websocketApp;
|
||||
|
||||
var config = {
|
||||
editor: {
|
||||
url: protocol + '://editor.' + domain,
|
||||
url: protocol + '://beta-editor.' + domain,
|
||||
default: {
|
||||
platform: 'cybafelo',
|
||||
account: 'root',
|
||||
subAccount: 'root',
|
||||
project: 'test'
|
||||
platform: 'flyingspoon',
|
||||
project: 'Project X'
|
||||
}
|
||||
},
|
||||
api: {
|
||||
url: protocol + '://api.' + domain,
|
||||
remoteUrl: protocol + '://' + remoteEnvironment + '-r3-api.' + remoteDomain,
|
||||
url: protocol + '://beta-r3-api.' + domain,
|
||||
remoteUrl: protocol + '://beta-r3-api.' + remoteDomain,
|
||||
uploadPath: '/uploads',
|
||||
clientPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
|
@ -39,7 +35,7 @@ var config = {
|
|||
url : websocketProtocol + '://' + websocketApp + '.' + domain
|
||||
},
|
||||
portal: {
|
||||
url: protocol + '://portal.' + domain
|
||||
url: protocol + '://beta-portal.' + domain
|
||||
},
|
||||
db: {},
|
||||
environment : environment
|
|
@ -2,7 +2,7 @@ var secure = {
|
|||
api: {
|
||||
port: 3104,
|
||||
debugPort: 3204,
|
||||
customCodePath: '/usr/share/cybafelo/r3-custom-code',
|
||||
customCodePath: '/usr/share/fs/beta/r3-custom-code',
|
||||
serverPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
websocket: {
|
||||
|
@ -13,7 +13,7 @@ var secure = {
|
|||
mongo : {
|
||||
original : {
|
||||
host: 'mongodb://127.0.0.1',
|
||||
db: 'cybafelo',
|
||||
db: 'fs',
|
||||
port: 27017,
|
||||
shardPort: 27018,
|
||||
options: {
|
|
@ -0,0 +1,24 @@
|
|||
var gulp = require('gulp');
|
||||
|
||||
gulp.task('build', build);
|
||||
gulp.task('monitor', monitor);
|
||||
|
||||
function build() {
|
||||
return gulp.src('./src/config.js')
|
||||
.pipe(gulp.dest('./build/'))
|
||||
.pipe(gulp.src('./src/secure.js'))
|
||||
.pipe(gulp.dest('./build/'));
|
||||
}
|
||||
|
||||
|
||||
function monitor() {
|
||||
gulp.watch('src/*.js', build);
|
||||
}
|
||||
|
||||
gulp.task(
|
||||
'default',
|
||||
gulp.series(
|
||||
build,
|
||||
monitor
|
||||
)
|
||||
);
|
|
@ -1,61 +0,0 @@
|
|||
upstream node-beta-api {
|
||||
server 127.0.0.1:3104;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
|
||||
server_name beta.api.r3js.org;
|
||||
|
||||
return 301 https://beta.api.r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
|
||||
listen 443 ssl;
|
||||
listen [::]:443;
|
||||
|
||||
server_name beta.api.r3js.org;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/beta.api.r3js.org/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/beta.api.r3js.org/privkey.pem;
|
||||
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
access_log /var/log/beta.api.r3js.org/access.log;
|
||||
error_log /var/log/beta.api.r3js.org/error.log;
|
||||
|
||||
add_header Access-Control-Allow-Origin '*' always;
|
||||
add_header Access-Control-Allow-Methods 'POST, GET, OPTIONS' always;
|
||||
add_header Access-Control-Allow-Headers 'Cache-Control,Content-Type,x-api-authorization,x-api-user-token' always;
|
||||
add_header Content-Type 'application/json' always;
|
||||
add_header X-Content-Type-Options: 'nosniff' always;
|
||||
|
||||
if ($request_method = OPTIONS) {
|
||||
return 200;
|
||||
}
|
||||
|
||||
root /usr/share/r3-server/beta/api.r3js.org/webroot;
|
||||
|
||||
location ~ {
|
||||
try_files $uri $uri/ @node;
|
||||
}
|
||||
|
||||
location @node {
|
||||
|
||||
proxy_pass_request_headers on;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-NginX-Proxy true;
|
||||
|
||||
add_header Access-Control-Allow-Origin '*' always;
|
||||
add_header Access-Control-Allow-Methods 'POST, GET, OPTIONS' always;
|
||||
add_header Access-Control-Allow-Headers 'Cache-Control,Content-Type,x-api-authorization,x-api-user-token' always;
|
||||
add_header Content-Type 'application/json' always;
|
||||
add_header X-Content-Type-Options: 'nosniff' always;
|
||||
|
||||
proxy_pass http://node-beta-api$request_uri;
|
||||
|
||||
}
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
|
||||
server_name beta.editor.r3js.org;
|
||||
|
||||
return 301 https://beta.editor.r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
|
||||
listen 443 ssl;
|
||||
listen [::]:443;
|
||||
|
||||
server_name beta.editor.r3js.org;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/beta.editor.r3js.org/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/beta.editor.r3js.org/privkey.pem;
|
||||
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
root /usr/share/r3-server/beta/editor.r3js.org/webroot/;
|
||||
index index.php;
|
||||
|
||||
access_log /var/log/beta.editor.r3js.org/access.log;
|
||||
error_log /var/log/beta.editor.r3js.org/error.log;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$args;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
try_files $uri =404;
|
||||
include fastcgi_params;
|
||||
fastcgi_pass unix:/run/php/php7.2-fpm.sock;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_intercept_errors on;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
}
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
|
||||
server_name editor.r3js.org;
|
||||
|
||||
return 301 https://editor.r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
|
||||
listen 443 ssl;
|
||||
listen [::]:443;
|
||||
|
||||
server_name editor.r3js.org;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/editor.r3js.org/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/editor.r3js.org/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
|
||||
root /usr/share/cybafelo/editor.r3js.org/webroot/;
|
||||
index index.php;
|
||||
|
||||
access_log /var/log/editor.r3js.org/access.log;
|
||||
error_log /var/log/editor.r3js.org/error.log;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$args;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
try_files $uri =404;
|
||||
include fastcgi_params;
|
||||
fastcgi_pass unix:/run/php/php7.2-fpm.sock;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_intercept_errors on;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
}
|
||||
}
|
|
@ -1,49 +0,0 @@
|
|||
server {
|
||||
listen 80;
|
||||
|
||||
server_name www.r3js.org;
|
||||
|
||||
return 301 https://r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
server_name r3js.org;
|
||||
|
||||
return 301 https://r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
|
||||
listen 443 ssl;
|
||||
|
||||
server_name www.r3js.org;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/r3js.org/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/r3js.org/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
|
||||
return 301 https://r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
|
||||
listen 443 ssl;
|
||||
|
||||
server_name r3js.org;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/r3js.org/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/r3js.org/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
|
||||
root /usr/share/cybafelo/r3js.org/www/;
|
||||
|
||||
index index.html;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
|
||||
server_name editor.r3js.org;
|
||||
|
||||
return 301 https://editor.r3js.org$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
|
||||
listen 443 ssl;
|
||||
listen [::]:443;
|
||||
|
||||
server_name editor.r3js.org;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/editor.r3js.org/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/editor.r3js.org/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
|
||||
root /usr/share/cybafelo/editor.r3js.org/webroot/;
|
||||
index index.php;
|
||||
|
||||
access_log /var/log/editor.r3js.org/access.log;
|
||||
error_log /var/log/editor.r3js.org/error.log;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php?$args;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
try_files $uri =404;
|
||||
include fastcgi_params;
|
||||
fastcgi_pass unix:/run/php/php7.2-fpm.sock;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_intercept_errors on;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -7,5 +7,8 @@
|
|||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash": "^4.16.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"gulp": "^4.0.2"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
var environment = {
|
||||
path : '/usr/share/fs',
|
||||
protocol : 'https',
|
||||
websocketProtocol : 'wss',
|
||||
websocketApp : 'beta-websocket',
|
||||
domain : 'flyingspoon.de',
|
||||
remoteDomain : 'cybafelo.com'
|
||||
};
|
||||
|
||||
var protocol = environment.protocol;
|
||||
var domain = environment.domain;
|
||||
var remoteDomain = environment.remoteDomain;
|
||||
var websocketProtocol = environment.websocketProtocol;
|
||||
var websocketApp = environment.websocketApp;
|
||||
|
||||
var config = {
|
||||
editor: {
|
||||
url: protocol + '://beta-editor.' + domain,
|
||||
default: {
|
||||
platform: 'flyingspoon',
|
||||
project: 'Project X'
|
||||
}
|
||||
},
|
||||
api: {
|
||||
url: protocol + '://beta-r3-api.' + domain,
|
||||
remoteUrl: protocol + '://beta-r3-api.' + remoteDomain,
|
||||
uploadPath: '/uploads',
|
||||
clientPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
websocket: {
|
||||
protocol : websocketProtocol,
|
||||
domain : domain,
|
||||
application: websocketApp,
|
||||
host : websocketApp + '.' + domain,
|
||||
url : websocketProtocol + '://' + websocketApp + '.' + domain
|
||||
},
|
||||
portal: {
|
||||
url: protocol + '://beta-portal.' + domain
|
||||
},
|
||||
db: {},
|
||||
environment : environment
|
||||
};
|
||||
|
||||
if (typeof module !== 'undefined') {
|
||||
|
||||
if (typeof require !== 'undefined') {
|
||||
var _ = require('lodash');
|
||||
_.merge(config, require('./secure'));
|
||||
}
|
||||
|
||||
module.exports = config;
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ After=network.target
|
|||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/share/r3-server/beta/api.r3js.org/src/start
|
||||
ExecStart=/usr/share/fs/beta/r3-api.flyingspoon.de/src/start
|
||||
PIDFile=/var/run/beta-api.pid
|
||||
TimeoutStopSec=0
|
||||
Restart=always
|
|
@ -4,7 +4,7 @@ After=network.target
|
|||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/local/lib/node-v10.16.0-linux-x64/bin/gulp --gulpfile /usr/share/r3-server/beta/r3/gulpfile.js
|
||||
ExecStart=/usr/local/bin/gulp --gulpfile /usr/share/fs/beta/r3/gulpfile.js
|
||||
PIDFile=/var/run/beta-source.pid
|
||||
TimeoutStopSec=0
|
||||
Restart=always
|
|
@ -0,0 +1,39 @@
|
|||
var secure = {
|
||||
api: {
|
||||
port: 3104,
|
||||
debugPort: 3204,
|
||||
customCodePath: '/usr/share/fs/beta/r3-custom-code',
|
||||
serverPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
websocket: {
|
||||
port: 3105,
|
||||
debugPort: 3205
|
||||
},
|
||||
db : {
|
||||
mongo : {
|
||||
original : {
|
||||
host: 'mongodb://127.0.0.1',
|
||||
db: 'fs',
|
||||
port: 27017,
|
||||
shardPort: 27018,
|
||||
options: {
|
||||
db: {
|
||||
native_parser: true
|
||||
},
|
||||
server: {
|
||||
poolSize: 5,
|
||||
keepAlive: 120
|
||||
},
|
||||
user: '',
|
||||
pass: '',
|
||||
autoIndex: false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (typeof module !== 'undefined') {
|
||||
module.exports = secure;
|
||||
}
|
||||
|
4
start
4
start
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
cd /usr/share/cybafelo
|
||||
./start_r3_api
|
||||
./start_r3_websocket
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
cd /usr/share/cybafelo/r3-api
|
||||
#pm2 start bin/start --node-args="--inspect=3204" --name "r3-api"
|
||||
pm2 start bin/start --name "r3-api"
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
cd /usr/share/cybafelo/r3-websocket
|
||||
#pm2 start index.js --node-args="--inspect=3205" --name "r3-websocket"
|
||||
pm2 start index.js --name "r3-websocket"
|
14
status_all
14
status_all
|
@ -1,14 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
|
||||
#for package in $()
|
||||
for dir in /usr/share/cybafelo/*/
|
||||
do
|
||||
dir_short_name=${dir%*/}
|
||||
dir_short_name=${dir_short_name##*/}
|
||||
|
||||
if [ -d "$dir/.git" ]; then
|
||||
cd $dir
|
||||
echo `echo "$dir_short_name: " && git fetch && git status | grep "\(clean\|Untracked files\|Changes not staged\|ahead.*commit\|behind.*commit\)" | sed "s/^.*\(clean\|Untracked files\|Changes not staged\|ahead.*commit\|behind.*commit\).*/\l\1 |/" | grep --color=always "\(changes not staged\|ahead.*commit\|clean\|untracked files\|behind.*commit\)"`
|
||||
fi
|
||||
done
|
15
track_all
15
track_all
|
@ -1,15 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
#for package in $()
|
||||
for dir in /usr/share/cybafelo/*/
|
||||
do
|
||||
dir_short_name=${dir%*/}
|
||||
dir_short_name=${dir_short_name##*/}
|
||||
|
||||
if [ -d "$dir/.git" ]; then
|
||||
echo "===========================starting============================ $dir_short_name"
|
||||
cd $dir
|
||||
git branch -r | grep -v '\->' | while read remote; do git branch --track "${remote#origin/}" "$remote"; done
|
||||
echo "=============================done=============================="
|
||||
fi
|
||||
done
|
16
update_all
16
update_all
|
@ -1,16 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
#for package in $()
|
||||
for dir in /usr/share/cybafelo/*/
|
||||
do
|
||||
dir_short_name=${dir%*/}
|
||||
dir_short_name=${dir_short_name##*/}
|
||||
|
||||
if [ -d "$dir/.git" ]; then
|
||||
echo "===========================starting============================ $dir_short_name"
|
||||
cd $dir
|
||||
git branch
|
||||
git pull
|
||||
echo "=============================done=============================="
|
||||
fi
|
||||
done
|
Loading…
Reference in New Issue