affine/pathfinder-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split images, pull more env vars out

Browse source
This commit is contained in:
greg2010 2022-08-02 00:36:56 -04:00
parent 6ea4fa0026
commit 804a5229ab
No known key found for this signature in database
GPG key ID: 900A237110AFCA71
10 changed files with 78 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/entrypoint.sh
View file

@ -2,7 +2,7 @@
set -e
crontab /var/crontab.txt
envsubst '$DOMAIN' </etc/nginx/templateSite.conf >/etc/nginx/sites_enabled/site.conf
envsubst '$CONTAINER_NAME' </etc/nginx/templateNginx.conf >/etc/nginx/nginx.conf
envsubst '$PATHFINDER_SOCKET_HOST' </etc/nginx/templateNginx.conf >/etc/nginx/nginx.conf
envsubst </var/www/html/pathfinder/app/templateEnvironment.ini >/var/www/html/pathfinder/app/environment.ini
envsubst </var/www/html/pathfinder/app/templateConfig.ini >/var/www/html/pathfinder/app/config.ini
envsubst </etc/zzz_custom.ini >/etc/php7/conf.d/zzz_custom.ini

6
static/nginx/nginx.conf
View file

@ -165,10 +165,10 @@ http {
}
upstream websocket {
server ${CONTAINER_NAME}-socket:8020;
server ${PATHFINDER_SOCKET_HOST}:8020;
}
# Default log file
@ -235,7 +235,7 @@ http {
# a specific directory, or on an individual server{} level.
gzip_static off;
proxy_buffers 16 16k;
proxy_buffers 16 16k;
proxy_buffer_size 16k;
# Include files in the sites-enabled folder. server{} configuration files should be

42
static/pathfinder/environment.ini
View file

@ -15,23 +15,23 @@ URL = {{@SCHEME}}://$DOMAIN
; level of debug/error stack trace
DEBUG = 0
; Pathfinder database
DB_PF_DNS = mysql:host=${CONTAINER_NAME}db;port=3306;dbname=
DB_PF_NAME = pf
DB_PF_USER = root
DB_PF_DNS = mysql:host=${MYSQL_HOST};port=${MYSQL_PORT};dbname=
DB_PF_NAME = $MYSQL_PF_DB_NAME
DB_PF_USER = $MYSQL_USER
DB_PF_PASS = $MYSQL_PASSWORD
; Universe data (New Eden) cache DB for ESI API respons
DB_UNIVERSE_DNS = mysql:host=${CONTAINER_NAME}db;port=3306;dbname=
DB_UNIVERSE_NAME = eve_universe
DB_UNIVERSE_USER = root
; Universe data (New Eden) cache DB for ESI API response
DB_UNIVERSE_DNS = mysql:host=${MYSQL_HOST};port=${MYSQL_PORT};dbname=
DB_UNIVERSE_NAME = $MYSQL_UNIVERSE_DB_NAME
DB_UNIVERSE_USER = $MYSQL_USER
DB_UNIVERSE_PASS = $MYSQL_PASSWORD
; EVE-Online CCP Database export
DB_CCP_DNS = mysql:host=${CONTAINER_NAME}db;port=3306;dbname=
DB_CCP_NAME = eve_lifeblood_min
DB_CCP_USER = root
DB_CCP_PASS = $MYSQL_PASSWORD
DB_CCP_DNS = mysql:host=${MYSQL_HOST};port=${MYSQL_PORT};dbname=
DB_CCP_NAME = $MYSQL_CCP_DB_NAME
DB_CCP_USER = $MYSQL_USER
DB_CCP_PASS = $MYSQL_PASSWORD
; CCP SSO
CCP_SSO_URL = https://login.eveonline.com
@ -43,19 +43,19 @@ CCP_SSO_DOWNTIME = 11:00
; CCP ESI API
CCP_ESI_URL = https://esi.evetech.net
CCP_ESI_DATASOURCE = tranquility
CCP_ESI_SCOPES = $CCP_ESI_SCOPES
CCP_ESI_SCOPES = $CCP_ESI_SCOPES
CCP_ESI_SCOPES_ADMIN =
; SMTP settings (optional)
SMTP_HOST = localhost
SMTP_PORT = 25
SMTP_SCHEME = TLS
SMTP_USER =
SMTP_PASS =
SMTP_HOST = $SMTP_HOST
SMTP_PORT = $SMTP_PORT
SMTP_SCHEME = $SMTP_SCHEME
SMTP_USER = $SMTP_USER
SMTP_PASS = $SMTP_PASS
SMTP_FROM = registration@pathfinder-w.space
SMTP_ERROR = admin@pathfinder-w.space
SMTP_FROM = $SMTP_FROM
SMTP_ERROR = $SMTP_EMAIL
; TCP Socket configuration (optional) (advanced)
SOCKET_HOST = ${CONTAINER_NAME}-socket
SOCKET_PORT = 5555
SOCKET_HOST = $PATHFINDER_SOCKET_HOST
SOCKET_PORT = $PATHFINDER_SOCKET_PORT

2
static/php/php.ini
View file

@ -9,7 +9,7 @@ fastcgi.impersonate=1
fastcgi.logging=0
request_terminate_timeout = 300
session.save_handler = redis
session.save_path = "tcp://${CONTAINER_NAME}-redis:6379"
session.save_path = "tcp://${REDIS_HOST}:${REDIS_PORT}"
[Date]
date.timezone="UTC"