Merge branch 'master' of ssh://gitlab.chiefsoft.net:10222/WrenchBoard/WrenchBoradWeb

wrenchboard/.env

@@ -2,7 +2,7 @@ PHP_UID=1000
 PHP_GID=1000
 PHP_HOME=/opt/mainsite/wrenchboard/www
 PHP_USER=php-fpm
-# PHP_INI_SCAN_DIR=/cfgs:/usr/local/etc/php/conf.d
+PHP_INI_SCAN_DIR=/cfgs:/usr/local/etc/php/conf.d
 PHP_INI_PATH=/cfgs/php.ini
 PHP_POOL_PATH=/cfgs/*/*-pool.conf
 PHP_BOOT_SCRIPTS=/cfgs/start.sh
@@ -11,6 +11,6 @@ PHP_CRONTABS_PATH=/cfgs/cron
 #PHP_SESSION_PATH=tcp://redis.host:6379
 
 # private
-TEST_EMAIL=name@domain.com
+TEST_EMAIL=support@wrenchboard.com
 #NEWRELIC_LICENSE=newrelic_license
 #SENDGRID_API_KEY=sendgrid_api_key

wrenchboard/Dockerfile

@@ -8,6 +8,9 @@ RUN apt -y update
 RUN apt -y install libconfig++-dev libconfig++9v5 libconfig-dev libconfig9 libpq-dev libpq5 libjson-c-dev libjson-c3 \
  libpcrecpp0v5 unixodbc-dev postgresql-server-dev-11 libgsoap-dev libgsoap-2.8.75
 
+ADD scripts/* /usr/local/bin/
+ADD configs/* /cfgs/
+
 RUN mkdir -p /opt/mainsite/wrenchboard/
 ADD build /opt/mainsite/wrenchboard/build
 ADD email /opt/mainsite/wrenchboard/email
@@ -20,4 +23,4 @@ RUN cd /opt/mainsite/wrenchboard/src && make
 
 RUN ln -s /opt/mainsite/wrenchboard/src/modules/wrenchboard_api_root.so /usr/local/lib/php/extensions/no-debug-non-zts-20170718/wrenchboard_api_root.so
 
-RUN echo "extension=wrenchboard_api_root.so" > /usr/local/etc/php/conf.d/docker-php-ext-wrenchboard.ini
+RUN echo "extension=wrenchboard_api_root.so" > /usr/local/etc/php/conf.d/docker-php-ext-wrenchboard.ini

wrenchboard/configs/cron

@@ -0,0 +1 @@
+* *   * * *   root   /cfgs/job.sh

wrenchboard/configs/job.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "[ cronjob task ] executed at `date`" > /proc/1/fd/2

wrenchboard/configs/php.ini

@@ -13,6 +13,7 @@
 ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
 ; 4. Current working directory (except CLI)
 ; 5. The web server's directory (for SAPI modules), or directory of PHP
+
 ; (otherwise in Windows)
 ; 6. The directory from the --with-config-file-path compile time option, or the
 ; Windows directory (C:\windows or C:\winnt)
@@ -194,7 +195,7 @@ engine = On
 ; Development Value: Off
 ; Production Value: Off
 ; http://php.net/short-open-tag
-short_open_tag = Off
+short_open_tag = On
 
 ; The number of significant digits displayed in floating point numbers.
 ; http://php.net/precision
@@ -727,7 +728,7 @@ default_charset = "UTF-8"
 ; see documentation for security issues.  The alternate is to use the
 ; cgi.force_redirect configuration below
 ; http://php.net/doc-root
-doc_root =
+;doc_root = /opt/mainsite/wrenchboard/www
 
 ; The directory under which PHP opens the script using /~username used only
 ; if nonempty.
@@ -775,7 +776,7 @@ enable_dl = Off
 ; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
 ; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
 ; http://php.net/cgi.fix-pathinfo
-;cgi.fix_pathinfo=1
+cgi.fix_pathinfo=1
 
 ; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
 ; of the web tree and people will not be able to circumvent .htaccess security.

wrenchboard/configs/start.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "[ start.sh ] Boot script test..." > /proc/1/fd/2

wrenchboard/configs/www.conf

@@ -1,3 +1,6 @@
+[global]
+error_log = /proc/self/fd/2
+
 ; Start a new pool named 'www'.
 ; the variable $pool can be used in any directive and will be replaced by the
 ; pool name ('www' here)
@@ -60,6 +63,7 @@ listen = 9000
 ; accepted from any ip address.
 ; Default Value: any
 ;listen.allowed_clients = 127.0.0.1
+;listen.allowed_clients = 10.20.30.32,127.0.0.1,172.17.0.1,172.18.0.1,172.19.0.1,172.20.0.1,172.21.0.1,172.27.0.1,172.28.0.1,172.30.0.1,192.168.112.1
 
 ; Specify the nice(2) priority to apply to the pool processes (only if set)
 ; The value can vary from -19 (highest priority) to 20 (lower priority)
@@ -257,6 +261,7 @@ ping.response = OK
 ; The access log file
 ; Default: not set
 ;access.log = log/$pool.access.log
+access.log = /proc/self/fd/2
 
 ; The access log format.
 ; The following syntax is allowed

wrenchboard/docker-compose.yml

@@ -8,7 +8,10 @@ services:
       dockerfile: Dockerfile
     hostname: wrenchboard-backend-php72
     container_name: wrenchboard-backend-php72
+    ports:
+      - 9999:9000
     volumes:
       - ./configs:/cfgs
       - ../www:/app
+      - ../www:/opt/mainsite/wrenchboard/www
     env_file: .env