From 38c82b3c8a64779577d16de896bef65fc8309c11 Mon Sep 17 00:00:00 2001
From: David Mehren <dmehren1@gmail.com>
Date: Thu, 14 May 2020 17:00:37 +0200
Subject: [PATCH] Update PM2 config, use HTTP Repos, adapt settings.coffee for
non-docker usage
Signed-off-by: David Mehren <dmehren1@gmail.com>
---
pm2_processes.yml | 26 ++++++++++++++++++++++++++
services.js | 2 +-
settings.coffee | 8 ++++----
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/pm2_processes.yml b/pm2_processes.yml
index 1afbefa..1dfaf39 100644
--- a/pm2_processes.yml
+++ b/pm2_processes.yml
@@ -5,6 +5,8 @@ apps:
instances: 1
autorestart: false
interpreter: node@10.16.3
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: clsi
script: app.js
cwd: clsi
@@ -12,6 +14,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: contacts
script: app.js
cwd: contacts
@@ -19,6 +23,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: docstore
script: app.js
cwd: docstore
@@ -26,6 +32,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: document-updater
script: app.js
cwd: document-updater
@@ -33,6 +41,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: filestore
script: app.js
cwd: filestore
@@ -40,6 +50,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: notifications
script: app.js
cwd: notifications
@@ -47,6 +59,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: real-time
script: app.js
cwd: real-time
@@ -54,6 +68,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: spelling
script: app.js
cwd: spelling
@@ -61,6 +77,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: tags
script: app.js
cwd: tags
@@ -68,6 +86,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: track-changes
script: app.js
cwd: track-changes
@@ -75,6 +95,8 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
- name: web
script: app.js
cwd: web
@@ -82,3 +104,7 @@ apps:
autorestart: false
interpreter: node@10.16.3
exec_mode: fork
+ env:
+ SHARELATEX_CONFIG: "/tmp/texjs/config/settings.coffee"
+ WEB_API_USER: "sharelatex"
+ WEB_API_PASSWORD: "password"
diff --git a/services.js b/services.js
index 966d50b..236eb16 100644
--- a/services.js
+++ b/services.js
@@ -2,7 +2,7 @@ module.exports =
[{
name: "web",
- repo: "git@gitlab.fachschaften.org:texjs/web.git",
+ repo: "https://gitlab.fachschaften.org/texjs/web.git",
version: "master"
}, {
name: "real-time",
diff --git a/settings.coffee b/settings.coffee
index 9912fd1..61f1be0 100644
--- a/settings.coffee
+++ b/settings.coffee
@@ -3,7 +3,7 @@ Path = require('path')
# These credentials are used for authenticating api requests
# between services that may need to go over public channels
httpAuthUser = "sharelatex"
-httpAuthPass = process.env["WEB_API_PASSWORD"]
+httpAuthPass = "password"
httpAuthUsers = {}
httpAuthUsers[httpAuthUser] = httpAuthPass
@@ -37,7 +37,7 @@ settings =
#
# The following works out of the box with Mongo's default settings:
mongo:
- url : process.env["SHARELATEX_MONGO_URL"] or 'mongodb://dockerhost/sharelatex'
+ url : process.env["SHARELATEX_MONGO_URL"] or 'mongodb://localhost/sharelatex'
# Redis is used in ShareLaTeX for high volume queries, like real-time
# editing, and session management.
@@ -45,7 +45,7 @@ settings =
# The following config will work with Redis's default settings:
redis:
web: redisConfig =
- host: process.env["SHARELATEX_REDIS_HOST"] or "dockerhost"
+ host: process.env["SHARELATEX_REDIS_HOST"] or "localhost"
port: process.env["SHARELATEX_REDIS_PORT"] or "6379"
password: process.env["SHARELATEX_REDIS_PASS"] or ""
key_schema:
@@ -147,7 +147,7 @@ settings =
# Where your instance of ShareLaTeX can be found publicly. This is used
# when emails are sent out and in generated links:
- siteUrl: siteUrl = process.env["SHARELATEX_SITE_URL"] or 'http://localhost'
+ siteUrl: siteUrl = 'https://localhost'
# The name this is used to describe your ShareLaTeX Installation
appName: process.env["SHARELATEX_APP_NAME"] or "ShareLaTeX (Community Edition)"
--
GitLab