Merge pull request #497 from exodus4d/develop

v1.2.3

.gitignore

@@ -50,5 +50,5 @@ Temporary Items
 .sass-cache
 .usage
 *.gz
-/composer-dev.lock
-/composer.lock
+*.lock
+/conf/

README.md

@@ -11,7 +11,7 @@ Mapping tool for [*EVE ONLINE*](https://www.eveonline.com)
 -  Test server
   - URL: http://www.dev.pathfinder-w.space
   - Running current `develop` branch
-  - Using Singularity (SISI) CREST (make sure to use your test-server client)
+  - _SISI_ _ESI_ (make sure to use your test-server client)
   - Available for public testing (e.g. new feature,.. )
   - Database will be cleared from time to time
 - Installation guide:

app/config.ini

@@ -55,5 +55,6 @@ LANGUAGE                    =   en-US
 [configs]
 app/routes.ini              =   true
 app/pathfinder.ini          =   true
+conf/pathfinder.ini         =   true
 app/requirements.ini        =   true
 app/cron.ini                =   true

app/cron.ini

@@ -16,25 +16,34 @@ tenMinutes      =   */10 * * * *
 ; 2 times per hour (each 30min)
 halfHour        =   */30 * * * *
 
+; 1 times per hour (12:30, 13:30, 14:30,...)
+halfPastHour    =   30 * * * *
+
 ; run on EVE downtime 11:00 GMT/UTC
 downtime        =   0 11 * * *
 
 [CRON.jobs]
-; delete expired connections (e.g. EOL)
-deleteConnections                   =   Cron\MapUpdate->deleteConnections, @fiveMinutes
+; delete EOL connections
+deleteEolConnections                =   Cron\MapUpdate->deleteEolConnections, @fiveMinutes
+
+; delete expired wh connections
+deleteExpiredConnections            =   Cron\MapUpdate->deleteExpiredConnections, @hourly
 
 ; delete character log data
-deleteLogData                       =   Cron\CharacterUpdate->deleteLogData, @tenMinutes
+deleteLogData                       =   Cron\CharacterUpdate->deleteLogData, @instant
 
 ; delete expired signatures
 deleteSignatures                    =   Cron\MapUpdate->deleteSignatures, @halfHour
 
 ; import system data (jump, kill,..) from CCP API
-importSystemData                    =   Cron\CcpSystemsUpdate->importSystemData, @hourly
+importSystemData                    =   Cron\CcpSystemsUpdate->importSystemData, @halfPastHour
 
 ; disable outdated maps
 deactivateMapData                   =   Cron\MapUpdate->deactivateMapData, @hourly
 
+; clean up character data (kick, ban,..)
+cleanUpCharacterData                =   Cron\CharacterUpdate->cleanUpCharacterData, @hourly
+
 ; delete disabled maps
 deleteMapData                       =   Cron\MapUpdate->deleteMapData, @downtime
 

app/environment.ini

@@ -1,8 +1,8 @@
 ; Environment Config
 
 [ENVIRONMENT]
-; project environment (DEVELOP, PRODUCTION).
-; This effects: DB connection, Mail-Server, SSO, CREST configurations in this file
+; project environment (DEVELOP || PRODUCTION).
+; This effects: DB connection, Mail-Server, SSO, ESI configurations in this file
 ; configuration below
 SERVER                      =   DEVELOP
 
@@ -11,7 +11,7 @@ SERVER                      =   DEVELOP
 ; -> e.g. set /pathfinder if your URL looks like https://www.[YOUR_DOMAIN]/pathfinder (subfolder)
 BASE                        =
 ; deployment URL (e.g. http://localhost)
-URL                         =   http://pathfinder.local
+URL                         =   http://local.pathfinder
 ; level of debug/error stack trace
 DEBUG                       =   3
 ; main db
@@ -34,7 +34,8 @@ CCP_SSO_SECRET_KEY          =
 ; CCP ESI API
 CCP_ESI_URL                 =   https://esi.tech.ccp.is
 CCP_ESI_DATASOURCE          =   singularity
-CCP_ESI_SCOPES              =   esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1
+CCP_ESI_SCOPES              =   esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1
+CCP_ESI_SCOPES_ADMIN        =   esi-corporations.read_corporation_membership.v1
 
 ; SMTP settings (optional)
 SMTP_HOST                   =   localhost
@@ -79,7 +80,8 @@ CCP_SSO_SECRET_KEY          =
 ; CCP ESI API
 CCP_ESI_URL                 =   https://esi.tech.ccp.is
 CCP_ESI_DATASOURCE          =   tranquility
-CCP_ESI_SCOPES              =   esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1
+CCP_ESI_SCOPES              =   esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1
+CCP_ESI_SCOPES_ADMIN        =   esi-corporations.read_corporation_membership.v1
 
 ; SMTP settings (optional)
 SMTP_HOST                   =   localhost