lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

merge master

master^2
Evan Feenstra 4 years ago
parent
1b7e60bedd d68cb94697
commit
f26670c38c
12 changed files with 29 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      config/app.json
  2. 1
      dist/public/index.html
  3. 4
      dist/src/utils/cert.js
  4. 2
      dist/src/utils/cert.js.map
  5. 1
      dist/src/utils/config.js
  6. 2
      dist/src/utils/config.js.map
  7. 8
      dist/src/utils/setup.js
  8. 2
      dist/src/utils/setup.js.map
  9. 1
      public/index.html
  10. 4
      src/utils/cert.ts
  11. 1
      src/utils/config.ts
  12. 8
      src/utils/setup.ts

2
config/app.json
View File

@ -15,6 +15,7 @@
"media_host": "localhost:5000",
"tribes_host": "tribes.sphinx.chat",
"public_url": "",
"connection_string_path": "connection_string.txt",
"ssl": {
"enabled": false,
"save": true,
@ -38,6 +39,7 @@
"media_host": "memes.sphinx.chat",
"tribes_host": "tribes.sphinx.chat",
"public_url": "",
"connection_string_path": "connection_string.txt",
"ssl": {
"enabled": false,
"save": true,

1
dist/public/index.html
View File

@ -2,6 +2,7 @@
<html>
<head>
<link rel="icon" type="image/ico" href="static/favicon.ico">
<style>
html {
font-family: Arial, Helvetica, sans-serif;

4
dist/src/utils/cert.js
View File

@ -123,7 +123,7 @@ function downloadCert(id, apiKey) {
return res.data;
});
}
function getCertificate(endpoint, port, save_ssl) {
function getCertificate(domain, port, save_ssl) {
return __awaiter(this, void 0, void 0, function* () {
if (fs_1.existsSync(__dirname + "/zerossl/tls.cert") && fs_1.existsSync(__dirname + "/zerossl/tls.key")) {
var certificate = fs_1.readFileSync(__dirname + '/zerossl/tls.cert', 'utf-8').toString();
@ -139,6 +139,8 @@ function getCertificate(endpoint, port, save_ssl) {
if (!apiKey) {
throw new Error("=> [ssl] ZEROSSL_API_KEY is not set");
}
var endpoint_tmp = domain.replace('https://', '');
var endpoint = endpoint_tmp.replace(':3001', '');
var keys = forge.pki.rsa.generateKeyPair(2048);
var csr = generateCsr(keys, endpoint);
console.log("=> [ssl] Generated CSR");

2
dist/src/utils/cert.js.map
View File

File diff suppressed because one or more lines are too long

1
dist/src/utils/config.js
View File

@ -22,6 +22,7 @@ function loadConfig() {
media_host: ENV.MEDIA_HOST || config.media_host,
tribes_host: ENV.TRIBES_HOST || config.tribes_host,
public_url: ENV.PUBLIC_URL || config.public_url,
connection_string_path: ENV.CONNECTION_STRING_PATH || config.connection_string_path,
ssl: {
enabled: (ENV.SSL_ENABLED || (config.ssl && config.ssl.enabled)) ? true : false,
save: (ENV.SSL_SAVE || (config.ssl && config.ssl.save)) ? true : false,

2
dist/src/utils/config.js.map
View File

@ -1 +1 @@
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;AAClD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAEvB,SAAgB,UAAU;IACxB,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS;QAC5C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB;QACpE,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,MAAM,CAAC,gBAAgB;QACjE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM;QACnC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB;QACvE,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,oBAAoB;QAC7E,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,GAAG,EAAE;YACH,OAAO,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YAC/E,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YACtE,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SACtD;QACD,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,MAAM,CAAC,uBAAuB;QACtF,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,sBAAsB;QACnF,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACpD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;KAChD,CAAA;AACH,CAAC;AA9BD,gCA8BC"}
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;AAAA,6BAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;AAClD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAEvB,SAAgB,UAAU;IACxB,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS;QAC5C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB;QACpE,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,MAAM,CAAC,gBAAgB;QACjE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM;QACnC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAC,kBAAkB;QACvE,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;QACtC,cAAc,EAAE,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc;QAC3D,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,oBAAoB;QAC7E,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;QAClD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/C,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,sBAAsB;QACnF,GAAG,EAAE;YACH,OAAO,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YAC/E,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YACtE,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SACtD;QACD,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,MAAM,CAAC,uBAAuB;QACtF,sBAAsB,EAAE,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,sBAAsB;QACnF,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;QACzC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACpD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;QACrD,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU;KAChD,CAAA;AACH,CAAC;AA/BD,gCA+BC"}

8
dist/src/utils/setup.js
View File

@ -17,7 +17,9 @@ const gitinfo_1 = require("../utils/gitinfo");
const fs = require("fs");
const nodeinfo_1 = require("./nodeinfo");
const connect_1 = require("./connect");
const config_1 = require("./config");
const USER_VERSION = 7;
const config = config_1.loadConfig();
const setupDatabase = () => __awaiter(void 0, void 0, void 0, function* () {
console.log('=> [db] starting setup...');
yield setVersion();
@ -222,7 +224,11 @@ function printQR() {
});
}
function connectionStringFile(str) {
fs.writeFile('connection_string.txt', str, function (err) {
let connectStringPath = 'connection_string.txt';
if ('connection_string_path' in config) {
connectStringPath = config.connection_string_path;
}
fs.writeFile(connectStringPath, str, function (err) {
if (err)
console.log('ERROR SAVING connection_string.txt.', err);
});

2
dist/src/utils/setup.js.map
View File

File diff suppressed because one or more lines are too long

1
public/index.html
View File

@ -2,6 +2,7 @@
<html>
<head>
<link rel="icon" type="image/ico" href="static/favicon.ico">
<style>
html {
font-family: Arial, Helvetica, sans-serif;

4
src/utils/cert.ts
View File

@ -110,7 +110,7 @@ async function downloadCert(id, apiKey) {
return res.data
}
async function getCertificate(endpoint, port, save_ssl) {
async function getCertificate(domain, port, save_ssl) {
if (existsSync(__dirname + "/zerossl/tls.cert") && existsSync(__dirname + "/zerossl/tls.key")) {
var certificate = readFileSync(__dirname + '/zerossl/tls.cert', 'utf-8').toString();
var caBundle = readFileSync(__dirname + '/zerossl/ca.cert', 'utf-8').toString();
@ -125,6 +125,8 @@ async function getCertificate(endpoint, port, save_ssl) {
if (!apiKey) {
throw new Error("=> [ssl] ZEROSSL_API_KEY is not set")
}
var endpoint_tmp = domain.replace('https://', '')
var endpoint = endpoint_tmp.replace(':3001', '')
var keys = forge.pki.rsa.generateKeyPair(2048)
var csr = generateCsr(keys, endpoint)
console.log("=> [ssl] Generated CSR")

1
src/utils/config.ts
View File

@ -22,6 +22,7 @@ export function loadConfig() {
media_host: ENV.MEDIA_HOST || config.media_host,
tribes_host: ENV.TRIBES_HOST || config.tribes_host,
public_url: ENV.PUBLIC_URL || config.public_url,
connection_string_path: ENV.CONNECTION_STRING_PATH || config.connection_string_path,
ssl: {
enabled: (ENV.SSL_ENABLED || (config.ssl && config.ssl.enabled)) ? true : false,
save: (ENV.SSL_SAVE || (config.ssl && config.ssl.save)) ? true : false,

8
src/utils/setup.ts
View File

@ -6,8 +6,10 @@ import { checkTag, checkCommitHash } from '../utils/gitinfo'
import * as fs from 'fs';
import { isClean } from './nodeinfo'
import { getQR } from './connect'
import { loadConfig } from './config'
const USER_VERSION = 7
const config = loadConfig()
const setupDatabase = async () => {
console.log('=> [db] starting setup...')
@ -227,7 +229,11 @@ async function printQR() {
}
function connectionStringFile(str: string) {
fs.writeFile('connection_string.txt', str, function (err) {
let connectStringPath = 'connection_string.txt'
if ('connection_string_path' in config) {
connectStringPath = config.connection_string_path
}
fs.writeFile(connectStringPath, str, function (err) {
if (err) console.log('ERROR SAVING connection_string.txt.', err);
});
}
Write Preview
Loading…
Cancel
Save