From 785fd9d2f75a1da0ecf3713dfb8be8ba5db50a66 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Mon, 11 Jul 2022 09:27:12 +0200 Subject: [PATCH 01/12] Added NGINX to Docker Stack + Other Fixes - Added NGINX to Docker stack - Moved Swagger file generation to init script - Fixed notifications not showing on frontend(not sure how? I think the ssl and domain changes fixed it lol) - NOTE: cert.pem is trusted by the socioboard container to avoid php curl errors --- .gitignore | 2 + Docker.README.md | 18 +++- docker/.env.example | 4 +- docker/docker-compose.yaml | 34 +++++-- docker/nginx/nginx-socioboard.conf | 158 +++++++++++++++++++++++++++++ docker/nginx/nginx.conf | 31 ++++++ docker/nginx/ssl/SSL.README.md | 20 ++++ docker/socioboard/Dockerfile | 9 +- docker/socioboard/config.sh | 28 ++++- docker/socioboard/init.sh | 41 ++++++-- 10 files changed, 313 insertions(+), 32 deletions(-) create mode 100644 docker/nginx/nginx-socioboard.conf create mode 100644 docker/nginx/nginx.conf create mode 100644 docker/nginx/ssl/SSL.README.md diff --git a/.gitignore b/.gitignore index 602e50d3..92b5fe90 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,5 @@ docker/.env docker/data docker/init-mongo.js docker-dev-build.sh +docker/nginx/ssl/cert.pem +docker/nginx/ssl/key.pem diff --git a/Docker.README.md b/Docker.README.md index 31eb7d59..4f34d7c3 100644 --- a/Docker.README.md +++ b/Docker.README.md @@ -1,6 +1,10 @@ # Socioboard Docker Containers Docker version developed and maintained by https://github.com/vaughngx4. -PLEASE NOTE: Currently, the application is created to run in development mode WITH debugging on by default, as well as having several API vulnerabilities. This is a potential security issue and I would advise to not expose the application(ports 8000 and 8080) or the API(ports 3000 - 3004) to the internet. + +NOTE 1: Currently, the application is created to run in development mode WITH debugging on by default, as well as having several API vulnerabilities. This is a potential security risk and I would advise to not expose the application or the API to the internet. + +NOTE 2: Running on the `localhost` domain is no longer supported due to the addition of SSL and how the application is built. If you would like to run on your local machine, you will need to have an external DNS(setting in your hosts file doesn't work as the socioboard container also needs to be able to resolve hostnames) like your router, AdGuard or PiHole for example, set to the external IP of your local machine(i.e. 192.168.1.101). You will also need to expose ports 80 and 443 on your local machine. See `docker/nginx/ssl/SSL.README.md` for a list of subdomains. + ## Installation Clone source code and cd into directory: ```bash @@ -25,7 +29,9 @@ NOTE 1: Twilio API is required for the user API(registration, login etc.) to wor Twilio `Account SID` and `Auth Key` can be found in the API Keys section. To get a `Service ID` you will need to go the `Twilio Console` click on `Verify`, then `Services` and create a SocioBoard service. -NOTE 2: If running behind a reverse proxy or exposing ports other than the default, be sure to change the URL scheme in the `# apply configs to config files` section of `docker/socioboard/init.sh` +NOTE 2: If you would like to change the subdomains, be sure to change the URL scheme in the `# apply configs to config files` section of `docker/socioboard/init.sh`, in `docker/socioboard/config.sh` and in `docker/nginx/nginx-socioboard.conf`. + +You can also provide your own SSL certificate if necessary(see `docker/nginx/ssl/SSL.README.md`) Create and start containers: ```bash @@ -48,10 +54,12 @@ A `data/api` directory will be created inside the `docker` folder(you can change The docker network IP is not important and can be changed freely. ### Changing Exposed Ports: -If for example port 8000 on your machine is in use and you want to change the frontend to port 8989. You will need to edit `docker/docker-compose.yaml` and change `"8000:8000"` to `"8989:8000"`. You will also need to change the URL scheme in `docker/socioboard/init.sh` to match. +If port(s) 80 and/or 443 are in use on your system you will need to edit `docker/docker-compose.yaml` and change `"443:443"` to `"8443:8443"` for example. You will also need to change the port(s) in your docker `.env` file. + +NOTE: When serving https on a port other than 443, the http redirect will no longer work. You will either have to modify the redirect in `docker/nginx/nginx-socioboard.conf` or handle it with your own reverse proxy(if you're using your own reverse proxy AND non standard ports I'd suggest handling the redirect there). ## Creating an Account -Navigate to your endpoint(`http://localhost:8000 by default) and create a new user by signing up. You will receive a message in the top right corner stating "Registration Failed - Unauthorized", this means you've registered but the activation link could not be emailed(no email set up). +Navigate to your endpoint(`https://socio.mydomain.example) and create a new user by signing up. You will receive a message in the top right corner stating "Registration Failed - Unauthorized", this means you've registered but the activation link could not be emailed(no email set up). There are 2 ways to edit users: ### Method 1 - CLI: @@ -61,7 +69,7 @@ docker exec -it socioboard-mysql sh -c "mysql --user=scbadmin --password=sqlpass ``` ### Method 2 - GUI: -There is now an optional admin panel(enabled by default, but can be disabled via `.env`) that is served on port 8080 at `/admin` (http://localhost:8080/admin by default). Default login details are - email: `admin@scb.example` and password: `scb@123`. I recommend you change these in the `.env` file as well. +There is now an optional admin panel(enabled by default, but can be disabled via `.env`) that is served at `/admin` (https://socio.mydomain.example/admin). Default login details are - email: `admin@scb.example` and password: `scb@123`. I recommend you change these in the `.env` file as well. After logging in, click on your database(there should only be 1 database). Scroll down to the `User Activations` section(table), find your user(you can match users based on the data in `User Details` section(table)), click the 3 dots to the right of the user and click on `edit`. Here you can set `Activation Status` (`0` means not activated, `1` means activated), `User Plan` (ranges from `0` to `7`) and `Account Expire Date`. diff --git a/docker/.env.example b/docker/.env.example index a6d1c4bd..9b571f65 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -1,4 +1,6 @@ -DOMAIN_NAME="localhost" +BASE_DOMAIN="mydomain.example" +HTTP_PORT="80" +HTTPS_PORT="443" AUTH_SECRET="randomsecret" AUTH_TOKEN_SECRET="randomtokensecret" SQL_DB_NAME="scbsql" diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index cd4760a0..54f2435c 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -7,15 +7,10 @@ services: depends_on: - socioboard-mysql - socioboard-mongo - ports: - - "8000:8000" - - "8080:8080" - - "3000:3000" - - "3001:3001" - - "3002:3002" - - "3004:3004" environment: - DOMAIN: ${DOMAIN_NAME} + BASE_DOMAIN: ${BASE_DOMAIN} + HTTP_PORT: ${HTTP_PORT} + HTTPS_PORT: ${HTTPS_PORT} AUTH_SECRET: ${AUTH_SECRET} AUTH_TOKEN_SECRET: ${AUTH_TOKEN_SECRET} SQL_DB_NAME: ${SQL_DB_NAME} @@ -77,6 +72,7 @@ services: SESSION_KEY_2: ${API_SESSION_KEY_2} volumes: - ./data/api:/data + - ./nginx/ssl:/ssl security_opt: - no-new-privileges:true restart: always @@ -112,6 +108,28 @@ services: networks: scb-net: ipv4_address: 172.16.32.4 + socioboard-nginx: + image: nginx:latest + container_name: socioboard-nginx + depends_on: + - socioboard + - socioboard-mysql + - socioboard-mongo + ports: + - "${HTTP_PORT}:${HTTP_PORT}" + - "${HTTPS_PORT}:${HTTPS_PORT}" + environment: + BASE_DOMAIN: ${BASE_DOMAIN} + HTTP_PORT: ${HTTP_PORT} + HTTPS_PORT: ${HTTPS_PORT} + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf + - ./nginx/nginx-socioboard.conf:/etc/nginx/templates/socioboard.conf.template + - ./nginx/ssl:/ssl + restart: always + networks: + scb-net: + ipv4_address: 172.16.32.5 volumes: scb-mongo: {} scb-mysql: {} diff --git a/docker/nginx/nginx-socioboard.conf b/docker/nginx/nginx-socioboard.conf new file mode 100644 index 00000000..678895ce --- /dev/null +++ b/docker/nginx/nginx-socioboard.conf @@ -0,0 +1,158 @@ +server { + listen ${HTTP_PORT}; + server_name *.${BASE_DOMAIN}; + server_tokens off; + + location ^~ / { + return 301 https://$host$request_uri; + } +} +server { + listen ${HTTPS_PORT} ssl; + server_name socio.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + + ssl_certificate /ssl/cert.pem; + ssl_certificate_key /ssl/key.pem; + + + location ^~ /admin { + proxy_pass http://socioboard:8080/admin; + } + + location ^~ / { + proxy_pass http://socioboard:8000; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location ~ \.css { + add_header Content-Type text/css; + } + location ~ \.js { + add_header Content-Type application/x-javascript; + } +} +server { + listen ${HTTPS_PORT} ssl; + server_name socio-api.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + + ssl_certificate /ssl/cert.pem; + ssl_certificate_key /ssl/key.pem; + + + location ^~ / { + proxy_pass http://socioboard:3000/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} +server { + listen ${HTTPS_PORT} ssl; + server_name socio-feeds.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + + ssl_certificate /ssl/cert.pem; + ssl_certificate_key /ssl/key.pem; + + + location ^~ / { + proxy_pass http://socioboard:3001/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} +server { + listen ${HTTPS_PORT} ssl; + server_name socio-publish.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + + ssl_certificate /ssl/cert.pem; + ssl_certificate_key /ssl/key.pem; + + + location ^~ / { + proxy_pass http://socioboard:3002/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} +server { + listen ${HTTPS_PORT} ssl; + server_name socio-update.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + + ssl_certificate /ssl/cert.pem; + ssl_certificate_key /ssl/key.pem; + + + location ^~ / { + proxy_pass http://socioboard:3003/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} +server { + listen ${HTTPS_PORT} ssl; + server_name socio-notifications.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + + ssl_certificate /ssl/cert.pem; + ssl_certificate_key /ssl/key.pem; + + + location ^~ / { + proxy_pass http://socioboard:3004/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf new file mode 100644 index 00000000..f51f20e2 --- /dev/null +++ b/docker/nginx/nginx.conf @@ -0,0 +1,31 @@ +user nginx; +worker_processes auto; + +error_log /dev/stdout notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /dev/stdout main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} \ No newline at end of file diff --git a/docker/nginx/ssl/SSL.README.md b/docker/nginx/ssl/SSL.README.md new file mode 100644 index 00000000..759f74fa --- /dev/null +++ b/docker/nginx/ssl/SSL.README.md @@ -0,0 +1,20 @@ +# SSL Certificates +NGINX is expecting `cert.pem` and `key.pem` in this directory. + +These can be either: + +1) A wildcard cert key pair for your base domain + +OR + +2) A certificate containing SAN for domains as follows: +- socio.mydomian.example +- socio-api.mydomain.example +- socio-feeds.mydomain.example +- socio-publish.mydomain.example +- socio-update.mydomain.example +- socio-notifications.mydomain.example + +with `mydomian.example` being your base domain. + +If `cert.pem` is not found, the container will create a self-signed wildcard cert-key pair for your specified base domain and overwrite `key.pem` if the file exists. diff --git a/docker/socioboard/Dockerfile b/docker/socioboard/Dockerfile index ea14834a..f27c5f9f 100644 --- a/docker/socioboard/Dockerfile +++ b/docker/socioboard/Dockerfile @@ -4,6 +4,8 @@ WORKDIR / RUN addgroup -S socioboard && adduser -S socioboard -G socioboard RUN mkdir -p /usr/socioboard/app RUN apk add --no-cache --upgrade \ + openssl \ + ca-certificates \ su-exec \ bash \ jq \ @@ -33,15 +35,10 @@ RUN cd /usr/socioboard/app/socioboard-api/User && npm install && \ cd ../Publish && npm install && \ cd ../Notification && npm install && \ cd ../Admin && npm install -RUN cd ./socioboard-api/User && npm run swagger && \ - cd ../Feeds && npm run swagger && \ - cd ../Publish && npm run swagger && \ - cd ../Notification && npm run swagger && \ - cd ../Update && npm run swagger RUN cd ./socioboard-web-php && composer install RUN chown -R socioboard /usr/socioboard/app +COPY ./sql-ping.php /sql-ping.php COPY ./entrypoint.sh /docker-entrypoint.sh COPY ./init.sh /init.sh COPY ./config.sh /config.sh -COPY ./sql-ping.php /sql-ping.php ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/docker/socioboard/config.sh b/docker/socioboard/config.sh index bfa4dea0..4b18229d 100755 --- a/docker/socioboard/config.sh +++ b/docker/socioboard/config.sh @@ -140,7 +140,7 @@ while [[ $(echo $config | jq '.twilio') != 'null' ]];do done # test url while [[ $(echo $config | jq '.test_url') != 'null' ]];do - config=$(echo $config | jq --arg a "http://${DOMAIN}/" '.test_url = $a') + config=$(echo $config | jq --arg a "https://socio.${BASE_DOMAIN}/" '.test_url = $a') break; done # session @@ -173,7 +173,25 @@ done rm -f $1 echo $config > $1 -# replace localhost with env domain -sed -i "s;local.socioboard.com;$DOMAIN;g" $1 -sed -i "s;localhost;$DOMAIN;g" $1 -sed -i "s;notifyv5.socioboard.com;$DOMAIN:3004;g" $1 \ No newline at end of file +# replace http with https +sed -i "s;https;http;g" $1 # https to http so we avoid adding an extra 's' in the next command +sed -i "s;http;https;g" $1 + +# if non standard https port, change URL scheme, else leave blank +port="" +while [[ $HTTPS_PORT != "443" ]];do + port=":$HTTPS_PORT" + break; +done + +# change api domains first to avoid mixing 'localhost' replacements +sed -i "s;localhost:3000;socio-api.${BASE_DOMAIN}${port};g" $1 +sed -i "s;localhost:3001;socio-feeds.${BASE_DOMAIN}${port};g" $1 +sed -i "s;localhost:3002;socio-publish.${BASE_DOMAIN}${port};g" $1 +sed -i "s;localhost:3003;socio-update.${BASE_DOMAIN}${port};g" $1 +sed -i "s;localhost:3004;socio-notifications.${BASE_DOMAIN}${port};g" $1 + +# change remaining domains +sed -i "s;local.socioboard.com;socio.${BASE_DOMAIN}${port};g" $1 +sed -i "s;localhost;socio.${BASE_DOMAIN}${port};g" $1 +sed -i "s;notifyv5.socioboard.com;socio-notifications.${BASE_DOMAIN}${port};g" $1 diff --git a/docker/socioboard/init.sh b/docker/socioboard/init.sh index 4f000636..bb3069f2 100755 --- a/docker/socioboard/init.sh +++ b/docker/socioboard/init.sh @@ -9,6 +9,13 @@ config=$(echo $config | jq --arg a "socioboard-mysql" '.development.host = $a') rm -f config.json echo $config > config.json +# if non standard https port, change URL scheme, else leave blank +port="" +while [[ $HTTPS_PORT != "443" ]];do + port=":$HTTPS_PORT" + break; +done + # apply configs to config files cd / ./config.sh "/usr/socioboard/app/socioboard-api/User/config/development.json" @@ -22,12 +29,12 @@ cd /usr/socioboard/app/socioboard-web-php/ cp example.env .env sed -i "s;<>;${LARAVEL_KEY};g" .env sed -i "s;APP_ENV=local;APP_ENV=development;g" .env -sed -i "s;<>;http://${DOMAIN}:8000/;g" .env -sed -i "s;<>;http://${DOMAIN}:3000/;g" .env -sed -i "s;<>;http://${DOMAIN}:3001/;g" .env -sed -i "s;<>;http://${DOMAIN}:3002/;g" .env -sed -i "s;<>;http://${DOMAIN}:3003/;g" .env -sed -i "s;<>;http://${DOMAIN}:3004/;g" .env +sed -i "s;<>;https://socio.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-api.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-feeds.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-publish.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-update.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-notifications.${BASE_DOMAIN}${port}/;g" .env # init mysql db while [ ! -e "/data/db.init" ];do @@ -39,4 +46,24 @@ while [ ! -e "/data/db.init" ];do npx sequelize-cli db:seed --seed seeders/20210303111816-initialize_application_informations.cjs touch /data/db.init break; -done \ No newline at end of file +done + +# init certificates +while [ ! -e "/ssl/cert.pem" ];do + echo "No SSL certificate found, generating" + openssl req -subj "/CN=*.$BASE_DOMAIN/O=SocioBoard/C=US" -new -newkey rsa:2048 -sha256 -days 365 -nodes -x509 -keyout /ssl/key.pem -out /ssl/cert.pem + break; +done + +# trust cert to avoid curl errors +echo "Updating certificate store" +cp /ssl/cert.pem /usr/local/share/ca-certificates/ +update-ca-certificates + +# generate swagger files for api endpoints +echo "Generating Swagger files" +cd /usr/socioboard/app/socioboard-api/User && npm run swagger +cd ../Feeds && npm run swagger +cd ../Publish && npm run swagger +cd ../Notification && npm run swagger +cd ../Update && npm run swagger From d32a0127edc75f1eb52a010b8ee4fe3e10703aee Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Mon, 11 Jul 2022 10:10:09 +0200 Subject: [PATCH 02/12] Update .env.example - Fixed wrong sample admin email --- docker/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/.env.example b/docker/.env.example index 9b571f65..7a56f88e 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -14,7 +14,7 @@ LARAVEL_KEY="randomkey" MAIL_HANDLER="sendgridapi" SOCIOBOARD_TWITTER_HANDLER="@board_socio" ADMIN_PANEL_ENABLED="true" -ADMIN_EMAIL="admin@sbc.example" +ADMIN_EMAIL="admin@scb.example" ADMIN_PASSWORD="scb@123" ADMIN_SESSION_NAME="SCBADM" ADMIN_SESSION_KEY="somerandomkey" From bed3d7dd744cffb518e32d8ecf77abbd22e33a63 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Sat, 23 Jul 2022 18:27:46 +0200 Subject: [PATCH 03/12] Fixed Docker DB Init + Other fixes - Fixed Docker MySQL DB init - Changed to node user to avoid permission errors - Changed MySQL DB init to seed from file with any date(semi update proof) - Fixed NGINX Proxy buffer size --- docker/nginx/nginx.conf | 3 +++ docker/socioboard/Dockerfile | 3 +-- docker/socioboard/entrypoint.sh | 14 +++++++------- docker/socioboard/init.sh | 13 ++++++++----- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index f51f20e2..cd96d12d 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -19,6 +19,9 @@ http { '"$http_user_agent" "$http_x_forwarded_for"'; access_log /dev/stdout main; + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; sendfile on; #tcp_nopush on; diff --git a/docker/socioboard/Dockerfile b/docker/socioboard/Dockerfile index f27c5f9f..b3b10cc7 100644 --- a/docker/socioboard/Dockerfile +++ b/docker/socioboard/Dockerfile @@ -1,7 +1,6 @@ FROM node:lts-alpine3.15 LABEL maintainer="vaughngx4 (vaughng@pm.me)" WORKDIR / -RUN addgroup -S socioboard && adduser -S socioboard -G socioboard RUN mkdir -p /usr/socioboard/app RUN apk add --no-cache --upgrade \ openssl \ @@ -36,7 +35,7 @@ RUN cd /usr/socioboard/app/socioboard-api/User && npm install && \ cd ../Notification && npm install && \ cd ../Admin && npm install RUN cd ./socioboard-web-php && composer install -RUN chown -R socioboard /usr/socioboard/app +RUN chown -R node /usr/socioboard/app COPY ./sql-ping.php /sql-ping.php COPY ./entrypoint.sh /docker-entrypoint.sh COPY ./init.sh /init.sh diff --git a/docker/socioboard/entrypoint.sh b/docker/socioboard/entrypoint.sh index a4927b54..55aced92 100755 --- a/docker/socioboard/entrypoint.sh +++ b/docker/socioboard/entrypoint.sh @@ -31,17 +31,17 @@ cd /usr/socioboard/app/ echo "Starting API" npm i pm2 -g && \ export NODE_ENV=development && \ -cd ./socioboard-api/User && su-exec socioboard pm2 start user.server.js && \ -cd ../Feeds && su-exec socioboard pm2 start feeds.server.js && \ -cd ../Publish && su-exec socioboard pm2 start publish.server.js && \ -cd ../Notification && su-exec socioboard pm2 start notify.server.js && \ -cd ../Update && su-exec socioboard pm2 start update.server.js && \ -cd ../Admin && su-exec socioboard pm2 start admin.server.js +cd ./socioboard-api/User && su-exec node pm2 start user.server.js && \ +cd ../Feeds && su-exec node pm2 start feeds.server.js && \ +cd ../Publish && su-exec node pm2 start publish.server.js && \ +cd ../Notification && su-exec node pm2 start notify.server.js && \ +cd ../Update && su-exec node pm2 start update.server.js && \ +cd ../Admin && su-exec node pm2 start admin.server.js # start frontend echo "Starting Frontend" cd /usr/socioboard/app/socioboard-web-php php8 artisan key:generate -su-exec socioboard php8 artisan serve --host=0.0.0.0 --port=8000 +su-exec node php8 artisan serve --host=0.0.0.0 --port=8000 echo "Running" tail -f > /dev/null diff --git a/docker/socioboard/init.sh b/docker/socioboard/init.sh index bb3069f2..7be05c6f 100755 --- a/docker/socioboard/init.sh +++ b/docker/socioboard/init.sh @@ -39,13 +39,16 @@ sed -i "s;<>;https://socio-notifications.${BASE_DOMAI # init mysql db while [ ! -e "/data/db.init" ];do echo "Initializing MySQL Database" - cd /usr/socioboard/app/ - cd ./socioboard-api/Common/Sequelize-cli && \ + cd /usr/socioboard/app/socioboard-api/Common/Sequelize-cli + dbi=$(ls seeders | grep '[0-9]*initialize_application_informations.cjs') export NODE_ENV=development && \ - npx sequelize-cli db:migrate && \ - npx sequelize-cli db:seed --seed seeders/20210303111816-initialize_application_informations.cjs + su-exec node npx sequelize-cli db:migrate && \ + su-exec node npx sequelize-cli db:seed --seed seeders/$dbi && \ touch /data/db.init - break; + while [ ! -e "/data/db.init" ];do + echo "MySQL Database Initialization Failed, Retrying" + break; + done done # init certificates From 1a6a047d9cf7f417831b2b46fcbafa13f4b0bedb Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Sun, 24 Jul 2022 17:58:45 +0200 Subject: [PATCH 04/12] Fixed Docker Mixed Content Errors - Fixed mixed content errors when using Docker and with NGINX --- docker/nginx/nginx-socioboard.conf | 48 ++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/docker/nginx/nginx-socioboard.conf b/docker/nginx/nginx-socioboard.conf index 678895ce..46bcb063 100644 --- a/docker/nginx/nginx-socioboard.conf +++ b/docker/nginx/nginx-socioboard.conf @@ -17,6 +17,7 @@ server { add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; server_tokens off; ssl_certificate /ssl/cert.pem; @@ -29,9 +30,14 @@ server { location ^~ / { proxy_pass http://socioboard:8000; - proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; } location ~ \.css { @@ -51,6 +57,7 @@ server { add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; server_tokens off; ssl_certificate /ssl/cert.pem; @@ -59,9 +66,14 @@ server { location ^~ / { proxy_pass http://socioboard:3000/; - proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; } } server { @@ -74,6 +86,7 @@ server { add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; server_tokens off; ssl_certificate /ssl/cert.pem; @@ -82,9 +95,14 @@ server { location ^~ / { proxy_pass http://socioboard:3001/; - proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; } } server { @@ -97,6 +115,7 @@ server { add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; server_tokens off; ssl_certificate /ssl/cert.pem; @@ -105,9 +124,14 @@ server { location ^~ / { proxy_pass http://socioboard:3002/; - proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; } } server { @@ -120,6 +144,7 @@ server { add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; server_tokens off; ssl_certificate /ssl/cert.pem; @@ -128,9 +153,14 @@ server { location ^~ / { proxy_pass http://socioboard:3003/; - proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; } } server { @@ -143,6 +173,7 @@ server { add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; server_tokens off; ssl_certificate /ssl/cert.pem; @@ -151,8 +182,13 @@ server { location ^~ / { proxy_pass http://socioboard:3004/; - proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; } } From b22883a44edab535261742a80edf58abb751f404 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Sat, 30 Jul 2022 16:52:31 +0200 Subject: [PATCH 05/12] Moved Auto MongoDB Init - Removed mongo init from build script and made into it's own script - Fixed Docker readme --- Configuration.README.md | 4 ++-- Docker.README.md | 11 +++++++++-- docker-build.sh | 15 --------------- docker-set-mongo-init.sh | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 docker-set-mongo-init.sh diff --git a/Configuration.README.md b/Configuration.README.md index 55aa53b9..8c5fd37d 100644 --- a/Configuration.README.md +++ b/Configuration.README.md @@ -40,10 +40,10 @@ In order to use facebook functionality(i.e. schedule a post to facebook) we will - YouTube: https://developers.google.com/youtube/v3/getting-started ### URL, Scheme & Ports: -You must also change all instances of urls to that of your setup(this is done mostly automatically in the Docker setup, see `Docker.README.md for details). +You must also change all instances of urls to that of your setup(this is done mostly automatically in the Docker setup, see `Docker.README.md` for details). ## Creating an Account -Navigate to your endpoint(`http://localhost:8000 by default) and create a new user by signing up. You will receive a message in the top right corner stating "Registration Failed - Unauthorized", this means you've registered but the activation link could not be emailed(no email set up). +Navigate to your endpoint(`http://localhost:8000` by default) and create a new user by signing up. You will receive a message in the top right corner stating "Registration Failed - Unauthorized", this means you've registered but the activation link could not be emailed(no email set up). There are 2 ways to finish setting up users: diff --git a/Docker.README.md b/Docker.README.md index 4f34d7c3..a30e5b42 100644 --- a/Docker.README.md +++ b/Docker.README.md @@ -25,6 +25,11 @@ cp docker/.env.example docker/.env vi docker/.env ``` +Prepare MongoDB files(this needs to be done whenever you change any mongo related settings in .env i.e new database): +```bash +./docker-set-mongo-init.sh +``` + NOTE 1: Twilio API is required for the user API(registration, login etc.) to work. Fill correct details(You can create a free acount here: https://www.twilio.com/try-twilio) Twilio `Account SID` and `Auth Key` can be found in the API Keys section. To get a `Service ID` you will need to go the `Twilio Console` click on `Verify`, then `Services` and create a SocioBoard service. @@ -54,9 +59,11 @@ A `data/api` directory will be created inside the `docker` folder(you can change The docker network IP is not important and can be changed freely. ### Changing Exposed Ports: -If port(s) 80 and/or 443 are in use on your system you will need to edit `docker/docker-compose.yaml` and change `"443:443"` to `"8443:8443"` for example. You will also need to change the port(s) in your docker `.env` file. +If port(s) 80 and/or 443 are in use on your system, but your proxy frontend still expects traffic on port(s) 80 and/or 443 you will need to edit `docker/docker-compose.yaml` and change `"${HTTPS_PORT}:${HTTPS_PORT}"` to `"8443:${HTTPS_PORT}"` for example. + +If you would like to change the ports the application is served on(i.e you would visit socio.mydomain.com:8443 to use the application) simply change the port(s) in your docker `.env` file. -NOTE: When serving https on a port other than 443, the http redirect will no longer work. You will either have to modify the redirect in `docker/nginx/nginx-socioboard.conf` or handle it with your own reverse proxy(if you're using your own reverse proxy AND non standard ports I'd suggest handling the redirect there). +NOTE: When serving https on a port other than 443, the http redirect will no longer work. You will either have to modify the redirect in `docker/nginx/nginx-socioboard.conf` or handle it with your own reverse proxy(if you're using your own reverse proxy AND non standard ports I'd suggest handling the redirect there or leaving the http port out entirely). ## Creating an Account Navigate to your endpoint(`https://socio.mydomain.example) and create a new user by signing up. You will receive a message in the top right corner stating "Registration Failed - Unauthorized", this means you've registered but the activation link could not be emailed(no email set up). diff --git a/docker-build.sh b/docker-build.sh index e360b741..b9722690 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -4,21 +4,6 @@ cp -r ./socioboard-api ./docker/socioboard/ cp -r ./socioboard-web-php ./docker/socioboard/ cd docker -# set mongodb init details -cp ./init-mongo-template.js ./init-mongo.js -mongo_user=$(cat .env | grep 'MONGO_USER') -IFS='=' read -a user_arr <<< $mongo_user -mongo_user=$(echo ${user_arr[1]} | tr -d '"') -mongo_pass=$(cat .env | grep 'MONGO_PASS') -IFS='=' read -a pass_arr <<< $mongo_pass -mongo_pass=$(echo ${pass_arr[1]} | tr -d '"') -mongo_db=$(cat .env | grep 'MONGO_DB_NAME') -IFS='=' read -a db_arr <<< $mongo_db -mongo_db=$(echo ${db_arr[1]} | tr -d '"') -sed -i "s;USER_REF;$mongo_user;g" init-mongo.js -sed -i "s;PASS_REF;$mongo_pass;g" init-mongo.js -sed -i "s;DB_REF;$mongo_db;g" init-mongo.js - # pull cached image #docker pull localhost:5051/socioboard/socioboard:latest diff --git a/docker-set-mongo-init.sh b/docker-set-mongo-init.sh new file mode 100644 index 00000000..83798d3f --- /dev/null +++ b/docker-set-mongo-init.sh @@ -0,0 +1,16 @@ +#!/bin/bash +cd docker +# set mongodb init details +cp ./init-mongo-template.js ./init-mongo.js +mongo_user=$(cat .env | grep 'MONGO_USER') +IFS='=' read -a user_arr <<< $mongo_user +mongo_user=$(echo ${user_arr[1]} | tr -d '"') +mongo_pass=$(cat .env | grep 'MONGO_PASS') +IFS='=' read -a pass_arr <<< $mongo_pass +mongo_pass=$(echo ${pass_arr[1]} | tr -d '"') +mongo_db=$(cat .env | grep 'MONGO_DB_NAME') +IFS='=' read -a db_arr <<< $mongo_db +mongo_db=$(echo ${db_arr[1]} | tr -d '"') +sed -i "s;USER_REF;$mongo_user;g" init-mongo.js +sed -i "s;PASS_REF;$mongo_pass;g" init-mongo.js +sed -i "s;DB_REF;$mongo_db;g" init-mongo.js \ No newline at end of file From ce8c5cefe80bf1c405c1679c0d1e579766d6f420 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Sat, 30 Jul 2022 18:06:58 +0200 Subject: [PATCH 06/12] Update docker-set-mongo-init.sh - Added exec bit (chmod +x) --- docker-set-mongo-init.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker-set-mongo-init.sh diff --git a/docker-set-mongo-init.sh b/docker-set-mongo-init.sh old mode 100644 new mode 100755 From 4be9f42ffb587684538ec2ac21e46c9df4b11369 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:04:48 +0200 Subject: [PATCH 07/12] Added Docker Ansible Deploy + Misc Fixes - Added Docker ansible deploy for RHEL and forks - Removed ipam and driver configs from docker deployment - Fixed aMember not being disabled completely when disabled in config - Fixed admin service logging wrong uri --- .gitignore | 7 ++- Ansible.README.md | 40 ++++++++++++ ansible/ansible.cfg | 32 ++++++++++ ansible/inventory-template.yml | 9 +++ ansible/roles/socio-base/.travis.yml | 29 +++++++++ ansible/roles/socio-base/README.md | 38 ++++++++++++ ansible/roles/socio-base/defaults/main.yml | 2 + .../socio-base/files/build_copy-source.sh | 20 ++++++ .../socio-base/files/build_remove-source.sh | 2 + ansible/roles/socio-base/handlers/main.yml | 2 + ansible/roles/socio-base/meta/main.yml | 19 ++++++ ansible/roles/socio-base/tasks/deploy.yml | 33 ++++++++++ ansible/roles/socio-base/tasks/main.yml | 3 + ansible/roles/socio-base/tests/inventory | 2 + ansible/roles/socio-base/tests/test.yml | 5 ++ ansible/roles/socio-base/vars/main.yml | 2 + ansible/roles/socio-docker/.travis.yml | 29 +++++++++ ansible/roles/socio-docker/README.md | 38 ++++++++++++ ansible/roles/socio-docker/defaults/main.yml | 2 + .../files/yum.repos.d/docker-ce-centos.repo | 62 +++++++++++++++++++ ansible/roles/socio-docker/handlers/main.yml | 2 + ansible/roles/socio-docker/meta/main.yml | 19 ++++++ ansible/roles/socio-docker/tasks/docker.yml | 43 +++++++++++++ ansible/roles/socio-docker/tasks/main.yml | 3 + ansible/roles/socio-docker/tests/inventory | 2 + ansible/roles/socio-docker/tests/test.yml | 5 ++ ansible/roles/socio-docker/vars/main.yml | 2 + ansible/roles/socio-env/.travis.yml | 29 +++++++++ ansible/roles/socio-env/README.md | 38 ++++++++++++ ansible/roles/socio-env/defaults/main.yml | 2 + ansible/roles/socio-env/files/mongo-init.sh | 2 + ansible/roles/socio-env/handlers/main.yml | 2 + ansible/roles/socio-env/meta/main.yml | 19 ++++++ ansible/roles/socio-env/tasks/env.yml | 45 ++++++++++++++ ansible/roles/socio-env/tasks/main.yml | 3 + ansible/roles/socio-env/tests/inventory | 2 + ansible/roles/socio-env/tests/test.yml | 5 ++ ansible/roles/socio-env/vars/main.yml | 2 + ansible/socioboard-deploy.yml | 12 ++++ ansible/vars/config-template.yml | 15 +++++ docker/docker-compose.yaml | 17 ++--- socioboard-api/Admin/admin.server.js | 2 +- .../social-callback.service.js | 16 ++--- 43 files changed, 640 insertions(+), 23 deletions(-) create mode 100644 Ansible.README.md create mode 100755 ansible/ansible.cfg create mode 100755 ansible/inventory-template.yml create mode 100644 ansible/roles/socio-base/.travis.yml create mode 100644 ansible/roles/socio-base/README.md create mode 100644 ansible/roles/socio-base/defaults/main.yml create mode 100644 ansible/roles/socio-base/files/build_copy-source.sh create mode 100644 ansible/roles/socio-base/files/build_remove-source.sh create mode 100644 ansible/roles/socio-base/handlers/main.yml create mode 100644 ansible/roles/socio-base/meta/main.yml create mode 100644 ansible/roles/socio-base/tasks/deploy.yml create mode 100644 ansible/roles/socio-base/tasks/main.yml create mode 100644 ansible/roles/socio-base/tests/inventory create mode 100644 ansible/roles/socio-base/tests/test.yml create mode 100644 ansible/roles/socio-base/vars/main.yml create mode 100644 ansible/roles/socio-docker/.travis.yml create mode 100644 ansible/roles/socio-docker/README.md create mode 100644 ansible/roles/socio-docker/defaults/main.yml create mode 100644 ansible/roles/socio-docker/files/yum.repos.d/docker-ce-centos.repo create mode 100644 ansible/roles/socio-docker/handlers/main.yml create mode 100644 ansible/roles/socio-docker/meta/main.yml create mode 100644 ansible/roles/socio-docker/tasks/docker.yml create mode 100644 ansible/roles/socio-docker/tasks/main.yml create mode 100644 ansible/roles/socio-docker/tests/inventory create mode 100644 ansible/roles/socio-docker/tests/test.yml create mode 100644 ansible/roles/socio-docker/vars/main.yml create mode 100644 ansible/roles/socio-env/.travis.yml create mode 100644 ansible/roles/socio-env/README.md create mode 100644 ansible/roles/socio-env/defaults/main.yml create mode 100644 ansible/roles/socio-env/files/mongo-init.sh create mode 100644 ansible/roles/socio-env/handlers/main.yml create mode 100644 ansible/roles/socio-env/meta/main.yml create mode 100644 ansible/roles/socio-env/tasks/env.yml create mode 100644 ansible/roles/socio-env/tasks/main.yml create mode 100644 ansible/roles/socio-env/tests/inventory create mode 100644 ansible/roles/socio-env/tests/test.yml create mode 100644 ansible/roles/socio-env/vars/main.yml create mode 100755 ansible/socioboard-deploy.yml create mode 100644 ansible/vars/config-template.yml diff --git a/.gitignore b/.gitignore index 92b5fe90..ac041952 100644 --- a/.gitignore +++ b/.gitignore @@ -100,10 +100,15 @@ Thumbs.db socioboard-api/Notification/package-lock.json -# Ignoring Docker development files +# Docker development files docker/.env docker/data docker/init-mongo.js docker-dev-build.sh docker/nginx/ssl/cert.pem docker/nginx/ssl/key.pem + +# Ansible development files +ansible/inventory.yml +ansible/roles/socio-env/files/docker.env +ansible/vars/config.yml diff --git a/Ansible.README.md b/Ansible.README.md new file mode 100644 index 00000000..3f346666 --- /dev/null +++ b/Ansible.README.md @@ -0,0 +1,40 @@ +# SocioBoard Docker Ansible Deploy +Automated setup of SocioBoard Docker using Ansible. + +NOTE: +- The ansible roles here will perform the basic setup for you. There are no uninstall roles yet, the roles are very basic and will be added to in time. +- Currently only amd64 is supported. The base container is alpine which can be built for arm. However npm will throw errors and although I may in the future, I have not looked into the issue further. +- Set the location of the ssh key which has access to your destination server in `ansible/ansible.cfg` + +## Supported Operating Systems +The ansible roles were designed to install socioboard on the following operating systems: +- RedHat Enterprise Linux(RHEL) +- RHEL Forks(Alma, Rocky) + +Support for other systems will be added at a later stage. + +## Preparing for Installation +Copy the inventory template and make changes: +```bash +cp ansible/inventory-template.yml ansible/inventory.yml +vi ansible/inventory.yml +``` + +Copy the config template and make changes: +```bash +cp ansible/vars/config-template.yml ansible/vars/config.yml +vi ansible/vars/config.yml +``` + +Copy the Docker .env template and make changes: +```bash +cp docker/.env.example ansible/roles/socio-env/files/docker.env +vi ansible/roles/socio-env/files/docker.env +``` + +## Installing +Run the playbook to deploy +```bash +cd ansible +ansible-playbook -b -K socioboard-deploy.yml +``` diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg new file mode 100755 index 00000000..f3ff035b --- /dev/null +++ b/ansible/ansible.cfg @@ -0,0 +1,32 @@ +[defaults] +inventory = inventory.yml +private_key_file = ~/.ssh/id_rsa +stdout_callback = yaml +bin_ansible_callbacks = True +timeout = 30 +nocows = True +interpreter_python = /usr/bin/python3 +forks = 2 +strategy = free + +[ssh_connection] +pipelining = True +control_path = /tmp/ansible-ssh-%%h-%%p-%%r + +[colors] +highlight = white +verbose = blue +warn = bright purple +error = red +debug = bright gray +deprecate = purple +skip = cyan +unreachable = red +ok = green +changed = yellow +diff_add = green +diff_remove = red +diff_lines = cyan + +[diff] +always = True diff --git a/ansible/inventory-template.yml b/ansible/inventory-template.yml new file mode 100755 index 00000000..b1cb0aa8 --- /dev/null +++ b/ansible/inventory-template.yml @@ -0,0 +1,9 @@ +# Sample inventory.yml, copy to 'inventory.yml' before making changes +# Add host IP and SSH user +# The ansible machine needs to have SSH access to the specified host. +all: + hosts: + socioboard: + ansible_host: < host_ip_address > + ansible_user: < host_ssh_user > + ansible_python_interpreter: /usr/bin/python3 diff --git a/ansible/roles/socio-base/.travis.yml b/ansible/roles/socio-base/.travis.yml new file mode 100644 index 00000000..36bbf620 --- /dev/null +++ b/ansible/roles/socio-base/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/roles/socio-base/README.md b/ansible/roles/socio-base/README.md new file mode 100644 index 00000000..225dd44b --- /dev/null +++ b/ansible/roles/socio-base/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/ansible/roles/socio-base/defaults/main.yml b/ansible/roles/socio-base/defaults/main.yml new file mode 100644 index 00000000..292e9ae9 --- /dev/null +++ b/ansible/roles/socio-base/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for socio-base diff --git a/ansible/roles/socio-base/files/build_copy-source.sh b/ansible/roles/socio-base/files/build_copy-source.sh new file mode 100644 index 00000000..8b7aacf1 --- /dev/null +++ b/ansible/roles/socio-base/files/build_copy-source.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# make temporary copy of source code +cp -r ./socioboard-api ./docker/socioboard/ +cp -r ./socioboard-web-php ./docker/socioboard/ +cd docker + +# set mongodb init details +cp ./init-mongo-template.js ./init-mongo.js +mongo_user=$(cat .env | grep 'MONGO_USER') +IFS='=' read -a user_arr <<< $mongo_user +mongo_user=$(echo ${user_arr[1]} | tr -d '"') +mongo_pass=$(cat .env | grep 'MONGO_PASS') +IFS='=' read -a pass_arr <<< $mongo_pass +mongo_pass=$(echo ${pass_arr[1]} | tr -d '"') +mongo_db=$(cat .env | grep 'MONGO_DB_NAME') +IFS='=' read -a db_arr <<< $mongo_db +mongo_db=$(echo ${db_arr[1]} | tr -d '"') +sed -i "s;USER_REF;$mongo_user;g" init-mongo.js +sed -i "s;PASS_REF;$mongo_pass;g" init-mongo.js +sed -i "s;DB_REF;$mongo_db;g" init-mongo.js \ No newline at end of file diff --git a/ansible/roles/socio-base/files/build_remove-source.sh b/ansible/roles/socio-base/files/build_remove-source.sh new file mode 100644 index 00000000..883ac6ff --- /dev/null +++ b/ansible/roles/socio-base/files/build_remove-source.sh @@ -0,0 +1,2 @@ +#!/bin/bash +rm -rf ./socioboard/socioboard-api ./socioboard/socioboard-web-php \ No newline at end of file diff --git a/ansible/roles/socio-base/handlers/main.yml b/ansible/roles/socio-base/handlers/main.yml new file mode 100644 index 00000000..f5580b0e --- /dev/null +++ b/ansible/roles/socio-base/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for socio-base diff --git a/ansible/roles/socio-base/meta/main.yml b/ansible/roles/socio-base/meta/main.yml new file mode 100644 index 00000000..3d5edd4c --- /dev/null +++ b/ansible/roles/socio-base/meta/main.yml @@ -0,0 +1,19 @@ +galaxy_info: + author: vaughngx4 (vaughng@pm.me) + description: SocioBoard full application deployment (basic) + company: SiNtelli Technologies (Pty) Ltd + + license: GPL-3.0-only + + min_ansible_version: 2.1 + +# platforms: +# - name: RHEL +# versions: +# - all + + galaxy_tags: + - setup-all + - setup + +dependencies: [] diff --git a/ansible/roles/socio-base/tasks/deploy.yml b/ansible/roles/socio-base/tasks/deploy.yml new file mode 100644 index 00000000..4359d14e --- /dev/null +++ b/ansible/roles/socio-base/tasks/deploy.yml @@ -0,0 +1,33 @@ +--- + +- name: Make temporary copy of source + ansible.builtin.script: + cmd: files/build_copy-source.sh + chdir: "{{ socioboard_base_data_path }}" + +- name: Ensure SocioBoard Docker image is built + community.docker.docker_image: + name: socioboard/socioboard + tag: latest + source: build + build: + path: "{{ socioboard_base_data_path }}/docker/socioboard" + pull: no + platform: "{{ socioboard_architecture }}" + state: present + +- name: Delete temporary copy of source code + ansible.builtin.script: + cmd: files/build_remove-source.sh + chdir: "{{ socioboard_base_data_path }}/docker" + +- name: Ensure Docker network is created + community.docker.docker_network: + name: scb-net + state: present + +- name: Ensure SocioBoard is deployed + community.docker.docker_compose: + project_src: "{{ socioboard_base_data_path }}/docker" + files: + - docker-compose.yaml \ No newline at end of file diff --git a/ansible/roles/socio-base/tasks/main.yml b/ansible/roles/socio-base/tasks/main.yml new file mode 100644 index 00000000..73fe07e3 --- /dev/null +++ b/ansible/roles/socio-base/tasks/main.yml @@ -0,0 +1,3 @@ +--- +# tasks file for socio-base +- import_tasks: deploy.yml \ No newline at end of file diff --git a/ansible/roles/socio-base/tests/inventory b/ansible/roles/socio-base/tests/inventory new file mode 100644 index 00000000..878877b0 --- /dev/null +++ b/ansible/roles/socio-base/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/ansible/roles/socio-base/tests/test.yml b/ansible/roles/socio-base/tests/test.yml new file mode 100644 index 00000000..4c1323a1 --- /dev/null +++ b/ansible/roles/socio-base/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - socio-base diff --git a/ansible/roles/socio-base/vars/main.yml b/ansible/roles/socio-base/vars/main.yml new file mode 100644 index 00000000..bf41b569 --- /dev/null +++ b/ansible/roles/socio-base/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for socio-base diff --git a/ansible/roles/socio-docker/.travis.yml b/ansible/roles/socio-docker/.travis.yml new file mode 100644 index 00000000..36bbf620 --- /dev/null +++ b/ansible/roles/socio-docker/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/roles/socio-docker/README.md b/ansible/roles/socio-docker/README.md new file mode 100644 index 00000000..225dd44b --- /dev/null +++ b/ansible/roles/socio-docker/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/ansible/roles/socio-docker/defaults/main.yml b/ansible/roles/socio-docker/defaults/main.yml new file mode 100644 index 00000000..2ed289db --- /dev/null +++ b/ansible/roles/socio-docker/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for socio-docker diff --git a/ansible/roles/socio-docker/files/yum.repos.d/docker-ce-centos.repo b/ansible/roles/socio-docker/files/yum.repos.d/docker-ce-centos.repo new file mode 100644 index 00000000..1abdbe36 --- /dev/null +++ b/ansible/roles/socio-docker/files/yum.repos.d/docker-ce-centos.repo @@ -0,0 +1,62 @@ +[docker-ce-stable] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-stable-debuginfo] +name=Docker CE Stable - Debuginfo $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/debug-$basearch/stable +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-stable-source] +name=Docker CE Stable - Sources +baseurl=https://download.docker.com/linux/centos/$releasever/source/stable +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-test] +name=Docker CE Test - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-test-debuginfo] +name=Docker CE Test - Debuginfo $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/debug-$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-test-source] +name=Docker CE Test - Sources +baseurl=https://download.docker.com/linux/centos/$releasever/source/test +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-nightly] +name=Docker CE Nightly - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/nightly +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-nightly-debuginfo] +name=Docker CE Nightly - Debuginfo $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/debug-$basearch/nightly +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-nightly-source] +name=Docker CE Nightly - Sources +baseurl=https://download.docker.com/linux/centos/$releasever/source/nightly +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg diff --git a/ansible/roles/socio-docker/handlers/main.yml b/ansible/roles/socio-docker/handlers/main.yml new file mode 100644 index 00000000..0e09ea34 --- /dev/null +++ b/ansible/roles/socio-docker/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for socio-docker diff --git a/ansible/roles/socio-docker/meta/main.yml b/ansible/roles/socio-docker/meta/main.yml new file mode 100644 index 00000000..03a0fa55 --- /dev/null +++ b/ansible/roles/socio-docker/meta/main.yml @@ -0,0 +1,19 @@ +galaxy_info: + author: vaughngx4 (vaughng@pm.me) + description: Ansible Docker deployment. Installs and enables Docker and dependencies required for ansible-docker. + company: SiNtelli Technologies (Pty) Ltd + + license: GPL-3.0-only + + min_ansible_version: 2.1 + +# platforms: +# - name: RHEL +# versions: +# - all + + galaxy_tags: + - setup-all + - root + +dependencies: [] diff --git a/ansible/roles/socio-docker/tasks/docker.yml b/ansible/roles/socio-docker/tasks/docker.yml new file mode 100644 index 00000000..cb08a976 --- /dev/null +++ b/ansible/roles/socio-docker/tasks/docker.yml @@ -0,0 +1,43 @@ +--- + +- name: Ensure Docker repository is enabled + ansible.builtin.template: + src: "{{ role_path }}/files/yum.repos.d/docker-ce-centos.repo" + dest: "/etc/yum.repos.d/docker-ce.repo" + owner: "{{ socioboard_user_username }}" + group: "{{ socioboard_user_groupname }}" + mode: 0644 + +- name: Ensure Docker's RPM key is trusted + ansible.builtin.rpm_key: + state: present + key: https://download.docker.com/linux/centos/gpg + +#- name: Ensure EPEL is installed +# ansible.builtin.yum: +# name: +# - epel-release +# state: present +# update_cache: true + +- name: Ensure Docker is installed + ansible.builtin.yum: + name: + - docker-ce + - docker-ce-cli + - python3-pip + state: present + +- name: Ensure Docker & Docker Compose API's are installed + pip: + name: + - docker + - docker-compose + state: latest + executable: pip3 + extra_args: --no-cache-dir + +- name: Ensure Docker is running + ansible.builtin.service: + name: docker + state: started diff --git a/ansible/roles/socio-docker/tasks/main.yml b/ansible/roles/socio-docker/tasks/main.yml new file mode 100644 index 00000000..2d22020a --- /dev/null +++ b/ansible/roles/socio-docker/tasks/main.yml @@ -0,0 +1,3 @@ +--- +# tasks file for socio-docker +- import_tasks: docker.yml diff --git a/ansible/roles/socio-docker/tests/inventory b/ansible/roles/socio-docker/tests/inventory new file mode 100644 index 00000000..878877b0 --- /dev/null +++ b/ansible/roles/socio-docker/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/ansible/roles/socio-docker/tests/test.yml b/ansible/roles/socio-docker/tests/test.yml new file mode 100644 index 00000000..2d69dc59 --- /dev/null +++ b/ansible/roles/socio-docker/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - socio-docker diff --git a/ansible/roles/socio-docker/vars/main.yml b/ansible/roles/socio-docker/vars/main.yml new file mode 100644 index 00000000..4ee417cf --- /dev/null +++ b/ansible/roles/socio-docker/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for socio-docker diff --git a/ansible/roles/socio-env/.travis.yml b/ansible/roles/socio-env/.travis.yml new file mode 100644 index 00000000..36bbf620 --- /dev/null +++ b/ansible/roles/socio-env/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/roles/socio-env/README.md b/ansible/roles/socio-env/README.md new file mode 100644 index 00000000..225dd44b --- /dev/null +++ b/ansible/roles/socio-env/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/ansible/roles/socio-env/defaults/main.yml b/ansible/roles/socio-env/defaults/main.yml new file mode 100644 index 00000000..3b72fa2e --- /dev/null +++ b/ansible/roles/socio-env/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for socio-env diff --git a/ansible/roles/socio-env/files/mongo-init.sh b/ansible/roles/socio-env/files/mongo-init.sh new file mode 100644 index 00000000..1872a4a6 --- /dev/null +++ b/ansible/roles/socio-env/files/mongo-init.sh @@ -0,0 +1,2 @@ +#!/bin/bash +./docker-set-mongo-init.sh \ No newline at end of file diff --git a/ansible/roles/socio-env/handlers/main.yml b/ansible/roles/socio-env/handlers/main.yml new file mode 100644 index 00000000..a6cdec0c --- /dev/null +++ b/ansible/roles/socio-env/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for socio-env diff --git a/ansible/roles/socio-env/meta/main.yml b/ansible/roles/socio-env/meta/main.yml new file mode 100644 index 00000000..3d5edd4c --- /dev/null +++ b/ansible/roles/socio-env/meta/main.yml @@ -0,0 +1,19 @@ +galaxy_info: + author: vaughngx4 (vaughng@pm.me) + description: SocioBoard full application deployment (basic) + company: SiNtelli Technologies (Pty) Ltd + + license: GPL-3.0-only + + min_ansible_version: 2.1 + +# platforms: +# - name: RHEL +# versions: +# - all + + galaxy_tags: + - setup-all + - setup + +dependencies: [] diff --git a/ansible/roles/socio-env/tasks/env.yml b/ansible/roles/socio-env/tasks/env.yml new file mode 100644 index 00000000..9f2ab876 --- /dev/null +++ b/ansible/roles/socio-env/tasks/env.yml @@ -0,0 +1,45 @@ +--- + +- name: Ensure GIT is installed + ansible.builtin.yum: + name: + - git + state: present + update_cache: true + +- name: Ensure socioboard group is created + ansible.builtin.group: + name: "{{ socioboard_user_groupname }}" + gid: "{{ socioboard_user_gid }}" + state: present + +- name: Ensure socioboard user is created + ansible.builtin.user: + name: "{{ socioboard_user_username }}" + shell: /bin/bash + groups: "{{ socioboard_user_groupname }}" + +- name: Ensure folders are created + ansible.builtin.file: + path: "{{ socioboard_base_data_path }}" + state: directory + owner: "{{ socioboard_user_username }}" + group: "{{ socioboard_user_groupname }}" + +- name: Ensure we have a local copy of source code + ansible.builtin.git: + repo: "{{ socioboard_git_repo }}" + dest: "{{ socioboard_base_data_path }}" + ignore_errors: true + +- name: Ensure Docker .env is installed + ansible.builtin.copy: + src: files/docker.env + dest: "{{ socioboard_base_data_path }}/docker/.env" + owner: "{{ socioboard_user_username }}" + group: "{{ socioboard_user_groupname }}" + +- name: Create mongo init script + ansible.builtin.script: + cmd: files/mongo-init.sh + chdir: "{{ socioboard_base_data_path }}" diff --git a/ansible/roles/socio-env/tasks/main.yml b/ansible/roles/socio-env/tasks/main.yml new file mode 100644 index 00000000..e423eeb3 --- /dev/null +++ b/ansible/roles/socio-env/tasks/main.yml @@ -0,0 +1,3 @@ +--- +# tasks file for socio-env +- import_tasks: env.yml diff --git a/ansible/roles/socio-env/tests/inventory b/ansible/roles/socio-env/tests/inventory new file mode 100644 index 00000000..878877b0 --- /dev/null +++ b/ansible/roles/socio-env/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/ansible/roles/socio-env/tests/test.yml b/ansible/roles/socio-env/tests/test.yml new file mode 100644 index 00000000..cd18ec66 --- /dev/null +++ b/ansible/roles/socio-env/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - socio-env diff --git a/ansible/roles/socio-env/vars/main.yml b/ansible/roles/socio-env/vars/main.yml new file mode 100644 index 00000000..541b2301 --- /dev/null +++ b/ansible/roles/socio-env/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for socio-env diff --git a/ansible/socioboard-deploy.yml b/ansible/socioboard-deploy.yml new file mode 100755 index 00000000..2dd223c1 --- /dev/null +++ b/ansible/socioboard-deploy.yml @@ -0,0 +1,12 @@ + #SocioBoard Docker Ansible Deploy +- name: SocioBoard Docker Ansible Deploy + hosts: + - socioboard + become: true + become_user: root + vars_files: + - vars/config.yml + roles: + - socio-env + - socio-docker + - socio-base diff --git a/ansible/vars/config-template.yml b/ansible/vars/config-template.yml new file mode 100644 index 00000000..ff7d2464 --- /dev/null +++ b/ansible/vars/config-template.yml @@ -0,0 +1,15 @@ +--- + +# SocioBoard GIT repo +socioboard_git_repo: 'https://github.com/vaughngx4/Socioboard-5.0.git' + +# Architecture the Docker image should be built for +socioboard_architecture: "amd64" + +# Base path for Docker files and data +socioboard_base_data_path: "/deployments/socioboard" + +# SocioBoard username and group(will be created if they don't already exist) +socioboard_user_username: "socioboard" +socioboard_user_groupname: "socioboard" +socioboard_user_gid: 2122 \ No newline at end of file diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 54f2435c..8f0ce303 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -77,8 +77,7 @@ services: - no-new-privileges:true restart: always networks: - scb-net: - ipv4_address: 172.16.32.2 + - scb-net socioboard-mysql: image: library/mysql:latest container_name: socioboard-mysql @@ -92,8 +91,7 @@ services: - scb-mysql:/var/lib/mysql - ./perma-act-users.sql:/perma-act-users.sql networks: - scb-net: - ipv4_address: 172.16.32.3 + - scb-net socioboard-mongo: image: mongo:latest container_name: socioboard-mongo @@ -106,8 +104,7 @@ services: - scb-mongo:/data/db restart: always networks: - scb-net: - ipv4_address: 172.16.32.4 + - scb-net socioboard-nginx: image: nginx:latest container_name: socioboard-nginx @@ -128,16 +125,10 @@ services: - ./nginx/ssl:/ssl restart: always networks: - scb-net: - ipv4_address: 172.16.32.5 + - scb-net volumes: scb-mongo: {} scb-mysql: {} networks: scb-net: external: true - driver: bridge - ipam: - config: - - subnet: 172.16.32.0/16 - gateway: 172.16.32.1 diff --git a/socioboard-api/Admin/admin.server.js b/socioboard-api/Admin/admin.server.js index a1da46bd..75e14fa1 100644 --- a/socioboard-api/Admin/admin.server.js +++ b/socioboard-api/Admin/admin.server.js @@ -37,5 +37,5 @@ const router = AdminBroExpress.buildAuthenticatedRouter(adminBro, { if( config.get('enabled') === "true" ){ app.use(adminBro.options.rootPath, router); - app.listen(8080, () => console.log(`admin panel listening on http://${config.get('environment.domain')}:8080/admin with ${process.env.NODE_ENV} Environment!`) ); + app.listen(8080, () => console.log(`admin panel listening on http://${config.get('environment.domain')}/admin with ${process.env.NODE_ENV} Environment!`) ); }else{ console.log('admin panel disabled.') } \ No newline at end of file diff --git a/socioboard-api/User/core/social-callback/social-callback.service.js b/socioboard-api/User/core/social-callback/social-callback.service.js index 5df4ab7c..2d480211 100644 --- a/socioboard-api/User/core/social-callback/social-callback.service.js +++ b/socioboard-api/User/core/social-callback/social-callback.service.js @@ -57,7 +57,7 @@ class SocialCallbackService { ); if (is_user_register) { - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // Call aMember to set new details of plan and expiry date // userId, userName & password await new aMember(config.get('aMember')).getUserPlanDetail( @@ -85,7 +85,7 @@ class SocialCallbackService { userDetails.userInfo.user.user_id ); - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // To Store the user Details in aMember await this.registerSocialUserToAmember(userDetails); } @@ -151,7 +151,7 @@ class SocialCallbackService { ); if (is_user_register) { - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // Call aMember to set new details of plan and expiry date // userId, userName & password await new aMember(config.get('aMember')).getUserPlanDetail( @@ -171,7 +171,7 @@ class SocialCallbackService { } } const userDetails = await unauthorizedLibs.registerSocialUser(parseData); - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // To Store the user Details in aMember await this.registerSocialUserToAmember(userDetails); } @@ -217,7 +217,7 @@ class SocialCallbackService { ); if (is_user_register) { - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // Call aMember to set new details of plan and expiry date // userId, userName & password await new aMember(config.get('aMember')).getUserPlanDetail( @@ -237,7 +237,7 @@ class SocialCallbackService { } } const userDetails = await unauthorizedLibs.registerSocialUser(data); - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // To Store the user Details in aMember await this.registerSocialUserToAmember(userDetails); } @@ -283,7 +283,7 @@ class SocialCallbackService { ); if (is_user_register) { - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // Call aMember to set new details of plan and expiry date // userId, userName & password await new aMember(config.get('aMember')).getUserPlanDetail( @@ -306,7 +306,7 @@ class SocialCallbackService { const userDetails = await unauthorizedLibs.registerSocialUser( twitterdata ); - if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' ) { + if (process.env.NODE_ENV === 'production'|| process.env.NODE_ENV === 'development' && config.get('aMember_enabled') === 'true' ) { // To Store the user Details in aMember this.registerSocialUserToAmember(userDetails); } From 92721a532f41116f18ac6a77d80c0d2066c4369d Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Wed, 3 Aug 2022 10:28:26 +0200 Subject: [PATCH 08/12] Docker Ansible Deploy Updates - Added ansible support for debian (untested) - Added ansible tags to perform basic tasks - Added ansible removal tasks --- Ansible.README.md | 38 ++++++++++++--- ansible/roles/socio-base/meta/main.yml | 4 +- ansible/roles/socio-base/tasks/deploy.yml | 19 +++++++- ansible/roles/socio-base/tasks/main.yml | 1 + ansible/roles/socio-base/tasks/remove.yml | 48 +++++++++++++++++++ ansible/roles/socio-docker/meta/main.yml | 4 +- ansible/roles/socio-docker/tasks/debian.yml | 47 ++++++++++++++++++ ansible/roles/socio-docker/tasks/main.yml | 10 +++- .../tasks/{docker.yml => redhat.yml} | 18 +++---- ansible/roles/socio-env/meta/main.yml | 4 +- ansible/roles/socio-env/tasks/env.yml | 24 +++++++--- 11 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 ansible/roles/socio-base/tasks/remove.yml create mode 100644 ansible/roles/socio-docker/tasks/debian.yml rename ansible/roles/socio-docker/tasks/{docker.yml => redhat.yml} (65%) diff --git a/Ansible.README.md b/Ansible.README.md index 3f346666..0c3f98de 100644 --- a/Ansible.README.md +++ b/Ansible.README.md @@ -2,16 +2,16 @@ Automated setup of SocioBoard Docker using Ansible. NOTE: -- The ansible roles here will perform the basic setup for you. There are no uninstall roles yet, the roles are very basic and will be added to in time. +- The ansible roles here will perform the basic setup, update and uninstall tasks. - Currently only amd64 is supported. The base container is alpine which can be built for arm. However npm will throw errors and although I may in the future, I have not looked into the issue further. - Set the location of the ssh key which has access to your destination server in `ansible/ansible.cfg` ## Supported Operating Systems The ansible roles were designed to install socioboard on the following operating systems: -- RedHat Enterprise Linux(RHEL) -- RHEL Forks(Alma, Rocky) +- RedHat Enterprise Linux(RHEL) & forks(Alma, Rocky) +- Debian & Debian based systems(Debian, Ubuntu etc.) (Untested) -Support for other systems will be added at a later stage. +If you would like support for another OS, let me know and I will try to add it. ## Preparing for Installation Copy the inventory template and make changes: @@ -33,8 +33,34 @@ vi ansible/roles/socio-env/files/docker.env ``` ## Installing -Run the playbook to deploy +Run the playbook with `setup-all` tag to do a full deployment ```bash cd ansible -ansible-playbook -b -K socioboard-deploy.yml +ansible-playbook -b -K socioboard-deploy.yml --tags=setup-all +``` + +Run the playbook with `setup` tag to do a basic deployment(you need to run with `setup-all` at least once, this tag does not build the SocioBoard Docker image. Use this if you want redeploy after using the `remove` tag documented below) +```bash +cd ansible +ansible-playbook -b -K socioboard-deploy.yml --tags=setup +``` + +## Uninstalling +Run the playbook with `remove` tag to remove only the containers and networks(data is not touched) +```bash +cd ansible +ansible-playbook -b -K socioboard-deploy.yml --tags=remove +``` + +Run the playbook with `remove-all` tag to remove everything(including data) +```bash +cd ansible +ansible-playbook -b -K socioboard-deploy.yml --tags=remove-all +``` + +## Updating +Run the playbook with `update` tag to run a full update(data is not touched) +```bash +cd ansible +ansible-playbook -b -K socioboard-deploy.yml --tags=update ``` diff --git a/ansible/roles/socio-base/meta/main.yml b/ansible/roles/socio-base/meta/main.yml index 3d5edd4c..6b87e5e3 100644 --- a/ansible/roles/socio-base/meta/main.yml +++ b/ansible/roles/socio-base/meta/main.yml @@ -12,8 +12,6 @@ galaxy_info: # versions: # - all - galaxy_tags: - - setup-all - - setup + galaxy_tags: [] dependencies: [] diff --git a/ansible/roles/socio-base/tasks/deploy.yml b/ansible/roles/socio-base/tasks/deploy.yml index 4359d14e..da915427 100644 --- a/ansible/roles/socio-base/tasks/deploy.yml +++ b/ansible/roles/socio-base/tasks/deploy.yml @@ -4,6 +4,9 @@ ansible.builtin.script: cmd: files/build_copy-source.sh chdir: "{{ socioboard_base_data_path }}" + tags: + - setup-all + - update - name: Ensure SocioBoard Docker image is built community.docker.docker_image: @@ -15,19 +18,33 @@ pull: no platform: "{{ socioboard_architecture }}" state: present + tags: + - setup-all + - update - name: Delete temporary copy of source code ansible.builtin.script: cmd: files/build_remove-source.sh chdir: "{{ socioboard_base_data_path }}/docker" + tags: + - setup-all + - update - name: Ensure Docker network is created community.docker.docker_network: name: scb-net state: present + tags: + - setup + - setup-all + - update - name: Ensure SocioBoard is deployed community.docker.docker_compose: project_src: "{{ socioboard_base_data_path }}/docker" files: - - docker-compose.yaml \ No newline at end of file + - docker-compose.yaml + tags: + - setup + - setup-all + - update \ No newline at end of file diff --git a/ansible/roles/socio-base/tasks/main.yml b/ansible/roles/socio-base/tasks/main.yml index 73fe07e3..490c3cad 100644 --- a/ansible/roles/socio-base/tasks/main.yml +++ b/ansible/roles/socio-base/tasks/main.yml @@ -1,3 +1,4 @@ --- # tasks file for socio-base +- import_tasks: remove.yml - import_tasks: deploy.yml \ No newline at end of file diff --git a/ansible/roles/socio-base/tasks/remove.yml b/ansible/roles/socio-base/tasks/remove.yml new file mode 100644 index 00000000..4a742ef6 --- /dev/null +++ b/ansible/roles/socio-base/tasks/remove.yml @@ -0,0 +1,48 @@ +--- + +- name: Ensure SocioBoard is down + community.docker.docker_compose: + project_src: "{{ socioboard_base_data_path }}/docker" + files: + - docker-compose.yaml + state: absent + tags: + - remove + - remove-all + - update + +- name: Ensure SocioBoard Docker image is removed + community.docker.docker_image: + name: socioboard/socioboard + tag: latest + state: absent + tags: + - remove-all + - update + +- name: Ensure Docker network is removed + community.docker.docker_network: + name: scb-net + state: absent + tags: + - remove + - remove-all + - update + +- name: Ensure Docker volume (MongoDB) is removed + community.docker.docker_volume: + volume_name: docker_scb-mongo + state: absent + tags: remove-all + +- name: Ensure Docker volume (MySQL) is removed + community.docker.docker_volume: + volume_name: docker_scb-mysql + state: absent + tags: remove-all + +- name: Ensure remaining data is removed + file: + path: "{{ socioboard_base_data_path }}/docker/data" + state: absent + tags: remove-all diff --git a/ansible/roles/socio-docker/meta/main.yml b/ansible/roles/socio-docker/meta/main.yml index 03a0fa55..bfa8d317 100644 --- a/ansible/roles/socio-docker/meta/main.yml +++ b/ansible/roles/socio-docker/meta/main.yml @@ -12,8 +12,6 @@ galaxy_info: # versions: # - all - galaxy_tags: - - setup-all - - root + galaxy_tags: [] dependencies: [] diff --git a/ansible/roles/socio-docker/tasks/debian.yml b/ansible/roles/socio-docker/tasks/debian.yml new file mode 100644 index 00000000..04c470ac --- /dev/null +++ b/ansible/roles/socio-docker/tasks/debian.yml @@ -0,0 +1,47 @@ +--- + +- name: Ensure APT usage dependencies are installed (Debian) + ansible.builtin.apt: + name: + - apt-transport-https + - ca-certificates + - gnupg + state: present + update_cache: true + +- name: Ensure Docker's APT key is trusted (Debian) + ansible.builtin.apt_key: + url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" + id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 + state: present + register: add_repository_key + ignore_errors: true + +- name: Ensure Docker repository is enabled (Debian) + ansible.builtin.apt_repository: + repo: "deb [arch={{ socioboard_architecture }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable" + state: present + update_cache: true + +- name: Ensure Docker is installed (Debian) + ansible.builtin.apt: + name: + - docker-ce + - docker-ce-cli + - python3-pip + - git + state: present + +- name: Ensure Docker & Docker Compose API's are installed (Debian) + pip: + name: + - docker + - docker-compose + state: latest + executable: pip3 + extra_args: --no-cache-dir + +- name: Ensure Docker is running (Debian) + ansible.builtin.service: + name: docker + state: started diff --git a/ansible/roles/socio-docker/tasks/main.yml b/ansible/roles/socio-docker/tasks/main.yml index 2d22020a..07f2a545 100644 --- a/ansible/roles/socio-docker/tasks/main.yml +++ b/ansible/roles/socio-docker/tasks/main.yml @@ -1,3 +1,11 @@ --- # tasks file for socio-docker -- import_tasks: docker.yml +- name: RHEL Docker Setup + import_tasks: redhat.yml + when: ansible_facts['os_family']|lower == 'redhat' + tags: setup-all + +- name: Debian Docker Setup + import_tasks: debian.yml + when: ansible_facts['os_family']|lower == 'debian' + tags: setup-all diff --git a/ansible/roles/socio-docker/tasks/docker.yml b/ansible/roles/socio-docker/tasks/redhat.yml similarity index 65% rename from ansible/roles/socio-docker/tasks/docker.yml rename to ansible/roles/socio-docker/tasks/redhat.yml index cb08a976..686f6c76 100644 --- a/ansible/roles/socio-docker/tasks/docker.yml +++ b/ansible/roles/socio-docker/tasks/redhat.yml @@ -1,6 +1,6 @@ --- -- name: Ensure Docker repository is enabled +- name: Ensure Docker repository is enabled (RHEL) ansible.builtin.template: src: "{{ role_path }}/files/yum.repos.d/docker-ce-centos.repo" dest: "/etc/yum.repos.d/docker-ce.repo" @@ -8,27 +8,21 @@ group: "{{ socioboard_user_groupname }}" mode: 0644 -- name: Ensure Docker's RPM key is trusted +- name: Ensure Docker's RPM key is trusted (RHEL) ansible.builtin.rpm_key: state: present key: https://download.docker.com/linux/centos/gpg -#- name: Ensure EPEL is installed -# ansible.builtin.yum: -# name: -# - epel-release -# state: present -# update_cache: true - -- name: Ensure Docker is installed +- name: Ensure Docker & dependencies are installed (RHEL) ansible.builtin.yum: name: - docker-ce - docker-ce-cli - python3-pip + - git state: present -- name: Ensure Docker & Docker Compose API's are installed +- name: Ensure Docker & Docker Compose API's are installed (RHEL) pip: name: - docker @@ -37,7 +31,7 @@ executable: pip3 extra_args: --no-cache-dir -- name: Ensure Docker is running +- name: Ensure Docker is running (RHEL) ansible.builtin.service: name: docker state: started diff --git a/ansible/roles/socio-env/meta/main.yml b/ansible/roles/socio-env/meta/main.yml index 3d5edd4c..6b87e5e3 100644 --- a/ansible/roles/socio-env/meta/main.yml +++ b/ansible/roles/socio-env/meta/main.yml @@ -12,8 +12,6 @@ galaxy_info: # versions: # - all - galaxy_tags: - - setup-all - - setup + galaxy_tags: [] dependencies: [] diff --git a/ansible/roles/socio-env/tasks/env.yml b/ansible/roles/socio-env/tasks/env.yml index 9f2ab876..6e01297d 100644 --- a/ansible/roles/socio-env/tasks/env.yml +++ b/ansible/roles/socio-env/tasks/env.yml @@ -1,23 +1,18 @@ --- -- name: Ensure GIT is installed - ansible.builtin.yum: - name: - - git - state: present - update_cache: true - - name: Ensure socioboard group is created ansible.builtin.group: name: "{{ socioboard_user_groupname }}" gid: "{{ socioboard_user_gid }}" state: present + tags: setup-all - name: Ensure socioboard user is created ansible.builtin.user: name: "{{ socioboard_user_username }}" shell: /bin/bash groups: "{{ socioboard_user_groupname }}" + tags: setup-all - name: Ensure folders are created ansible.builtin.file: @@ -25,12 +20,19 @@ state: directory owner: "{{ socioboard_user_username }}" group: "{{ socioboard_user_groupname }}" + tags: + - setup + - setup-all - name: Ensure we have a local copy of source code ansible.builtin.git: repo: "{{ socioboard_git_repo }}" dest: "{{ socioboard_base_data_path }}" ignore_errors: true + tags: + - setup + - setup-all + - update - name: Ensure Docker .env is installed ansible.builtin.copy: @@ -38,8 +40,16 @@ dest: "{{ socioboard_base_data_path }}/docker/.env" owner: "{{ socioboard_user_username }}" group: "{{ socioboard_user_groupname }}" + tags: + - setup + - setup-all + - update - name: Create mongo init script ansible.builtin.script: cmd: files/mongo-init.sh chdir: "{{ socioboard_base_data_path }}" + tags: + - setup + - setup-all + - update From 4b0c94c025cd5bae8960a26e62d07398252cdb43 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Sun, 7 Aug 2022 22:48:19 +0200 Subject: [PATCH 09/12] Moved Docker to Production Env + Docker Hub Images - Moved Docker setup to production environment - Changed to use images from Docker Hub by default --- Ansible.README.md | 10 +- Docker.README.md | 21 +- .../socio-base/files/build_copy-source.sh | 18 +- .../socio-base/files/build_remove-source.sh | 2 +- ansible/roles/socio-base/tasks/deploy.yml | 43 +- ansible/roles/socio-base/tasks/remove.yml | 18 - ansible/roles/socio-env/tasks/env.yml | 2 +- docker-build.sh | 25 +- docker/docker-compose.yaml | 17 +- docker/nginx/nginx-socioboard.conf | 2 +- docker/socioboard-web/Dockerfile | 36 + docker/socioboard-web/entrypoint.sh | 38 + docker/socioboard-web/init.sh | 32 + .../socioboard-web/nginx-socioboard-web.conf | 54 + docker/socioboard-web/nginx.conf | 34 + docker/socioboard-web/php.ini | 1965 +++++++++++++++++ docker/socioboard/Dockerfile | 24 +- docker/socioboard/entrypoint.sh | 7 - docker/socioboard/init.sh | 33 +- 19 files changed, 2264 insertions(+), 117 deletions(-) create mode 100644 docker/socioboard-web/Dockerfile create mode 100755 docker/socioboard-web/entrypoint.sh create mode 100755 docker/socioboard-web/init.sh create mode 100644 docker/socioboard-web/nginx-socioboard-web.conf create mode 100644 docker/socioboard-web/nginx.conf create mode 100644 docker/socioboard-web/php.ini diff --git a/Ansible.README.md b/Ansible.README.md index 0c3f98de..389dd05a 100644 --- a/Ansible.README.md +++ b/Ansible.README.md @@ -39,11 +39,19 @@ cd ansible ansible-playbook -b -K socioboard-deploy.yml --tags=setup-all ``` -Run the playbook with `setup` tag to do a basic deployment(you need to run with `setup-all` at least once, this tag does not build the SocioBoard Docker image. Use this if you want redeploy after using the `remove` tag documented below) +Run the playbook with `setup` tag to do a basic deployment: ```bash cd ansible ansible-playbook -b -K socioboard-deploy.yml --tags=setup ``` +WARNING: You need to run with `setup-all` at least once, this tag does not build or pull the SocioBoard Docker images! Use this if you want redeploy after using the `remove` tag documented below. + +You can build and setup the Docker images yourself using: +```bash +cd ansible +ansible-playbook -b -K socioboard-deploy.yml --tags=build,setup +``` +We don't use the `setup-all` tag when building as this will force pull the images from Docker Hub. WARNING: You need to run with `setup-all` at least once, this tag does not install dependancies! ## Uninstalling Run the playbook with `remove` tag to remove only the containers and networks(data is not touched) diff --git a/Docker.README.md b/Docker.README.md index a30e5b42..23293608 100644 --- a/Docker.README.md +++ b/Docker.README.md @@ -12,13 +12,6 @@ git clone https://github.com/socioboard/Socioboard-5.0.git cd Socioboard-5.0 ``` -Build docker images from source: -```bash -chmod +x docker-build.sh -./docker-build.sh -``` -Building images may take some time depending on your internet speed. Build can fail due to slow connections. - Create .env and change variables(I use vi but use whatever text editor you have): ```bash cp docker/.env.example docker/.env @@ -34,10 +27,15 @@ NOTE 1: Twilio API is required for the user API(registration, login etc.) to wor Twilio `Account SID` and `Auth Key` can be found in the API Keys section. To get a `Service ID` you will need to go the `Twilio Console` click on `Verify`, then `Services` and create a SocioBoard service. -NOTE 2: If you would like to change the subdomains, be sure to change the URL scheme in the `# apply configs to config files` section of `docker/socioboard/init.sh`, in `docker/socioboard/config.sh` and in `docker/nginx/nginx-socioboard.conf`. +NOTE 2: If you would like to change the subdomains, be sure to change the URL scheme in `docker/socioboard/init.sh`, `docker/socioboard/config.sh`, `docker/socioboard-web/init.sh` and in `docker/nginx/nginx-socioboard.conf`. You can also provide your own SSL certificate if necessary(see `docker/nginx/ssl/SSL.README.md`) +Pull Docker images: +```bash +docker-compose -f docker/docker-compose.yaml Pull +``` + Create and start containers: ```bash docker-compose -f docker/docker-compose.yaml up -d @@ -82,6 +80,13 @@ After logging in, click on your database(there should only be 1 database). Scrol Done! You can now log in :) +## Building from source +Build docker images from source: +```bash +./docker-build.sh +``` +Building images may take some time depending on your internet speed. Build can fail due to slow connections. + ## Uninstalling: ### Keeping Data: To bring down containers without affecting data run the following in the source directory: diff --git a/ansible/roles/socio-base/files/build_copy-source.sh b/ansible/roles/socio-base/files/build_copy-source.sh index 8b7aacf1..44fc2dfa 100644 --- a/ansible/roles/socio-base/files/build_copy-source.sh +++ b/ansible/roles/socio-base/files/build_copy-source.sh @@ -1,20 +1,4 @@ #!/bin/bash # make temporary copy of source code cp -r ./socioboard-api ./docker/socioboard/ -cp -r ./socioboard-web-php ./docker/socioboard/ -cd docker - -# set mongodb init details -cp ./init-mongo-template.js ./init-mongo.js -mongo_user=$(cat .env | grep 'MONGO_USER') -IFS='=' read -a user_arr <<< $mongo_user -mongo_user=$(echo ${user_arr[1]} | tr -d '"') -mongo_pass=$(cat .env | grep 'MONGO_PASS') -IFS='=' read -a pass_arr <<< $mongo_pass -mongo_pass=$(echo ${pass_arr[1]} | tr -d '"') -mongo_db=$(cat .env | grep 'MONGO_DB_NAME') -IFS='=' read -a db_arr <<< $mongo_db -mongo_db=$(echo ${db_arr[1]} | tr -d '"') -sed -i "s;USER_REF;$mongo_user;g" init-mongo.js -sed -i "s;PASS_REF;$mongo_pass;g" init-mongo.js -sed -i "s;DB_REF;$mongo_db;g" init-mongo.js \ No newline at end of file +cp -r ./socioboard-web-php ./docker/socioboard-web/ \ No newline at end of file diff --git a/ansible/roles/socio-base/files/build_remove-source.sh b/ansible/roles/socio-base/files/build_remove-source.sh index 883ac6ff..2ce37fa7 100644 --- a/ansible/roles/socio-base/files/build_remove-source.sh +++ b/ansible/roles/socio-base/files/build_remove-source.sh @@ -1,2 +1,2 @@ #!/bin/bash -rm -rf ./socioboard/socioboard-api ./socioboard/socioboard-web-php \ No newline at end of file +rm -rf ./socioboard/socioboard-api ./socioboard-web/socioboard-web-php \ No newline at end of file diff --git a/ansible/roles/socio-base/tasks/deploy.yml b/ansible/roles/socio-base/tasks/deploy.yml index da915427..a7c5945e 100644 --- a/ansible/roles/socio-base/tasks/deploy.yml +++ b/ansible/roles/socio-base/tasks/deploy.yml @@ -5,12 +5,11 @@ cmd: files/build_copy-source.sh chdir: "{{ socioboard_base_data_path }}" tags: - - setup-all - - update + - build -- name: Ensure SocioBoard Docker image is built +- name: Ensure Docker image is built (socioboard) community.docker.docker_image: - name: socioboard/socioboard + name: sintelli/socioboard tag: latest source: build build: @@ -19,23 +18,43 @@ platform: "{{ socioboard_architecture }}" state: present tags: - - setup-all - - update + - build + +- name: Ensure Docker image is built (socioboard-web) + community.docker.docker_image: + name: sintelli/socioboard-web + tag: latest + source: build + build: + path: "{{ socioboard_base_data_path }}/docker/socioboard-web" + pull: no + platform: "{{ socioboard_architecture }}" + state: present + tags: + - build - name: Delete temporary copy of source code ansible.builtin.script: cmd: files/build_remove-source.sh chdir: "{{ socioboard_base_data_path }}/docker" tags: + - build + +- name: Ensure Docker image is present and up-to-date (socioboard) + community.docker.docker_image: + name: sintelli/socioboard + source: pull + force_source: yes + tags: - setup-all - update -- name: Ensure Docker network is created - community.docker.docker_network: - name: scb-net - state: present - tags: - - setup +- name: Ensure Docker image is present and up-to-date (socioboard-web) + community.docker.docker_image: + name: sintelli/socioboard-web + source: pull + force_source: yes + tags: - setup-all - update diff --git a/ansible/roles/socio-base/tasks/remove.yml b/ansible/roles/socio-base/tasks/remove.yml index 4a742ef6..6ff5cfa3 100644 --- a/ansible/roles/socio-base/tasks/remove.yml +++ b/ansible/roles/socio-base/tasks/remove.yml @@ -11,24 +11,6 @@ - remove-all - update -- name: Ensure SocioBoard Docker image is removed - community.docker.docker_image: - name: socioboard/socioboard - tag: latest - state: absent - tags: - - remove-all - - update - -- name: Ensure Docker network is removed - community.docker.docker_network: - name: scb-net - state: absent - tags: - - remove - - remove-all - - update - - name: Ensure Docker volume (MongoDB) is removed community.docker.docker_volume: volume_name: docker_scb-mongo diff --git a/ansible/roles/socio-env/tasks/env.yml b/ansible/roles/socio-env/tasks/env.yml index 6e01297d..44d6a820 100644 --- a/ansible/roles/socio-env/tasks/env.yml +++ b/ansible/roles/socio-env/tasks/env.yml @@ -24,7 +24,7 @@ - setup - setup-all -- name: Ensure we have a local copy of source code +- name: Ensure we have a local copy of source code and configs ansible.builtin.git: repo: "{{ socioboard_git_repo }}" dest: "{{ socioboard_base_data_path }}" diff --git a/docker-build.sh b/docker-build.sh index b9722690..08de74f1 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1,23 +1,24 @@ #!/bin/bash # make temporary copy of source code cp -r ./socioboard-api ./docker/socioboard/ -cp -r ./socioboard-web-php ./docker/socioboard/ +cp -r ./socioboard-web-php ./docker/socioboard-web/ cd docker -# pull cached image -#docker pull localhost:5051/socioboard/socioboard:latest +# pull cached images +#docker pull localhost:5051/sintelli/socioboard:latest +#docker pull localhost:5051/sintelli/socioboard-web:latest # build without caching -docker build -t socioboard/socioboard ./socioboard +docker build -t sintelli/socioboard ./socioboard +docker build -t sintelli/socioboard-web ./socioboard-web # build with caching -#docker build --cache-from localhost:5051/socioboard/socioboard:latest -t socioboard/socioboard ./socioboard -#docker rmi localhost:5051/socioboard/socioboard -#docker tag socioboard/socioboard:latest localhost:5051/socioboard/socioboard:latest -#docker push localhost:5051/socioboard/socioboard:latest - -# create docker network -docker network create --subnet=172.16.32.0/16 --gateway=172.16.32.1 scb-net +#docker build --cache-from localhost:5051/sintelli/socioboard:latest -t sintelli/socioboard ./socioboard +#docker build --cache-from localhost:5051/sintelli/socioboard-web:latest -t sintelli/socioboard-web ./socioboard-web +#docker tag sintelli/socioboard:latest localhost:5051/sintelli/socioboard:latest +#docker tag sintelli/socioboard-web:latest localhost:5051/sintelli/socioboard-web:latest +#docker push localhost:5051/sintelli/socioboard:latest +#docker push localhost:5051/sintelli/socioboard-web:latest # remove temporary copy of source code -rm -rf ./socioboard/socioboard-api ./socioboard/socioboard-web-php \ No newline at end of file +rm -rf ./socioboard/socioboard-api ./socioboard-web/socioboard-web-php \ No newline at end of file diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 8f0ce303..95e8a95a 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.7' services: socioboard: - image: socioboard/socioboard:latest + image: sintelli/socioboard:latest container_name: socioboard depends_on: - socioboard-mysql @@ -70,6 +70,7 @@ services: SESSION_NAME: ${API_SESSION_NAME} SESSION_KEY_1: ${API_SESSION_KEY_1} SESSION_KEY_2: ${API_SESSION_KEY_2} + NODE_ENV: "production" volumes: - ./data/api:/data - ./nginx/ssl:/ssl @@ -78,6 +79,18 @@ services: restart: always networks: - scb-net + socioboard-web: + image: sintelli/socioboard-web:latest + container_name: socioboard-web + depends_on: + - socioboard + environment: + BASE_DOMAIN: ${BASE_DOMAIN} + HTTPS_PORT: ${HTTPS_PORT} + LARAVEL_KEY: ${LARAVEL_KEY} + restart: always + networks: + - scb-net socioboard-mysql: image: library/mysql:latest container_name: socioboard-mysql @@ -131,4 +144,4 @@ volumes: scb-mysql: {} networks: scb-net: - external: true + driver: bridge diff --git a/docker/nginx/nginx-socioboard.conf b/docker/nginx/nginx-socioboard.conf index 46bcb063..b1f208f9 100644 --- a/docker/nginx/nginx-socioboard.conf +++ b/docker/nginx/nginx-socioboard.conf @@ -29,7 +29,7 @@ server { } location ^~ / { - proxy_pass http://socioboard:8000; + proxy_pass http://socioboard-web; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/docker/socioboard-web/Dockerfile b/docker/socioboard-web/Dockerfile new file mode 100644 index 00000000..d237e322 --- /dev/null +++ b/docker/socioboard-web/Dockerfile @@ -0,0 +1,36 @@ +FROM nginx:alpine +LABEL maintainer="vaughngx4 (vaughng@pm.me)" +WORKDIR / +RUN mkdir -p /usr/socioboard/app +RUN apk update && apk add --no-cache \ + bash \ + jq \ + php8 \ + php8-fpm \ + php8-session \ + php8-dom \ + php8-tokenizer \ + php8-fileinfo \ + php8-apache2 \ + php8-mysqli \ + php8-opcache \ + php8-common \ + php8-cli \ + php8-curl \ + php8-xml \ + php8-xmlwriter \ + composer +RUN rm -rf /var/cache/apk/* +WORKDIR /usr/socioboard/app +#COPY ./php.ini /etc/php8/php.ini +RUN rm -f /etc/nginx/conf.d/default.conf +COPY ./socioboard-web-php ./socioboard-web-php +RUN cd ./socioboard-web-php && composer install +RUN chown -R nginx:nginx /usr/socioboard/app && \ + sed -i "s;nobody;nginx;g" /etc/php8/php-fpm.d/www.conf +COPY ./nginx.conf /etc/nginx/nginx.conf +COPY ./nginx-socioboard-web.conf /etc/nginx/templates/socioboard.conf.template +COPY ./entrypoint.sh /docker-entrypoint.sh +COPY ./init.sh /init.sh +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD /usr/sbin/nginx && php-fpm8 -O && tail -f /dev/null diff --git a/docker/socioboard-web/entrypoint.sh b/docker/socioboard-web/entrypoint.sh new file mode 100755 index 00000000..29e17949 --- /dev/null +++ b/docker/socioboard-web/entrypoint.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# vim:sw=4:ts=4:et + +bash /init.sh + +set -e + +if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then + exec 3>&1 +else + exec 3>/dev/null +fi + +if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then + echo >&3 "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration" + + echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/" + find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do + case "$f" in + *.sh) + if [ -x "$f" ]; then + echo >&3 "$0: Launching $f"; + "$f" + else + # warn on shell scripts without exec bit + echo >&3 "$0: Ignoring $f, not executable"; + fi + ;; + *) echo >&3 "$0: Ignoring $f";; + esac + done + + echo >&3 "$0: Configuration complete; ready for start up" +else + echo >&3 "$0: No files found in /docker-entrypoint.d/, skipping configuration" +fi + +exec "$@" \ No newline at end of file diff --git a/docker/socioboard-web/init.sh b/docker/socioboard-web/init.sh new file mode 100755 index 00000000..5984c523 --- /dev/null +++ b/docker/socioboard-web/init.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +if [ -z "$BASH_VERSION" ] +then + exec bash "$0" "$@" +fi + +# if non standard https port, change URL scheme, else leave blank +port="" +while [[ $HTTPS_PORT != "443" ]];do + port=":$HTTPS_PORT" + break; +done + +# set config +echo "Setting Configs" +cd /usr/socioboard/app/socioboard-web-php/ +cp example.env .env +sed -i "s;<>;${LARAVEL_KEY};g" .env +sed -i "s;APP_ENV=local;APP_ENV=production;g" .env +sed -i "s;APP_DEBUG=true;APP_DEBUG=false;g" .env +sed -i "s;<>;https://socio.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-api.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-feeds.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-publish.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-update.${BASE_DOMAIN}${port}/;g" .env +sed -i "s;<>;https://socio-notifications.${BASE_DOMAIN}${port}/;g" .env + +# start frontend +echo "Setting Laravel Key" +cd /usr/socioboard/app/socioboard-web-php +echo -e "yes\n" | php8 artisan key:generate diff --git a/docker/socioboard-web/nginx-socioboard-web.conf b/docker/socioboard-web/nginx-socioboard-web.conf new file mode 100644 index 00000000..4b49c145 --- /dev/null +++ b/docker/socioboard-web/nginx-socioboard-web.conf @@ -0,0 +1,54 @@ +server { + listen 80; + server_name socio.${BASE_DOMAIN}; + keepalive_timeout 70; + + access_log /dev/stdout; + error_log /dev/stdout; + + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-XSS-Protection "1; mode=block"; + server_tokens off; + +## Be careful with this, I'm not sure what methods the various social APIs need. +## I will uncomment when I find out. +## +## Uncomment the following and set methods for increased security: +## + +# if ($request_method !~ ^(GET|POST|PUT|DELETE)$ ) { +# return 405; +# } + + location / { + autoindex off; + index index.php; + root /usr/socioboard/app/socioboard-web-php/public; + try_files $uri $uri.html $uri/ @extensionless-php; + } + + location @extensionless-php { + rewrite ^(.*)$ $1.php last; + } + + location ~* \.php$ { + fastcgi_pass 127.0.0.1:9000; + include fastcgi_params; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_NAME $fastcgi_script_name; + root /usr/socioboard/app/socioboard-web-php/public; + try_files $uri $uri/ /index.php$is_args$args; + } + + location ~ \.css { + root /usr/socioboard/app/socioboard-web-php/public; + add_header Content-Type text/css; + try_files $uri $uri/ =404; + } + location ~ \.js { + root /usr/socioboard/app/socioboard-web-php/public; + add_header Content-Type application/x-javascript; + try_files $uri $uri/ =404; + } +} diff --git a/docker/socioboard-web/nginx.conf b/docker/socioboard-web/nginx.conf new file mode 100644 index 00000000..cd96d12d --- /dev/null +++ b/docker/socioboard-web/nginx.conf @@ -0,0 +1,34 @@ +user nginx; +worker_processes auto; + +error_log /dev/stdout notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /dev/stdout main; + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} \ No newline at end of file diff --git a/docker/socioboard-web/php.ini b/docker/socioboard-web/php.ini new file mode 100644 index 00000000..2c01be1f --- /dev/null +++ b/docker/socioboard-web/php.ini @@ -0,0 +1,1965 @@ +[PHP] + + +;;;;;;;;;;;;;;;;;;;; +; Custom variables ; +;;;;;;;;;;;;;;;;;;;; +; Variables for use in the rest of the configuration. +; In this case we also use it to import php-fpm environment variables + + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; PHP's initialization file, generally called php.ini, is responsible for +; configuring many of the aspects of PHP's behavior. + +; PHP attempts to find and load this configuration from a number of locations. +; The following is a summary of its search order: +; 1. SAPI module specific location. +; 2. The PHPRC environment variable. (As of PHP 5.2.0) +; 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 (usually C:\windows) +; See the PHP docs for more specific information. +; https://php.net/configuration.file + +; The syntax of the file is extremely simple. Whitespace and lines +; beginning with a semicolon are silently ignored (as you probably guessed). +; Section headers (e.g. [Foo]) are also silently ignored, even though +; they might mean something in the future. + +; Directives following the section heading [PATH=/www/mysite] only +; apply to PHP files in the /www/mysite directory. Directives +; following the section heading [HOST=www.example.com] only apply to +; PHP files served from www.example.com. Directives set in these +; special sections cannot be overridden by user-defined INI files or +; at runtime. Currently, [PATH=] and [HOST=] sections only work under +; CGI/FastCGI. +; https://php.net/ini.sections + +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; Directives are variables used to configure PHP or PHP extensions. +; There is no name validation. If PHP can't find an expected +; directive because it is not set or is mistyped, a default value will be used. + +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a +; previously set variable or directive (e.g. ${foo}) + +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; ^ bitwise XOR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT + +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. + +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: + +; foo = ; sets foo to an empty string +; foo = None ; sets foo to an empty string +; foo = "None" ; sets foo to the string 'None' + +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; PHP comes packaged with two INI files. One that is recommended to be used +; in production environments and one that is recommended to be used in +; development environments. + +; php.ini-production contains settings which hold security, performance and +; best practices at its core. But please be aware, these settings may break +; compatibility with older or less security conscience applications. We +; recommending using the production ini in production and testing environments. + +; php.ini-development is very similar to its production variant, except it is +; much more verbose when it comes to errors. We recommend using the +; development version only in development environments, as errors shown to +; application users can inadvertently leak otherwise secure information. + +; This is the php.ini-production INI file. + +;;;;;;;;;;;;;;;;;;; +; Quick Reference ; +;;;;;;;;;;;;;;;;;;; + +; The following are all the settings which are different in either the production +; or development versions of the INIs with respect to PHP's default behavior. +; Please see the actual settings later in the document for more details as to why +; we recommend these changes in PHP's behavior. + +; display_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; display_startup_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; error_reporting +; Default Value: E_ALL +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT + +; log_errors +; Default Value: Off +; Development Value: On +; Production Value: On + +; max_input_time +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) + +; output_buffering +; Default Value: Off +; Development Value: 4096 +; Production Value: 4096 + +; register_argc_argv +; Default Value: On +; Development Value: Off +; Production Value: Off + +; request_order +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" + +; session.gc_divisor +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 + +; session.sid_bits_per_character +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 + +; short_open_tag +; Default Value: On +; Development Value: Off +; Production Value: Off + +; variables_order +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS" + +; zend.exception_ignore_args +; Default Value: Off +; Development Value: Off +; Production Value: On + +; zend.exception_string_param_max_len +; Default Value: 15 +; Development Value: 15 +; Production Value: 0 + +;;;;;;;;;;;;;;;;;;;; +; php.ini Options ; +;;;;;;;;;;;;;;;;;;;; +; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini" +;user_ini.filename = ".user.ini" + +; To disable this feature set this option to an empty value +;user_ini.filename = + +; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) +;user_ini.cache_ttl = 300 + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +; https://php.net/engine +engine = On + +; This directive determines whether or not PHP will recognize code between +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the would work. +; https://php.net/syntax-highlighting +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long requests, which may end up +; being interrupted by the user or a browser timing out. PHP's default behavior +; is to disable this feature. +; https://php.net/ignore-user-abort +;ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; Note: if open_basedir is set, the cache is disabled +; https://php.net/realpath-cache-size +;realpath_cache_size = 4096k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; https://php.net/realpath-cache-ttl +;realpath_cache_ttl = 120 + +; Enables or disables the circular reference collector. +; https://php.net/zend.enable-gc +zend.enable_gc = On + +; If enabled, scripts may be written in encodings that are incompatible with +; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such +; encodings. To use this feature, mbstring extension must be enabled. +;zend.multibyte = Off + +; Allows to set the default encoding for the scripts. This value will be used +; unless "declare(encoding=...)" directive appears at the top of the script. +; Only affects if zend.multibyte is set. +;zend.script_encoding = + +; Allows to include or exclude arguments from stack traces generated for exceptions. +; In production, it is recommended to turn this setting on to prohibit the output +; of sensitive information in stack traces +; Default Value: Off +; Development Value: Off +; Production Value: On +zend.exception_ignore_args = On + +; Allows setting the maximum string length in an argument of a stringified stack trace +; to a value between 0 and 1000000. +; This has no effect when zend.exception_ignore_args is enabled. +; Default Value: 15 +; Development Value: 15 +; Production Value: 0 +; In production, it is recommended to set this to 0 to reduce the output +; of sensitive information in stack traces. +zend.exception_string_param_max_len = 0 + +;;;;;;;;;;;;;;;;; +; Miscellaneous ; +;;;;;;;;;;;;;;;;; + +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +; https://php.net/expose-php +expose_php = Off + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +; Maximum execution time of each script, in seconds +; https://php.net/max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI +max_execution_time = 30 + +; Maximum amount of time each script may spend parsing request data. It's a good +; idea to limit this time on productions servers in order to eliminate unexpectedly +; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) +; https://php.net/max-input-time +max_input_time = 60 + +; Maximum input variable nesting level +; https://php.net/max-input-nesting-level +;max_input_nesting_level = 64 + +; How many GET/POST/COOKIE input variables may be accepted +;max_input_vars = 1000 + +; Maximum amount of memory a script may consume +; https://php.net/memory-limit +memory_limit = 128M + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; This directive informs PHP of which errors, warnings and notices you would like +; it to take action for. The recommended way of setting values for this +; directive is through the use of the error level constants and bitwise +; operators. The error level constants are below here for convenience as well as +; some common settings and their meanings. +; By default, PHP is set to take action on all errors, notices and warnings EXCEPT +; those related to E_NOTICE and E_STRICT, which together cover best practices and +; recommended coding standards in PHP. For performance reasons, this is the +; recommend error reporting setting. Your production server shouldn't be wasting +; resources complaining about best practices and coding standards. That's what +; development servers and development settings are for. +; Note: The php.ini-development file has this setting as E_ALL. This +; means it pretty much reports everything which is exactly what you want during +; development and early testing. +; +; Error Level Constants: +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it is automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; E_DEPRECATED - warn about code that will not work in future versions +; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings +; +; Common Values: +; E_ALL (Show all errors, warnings and notices including coding standards.) +; E_ALL & ~E_NOTICE (Show all errors, except for notices) +; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.) +; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) +; Default Value: E_ALL +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT +; https://php.net/error-reporting +error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT + +; This directive controls whether or not and where PHP will output errors, +; notices and warnings too. Error output is very useful during development, but +; it could be very dangerous in production environments. Depending on the code +; which is triggering the error, sensitive information could potentially leak +; out of your application such as database usernames and passwords or worse. +; For production environments, we recommend logging errors rather than +; sending them to STDOUT. +; Possible Values: +; Off = Do not display any errors +; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) +; On or stdout = Display errors to STDOUT +; Default Value: On +; Development Value: On +; Production Value: Off +; https://php.net/display-errors +display_errors = Off + +; The display of errors which occur during PHP's startup sequence are handled +; separately from display_errors. We strongly recommend you set this to 'off' +; for production servers to avoid leaking configuration details. +; Default Value: On +; Development Value: On +; Production Value: Off +; https://php.net/display-startup-errors +display_startup_errors = Off + +; Besides displaying errors, PHP can also log errors to locations such as a +; server-specific log, STDERR, or a location specified by the error_log +; directive found below. While errors should not be displayed on productions +; servers they should still be monitored and logging is a great way to do that. +; Default Value: Off +; Development Value: On +; Production Value: On +; https://php.net/log-errors +log_errors = On + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line unless ignore_repeated_source is set true. +; https://php.net/ignore-repeated-errors +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; source lines. +; https://php.net/ignore-repeated-source +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This is only effective in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +; https://php.net/report-memleaks +report_memleaks = On + +; This setting is off by default. +;report_zend_debug = 0 + +; Turn off normal error reporting and emit XML-RPC error XML +; https://php.net/xmlrpc-errors +;xmlrpc_errors = 0 + +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + +; When PHP displays or logs an error, it has the capability of formatting the +; error message as HTML for easier reading. This directive controls whether +; the error message is formatted as HTML or not. +; Note: This directive is hardcoded to Off for the CLI SAPI +; https://php.net/html-errors +;html_errors = On + +; If html_errors is set to On *and* docref_root is not empty, then PHP +; produces clickable error messages that direct to a page describing the error +; or function causing the error in detail. +; You can download a copy of the PHP manual from https://php.net/docs +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. PHP's default behavior is to leave these settings empty, in which +; case no links to documentation are generated. +; Note: Never use this feature for production boxes. +; https://php.net/docref-root +; Examples +;docref_root = "/phpmanual/" + +; https://php.net/docref-ext +;docref_ext = .html + +; String to output before an error message. PHP's default behavior is to leave +; this setting blank. +; https://php.net/error-prepend-string +; Example: +;error_prepend_string = "" + +; String to output after an error message. PHP's default behavior is to leave +; this setting blank. +; https://php.net/error-append-string +; Example: +;error_append_string = "" + +; Log errors to specified file. PHP's default behavior is to leave this value +; empty. +; https://php.net/error-log +; Example: +;error_log = php_errors.log +; Log errors to syslog (Event Log on Windows). +;error_log = syslog + +; The syslog ident is a string which is prepended to every message logged +; to syslog. Only used when error_log is set to syslog. +;syslog.ident = php + +; The syslog facility is used to specify what type of program is logging +; the message. Only used when error_log is set to syslog. +;syslog.facility = user + +; Set this to disable filtering control characters (the default). +; Some loggers only accept NVT-ASCII, others accept anything that's not +; control characters. If your logger accepts everything, then no filtering +; is needed at all. +; Allowed values are: +; ascii (all printable ASCII characters and NL) +; no-ctrl (all characters except control characters) +; all (all characters) +; raw (like "all", but messages are not split at newlines) +; https://php.net/syslog.filter +;syslog.filter = ascii + +;windows.show_crt_warning +; Default value: 0 +; Development value: 0 +; Production value: 0 + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; + +; The separator used in PHP generated URLs to separate arguments. +; PHP's default setting is "&". +; https://php.net/arg-separator.output +; Example: +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; PHP's default setting is "&". +; NOTE: Every character in this directive is considered as separator! +; https://php.net/arg-separator.input +; Example: +;arg_separator.input = ";&" + +; This directive determines which super global arrays are registered when PHP +; starts up. G,P,C,E & S are abbreviations for the following respective super +; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty +; paid for the registration of these arrays and because ENV is not as commonly +; used as the others, ENV is not recommended on productions servers. You +; can still get access to the environment variables through getenv() should you +; need to. +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS"; +; https://php.net/variables-order +variables_order = "GPCS" + +; This directive determines which super global data (G,P & C) should be +; registered into the super global array REQUEST. If so, it also determines +; the order in which that data is registered. The values for this directive +; are specified in the same manner as the variables_order directive, +; EXCEPT one. Leaving this value empty will cause PHP to use the value set +; in the variables_order directive. It does not mean it will leave the super +; globals array REQUEST empty. +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" +; https://php.net/request-order +request_order = "GP" + +; This directive determines whether PHP registers $argv & $argc each time it +; runs. $argv contains an array of all the arguments passed to PHP when a script +; is invoked. $argc contains an integer representing the number of arguments +; that were passed when the script was invoked. These arrays are extremely +; useful when running scripts from the command line. When this directive is +; enabled, registering these variables consumes CPU cycles and memory each time +; a script is executed. For performance reasons, this feature should be disabled +; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI +; Default Value: On +; Development Value: Off +; Production Value: Off +; https://php.net/register-argc-argv +register_argc_argv = Off + +; When enabled, the ENV, REQUEST and SERVER variables are created when they're +; first used (Just In Time) instead of when the script starts. If these +; variables are not used within a script, having this directive on will result +; in a performance gain. The PHP directive register_argc_argv must be disabled +; for this directive to have any effect. +; https://php.net/auto-globals-jit +auto_globals_jit = On + +; Whether PHP will read the POST data. +; This option is enabled by default. +; Most likely, you won't want to disable this option globally. It causes $_POST +; and $_FILES to always be empty; the only way you will be able to read the +; POST data will be through the php://input stream wrapper. This can be useful +; to proxy requests or to process the POST data in a memory efficient fashion. +; https://php.net/enable-post-data-reading +;enable_post_data_reading = Off + +; Maximum size of POST data that PHP will accept. +; Its value may be 0 to disable the limit. It is ignored if POST data reading +; is disabled through enable_post_data_reading. +; https://php.net/post-max-size +post_max_size = 8M + +; Automatically add files before PHP document. +; https://php.net/auto-prepend-file +auto_prepend_file = + +; Automatically add files after PHP document. +; https://php.net/auto-append-file +auto_append_file = + +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. +; +; PHP's built-in default media type is set to text/html. +; https://php.net/default-mimetype +default_mimetype = "text/html" + +; PHP's default character set is set to UTF-8. +; https://php.net/default-charset +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; https://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; If empty, default_charset is used. +; https://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; If empty, default_charset is used. +; See also output_buffer. +; https://php.net/output-encoding +;output_encoding = + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/php/includes" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" +; +; PHP's default setting for include_path is ".;/path/to/php/pear" +; https://php.net/include-path + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +; https://php.net/doc-root +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +; https://php.net/user-dir +user_dir = + +; Directory in which the loadable extensions (modules) reside. +; https://php.net/extension-dir +;extension_dir = "./" +; On windows: +;extension_dir = "ext" + +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +;sys_temp_dir = "/tmp" + +; Whether or not to enable the dl() function. The dl() function does NOT work +; properly in multithreaded servers, such as IIS or Zeus, and is automatically +; disabled on them. +; https://php.net/enable-dl +enable_dl = Off + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; https://php.net/cgi.force-redirect +;cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. PHP's default behavior is to disable this feature. +;cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; https://php.net/cgi.redirect-status-env +;cgi.redirect_status_env = + +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is 1. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; https://php.net/cgi.fix-pathinfo +;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. +;cgi.discard_path=1 + +; FastCGI under IIS supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; https://php.net/fastcgi.impersonate +;fastcgi.impersonate = 1 + +; Disable logging through FastCGI connection. PHP's default behavior is to enable +; this feature. +;fastcgi.logging = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If set to 0, PHP sends Status: header that +; is supported by Apache. When this option is set to 1, PHP will send +; RFC2616 compliant header. +; Default is zero. +; https://php.net/cgi.rfc2616-headers +;cgi.rfc2616_headers = 0 + +; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #! +; (shebang) at the top of the running script. This line might be needed if the +; script support running both as stand-alone script and via PHP CGI<. PHP in CGI +; mode skips this line and ignores its content if this directive is turned on. +; https://php.net/cgi.check-shebang-line +;cgi.check_shebang_line=1 + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +; https://php.net/file-uploads +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +; https://php.net/upload-tmp-dir +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +; https://php.net/upload-max-filesize +upload_max_filesize = 2M + +; Maximum number of files that can be uploaded via a single request +max_file_uploads = 20 + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +; https://php.net/allow-url-fopen +allow_url_fopen = On + +; Whether to allow include/require to open URLs (like https:// or ftp://) as files. +; https://php.net/allow-url-include +allow_url_include = Off + +; Define the anonymous ftp password (your email address). PHP's default setting +; for this is empty. +; https://php.net/from +;from="john@doe.com" + +; Define the User-Agent string. PHP's default setting for this is empty. +; https://php.net/user-agent +;user_agent="PHP" + +; Default timeout for socket based streams (seconds) +; https://php.net/default-socket-timeout +default_socket_timeout = 60 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; https://php.net/auto-detect-line-endings +;auto_detect_line_endings = Off + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; + +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename +; +; For example: +; +; extension=mysqli +; +; When the extension library to load is not located in the default extension +; directory, You may specify an absolute path to the library file: +; +; extension=/path/to/extension/mysqli.so +; +; Note : The syntax used in previous PHP versions ('extension=.so' and +; 'extension='php_.dll') is supported for legacy reasons and may be +; deprecated in a future PHP major version. So, when it is possible, please +; move to the new ('extension=) syntax. +; +; Notes for Windows environments : +; +; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) +; extension folders as well as the separate PECL DLL download (PHP 5+). +; Be sure to appropriately set the extension_dir directive. +; +;extension=bz2 +;extension=curl +;extension=ffi +;extension=ftp +;extension=fileinfo +;extension=gd +;extension=gettext +;extension=gmp +;extension=intl +;extension=imap +;extension=ldap +;extension=mbstring +;extension=exif ; Must be after mbstring as it depends on it +;extension=mysqli +;extension=oci8_12c ; Use with Oracle Database 12c Instant Client +;extension=oci8_19 ; Use with Oracle Database 19 Instant Client +;extension=odbc +;extension=openssl +;extension=pdo_firebird +;extension=pdo_mysql +;extension=pdo_oci +;extension=pdo_odbc +;extension=pdo_pgsql +;extension=pdo_sqlite +;extension=pgsql +;extension=shmop + +; The MIBS data available in the PHP distribution must be installed. +; See https://www.php.net/manual/en/snmp.installation.php +;extension=snmp + +;extension=soap +;extension=sockets +;extension=sodium +;extension=sqlite3 +;extension=tidy +;extension=xsl + +;zend_extension=opcache + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[CLI Server] +; Whether the CLI web server uses ANSI color coding in its terminal output. +cli_server.color = On + +[Date] +; Defines the default timezone used by the date functions +; https://php.net/date.timezone +;date.timezone = + +; https://php.net/date.default-latitude +;date.default_latitude = 31.7667 + +; https://php.net/date.default-longitude +;date.default_longitude = 35.2333 + +; https://php.net/date.sunrise-zenith +;date.sunrise_zenith = 90.833333 + +; https://php.net/date.sunset-zenith +;date.sunset_zenith = 90.833333 + +[filter] +; https://php.net/filter.default +;filter.default = unsafe_raw + +; https://php.net/filter.default-flags +;filter.default_flags = + +[iconv] +; Use of this INI entry is deprecated, use global input_encoding instead. +; If empty, default_charset or input_encoding or iconv.input_encoding is used. +; The precedence is: default_charset < input_encoding < iconv.input_encoding +;iconv.input_encoding = + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;iconv.internal_encoding = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; If empty, default_charset or output_encoding or iconv.output_encoding is used. +; The precedence is: default_charset < output_encoding < iconv.output_encoding +; To use an output encoding conversion, iconv's output handler must be set +; otherwise output encoding conversion cannot be performed. +;iconv.output_encoding = + +[imap] +; rsh/ssh logins are disabled by default. Use this INI entry if you want to +; enable them. Note that the IMAP library does not filter mailbox names before +; passing them to rsh/ssh command, thus passing untrusted data to this function +; with rsh/ssh enabled is insecure. +;imap.enable_insecure_rsh=0 + +[intl] +;intl.default_locale = +; This directive allows you to produce PHP errors when some error +; happens within intl functions. The value is the level of the error produced. +; Default is 0, which does not produce any errors. +;intl.error_level = E_WARNING +;intl.use_exceptions = 0 + +[sqlite3] +; Directory pointing to SQLite3 extensions +; https://php.net/sqlite3.extension-dir +;sqlite3.extension_dir = + +; SQLite defensive mode flag (only available from SQLite 3.26+) +; When the defensive flag is enabled, language features that allow ordinary +; SQL to deliberately corrupt the database file are disabled. This forbids +; writing directly to the schema, shadow tables (eg. FTS data tables), or +; the sqlite_dbpage virtual table. +; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html +; (for older SQLite versions, this flag has no use) +;sqlite3.defensive = 1 + +[Pcre] +; PCRE library backtracking limit. +; https://php.net/pcre.backtrack-limit +;pcre.backtrack_limit=100000 + +; PCRE library recursion limit. +; Please note that if you set this value to a high number you may consume all +; the available process stack and eventually crash PHP (due to reaching the +; stack size limit imposed by the Operating System). +; https://php.net/pcre.recursion-limit +;pcre.recursion_limit=100000 + +; Enables or disables JIT compilation of patterns. This requires the PCRE +; library to be compiled with JIT support. +;pcre.jit=1 + +[Pdo] +; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" +; https://php.net/pdo-odbc.connection-pooling +;pdo_odbc.connection_pooling=strict + +[Pdo_mysql] +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +pdo_mysql.default_socket= + +[Phar] +; https://php.net/phar.readonly +;phar.readonly = On + +; https://php.net/phar.require-hash +;phar.require_hash = On + +;phar.cache_list = + +[mail function] +; For Win32 only. +; https://php.net/smtp +SMTP = localhost +; https://php.net/smtp-port +smtp_port = 25 + +; For Win32 only. +; https://php.net/sendmail-from +;sendmail_from = me@example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +; https://php.net/sendmail-path +;sendmail_path = + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(). +;mail.force_extra_parameters = + +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename +mail.add_x_header = Off + +; The path to a log file that will log all mail() calls. Log entries include +; the full path of the script, line number, To address and headers. +;mail.log = +; Log mail to syslog (Event Log on Windows). +;mail.log = syslog + +[ODBC] +; https://php.net/odbc.default-db +;odbc.default_db = Not yet implemented + +; https://php.net/odbc.default-user +;odbc.default_user = Not yet implemented + +; https://php.net/odbc.default-pw +;odbc.default_pw = Not yet implemented + +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + +; Allow or prevent persistent links. +; https://php.net/odbc.allow-persistent +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +; https://php.net/odbc.check-persistent +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +; https://php.net/odbc.max-persistent +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; https://php.net/odbc.max-links +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +; https://php.net/odbc.defaultlrl +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of odbc.defaultlrl and odbc.defaultbinmode +; https://php.net/odbc.defaultbinmode +odbc.defaultbinmode = 1 + +[MySQLi] + +; Maximum number of persistent links. -1 means no limit. +; https://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; https://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; It allows the user to specify a folder where files that can be sent via LOAD DATA +; LOCAL can exist. It is ignored if mysqli.allow_local_infile is enabled. +;mysqli.local_infile_directory = + +; Allow or prevent persistent links. +; https://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + +; Maximum number of links. -1 means no limit. +; https://php.net/mysqli.max-links +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +; https://php.net/mysqli.default-port +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; https://php.net/mysqli.default-socket +mysqli.default_socket = + +; Default host for mysqli_connect() (doesn't apply in safe mode). +; https://php.net/mysqli.default-host +mysqli.default_host = + +; Default user for mysqli_connect() (doesn't apply in safe mode). +; https://php.net/mysqli.default-user +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +; https://php.net/mysqli.default-pw +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +; If this option is enabled, closing a persistent connection will rollback +; any pending transactions of this connection, before it is put back +; into the persistent connection pool. +;mysqli.rollback_on_cached_plink = Off + +[mysqlnd] +; Enable / Disable collection of general statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +mysqlnd.collect_memory_statistics = Off + +; Records communication from all extensions using mysqlnd to the specified log +; file. +; https://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +;mysqlnd.mempool_default_size = 16000 + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +;mysqlnd.net_read_buffer_size = 32768 + +; Timeout for network requests in seconds. +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +;mysqlnd.sha256_server_public_key = + +[OCI8] + +; Connection: Enables privileged connections using external +; credentials (OCI_SYSOPER, OCI_SYSDBA) +; https://php.net/oci8.privileged-connect +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +; https://php.net/oci8.max-persistent +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +; https://php.net/oci8.persistent-timeout +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +; https://php.net/oci8.ping-interval +;oci8.ping_interval = 60 + +; Connection: Set this to a user chosen connection class to be used +; for all pooled server requests with Oracle Database Resident +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = + +; High Availability: Using On lets PHP receive Fast Application +; Notification (FAN) events generated when a database node fails. The +; database must also be configured to post FAN events. +;oci8.events = Off + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +; https://php.net/oci8.statement-cache-size +;oci8.statement_cache_size = 20 + +; Tuning: Enables row prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +; https://php.net/oci8.default-prefetch +;oci8.default_prefetch = 100 + +; Tuning: Sets the amount of LOB data that is internally returned from +; Oracle Database when an Oracle LOB locator is initially retrieved as +; part of a query. Setting this can improve performance by reducing +; round-trips. +; https://php.net/oci8.prefetch-lob-size +; oci8.prefetch_lob_size = 0 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +; https://php.net/oci8.old-oci-close-semantics +;oci8.old_oci_close_semantics = Off + +[PostgreSQL] +; Allow or prevent persistent links. +; https://php.net/pgsql.allow-persistent +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +; https://php.net/pgsql.auto-reset-persistent +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +; https://php.net/pgsql.max-persistent +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +; https://php.net/pgsql.max-links +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +; https://php.net/pgsql.ignore-notice +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Notice message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +; https://php.net/pgsql.log-notice +pgsql.log_notice = 0 + +[bcmath] +; Number of decimal digits for all bcmath functions. +; https://php.net/bcmath.scale +bcmath.scale = 0 + +[browscap] +; https://php.net/browscap +;browscap = extra/browscap.ini + +[Session] +; Handler used to store/retrieve data. +; https://php.net/session.save-handler +session.save_handler = file + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; The path can be defined as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if +; your OS has problems with many files in one directory, and is +; a more efficient layout for servers that handle many sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +; https://php.net/session.save-path +;session.save_path = + +; Whether to use strict session mode. +; Strict session mode does not accept an uninitialized session ID, and +; regenerates the session ID if the browser sends an uninitialized session ID. +; Strict mode protects applications from session fixation via a session adoption +; vulnerability. It is disabled by default for maximum compatibility, but +; enabling it is encouraged. +; https://wiki.php.net/rfc/strict_sessions +session.use_strict_mode = 1 + +; Whether to use cookies. +; https://php.net/session.use-cookies +session.use_cookies = 1 + +; https://php.net/session.cookie-secure +;session.cookie_secure = + +; This option forces PHP to fetch and use a cookie for storing and maintaining +; the session id. We encourage this operation as it's very helpful in combating +; session hijacking when not specifying and managing your own session id. It is +; not the be-all and end-all of session hijacking defense, but it's a good start. +; https://php.net/session.use-only-cookies +session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +; https://php.net/session.name +session.name = SID + +; Initialize session on request startup. +; https://php.net/session.auto-start +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +; https://php.net/session.cookie-lifetime +session.cookie_lifetime = 900 + +; The path for which the cookie is valid. +; https://php.net/session.cookie-path +session.cookie_path = / + +; The domain for which the cookie is valid. +; https://php.net/session.cookie-domain +session.cookie_domain = + +; Whether or not to add the httpOnly flag to the cookie, which makes it +; inaccessible to browser scripting languages such as JavaScript. +; https://php.net/session.cookie-httponly +session.cookie_httponly = 1 + +; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF) +; Current valid values are "Strict", "Lax" or "None". When using "None", +; make sure to include the quotes, as `none` is interpreted like `false` in ini files. +; https://tools.ietf.org/html/draft-west-first-party-cookies-07 +session.cookie_samesite = "Lax" + +; Handler used to serialize data. php is the standard serializer of PHP. +; https://php.net/session.serialize-handler +session.serialize_handler = php + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; https://php.net/session.gc-probability +session.gc_probability = 1 + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; For high volume production servers, using a value of 1000 is a more efficient approach. +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 +; https://php.net/session.gc-divisor +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +; https://php.net/session.gc-maxlifetime +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script is the equivalent of setting +; session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; find /path/to/sessions -cmin +24 -type f | xargs rm + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +; https://php.net/session.referer-check +session.referer_check = + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +; https://php.net/session.cache-limiter +session.cache_limiter = nocache + +; Document expires after n minutes. +; https://php.net/session.cache-expire +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users' security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publicly accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +; https://php.net/session.use-trans-sid +session.use_trans_sid = 0 + +; Set session ID character length. This value could be between 22 to 256. +; Shorter length than default is supported only for compatibility reason. +; Users should use 32 or more chars. +; https://php.net/session.sid-length +; Default Value: 32 +; Development Value: 26 +; Production Value: 26 +session.sid_length = 26 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +;
is special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. tag's action attribute URL will not be modified +; unless it is specified. +; Note that all valid entries require a "=", even if no value follows. +; Default Value: "a=href,area=href,frame=src,form=" +; Development Value: "a=href,area=href,frame=src,form=" +; Production Value: "a=href,area=href,frame=src,form=" +; https://php.net/url-rewriter.tags +session.trans_sid_tags = "a=href,area=href,frame=src,form=" + +; URL rewriter does not rewrite absolute URLs by default. +; To enable rewrites for absolute paths, target hosts must be specified +; at RUNTIME. i.e. use ini_set() +; tags is special. PHP will check action attribute's URL regardless +; of session.trans_sid_tags setting. +; If no host is defined, HTTP_HOST will be used for allowed host. +; Example value: php.net,www.php.net,wiki.php.net +; Use "," for multiple hosts. No spaces are allowed. +; Default Value: "" +; Development Value: "" +; Production Value: "" +;session.trans_sid_hosts="" + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; Possible values: +; 4 (4 bits: 0-9, a-f) +; 5 (5 bits: 0-9, a-v) +; 6 (6 bits: 0-9, a-z, A-Z, "-", ",") +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 +; https://php.net/session.hash-bits-per-character +session.sid_bits_per_character = 5 + +; Enable upload progress tracking in $_SESSION +; Default Value: On +; Development Value: On +; Production Value: On +; https://php.net/session.upload-progress.enabled +;session.upload_progress.enabled = On + +; Cleanup the progress information as soon as all POST data has been read +; (i.e. upload completed). +; Default Value: On +; Development Value: On +; Production Value: On +; https://php.net/session.upload-progress.cleanup +;session.upload_progress.cleanup = On + +; A prefix used for the upload progress key in $_SESSION +; Default Value: "upload_progress_" +; Development Value: "upload_progress_" +; Production Value: "upload_progress_" +; https://php.net/session.upload-progress.prefix +;session.upload_progress.prefix = "upload_progress_" + +; The index name (concatenated with the prefix) in $_SESSION +; containing the upload progress information +; Default Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Development Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Production Value: "PHP_SESSION_UPLOAD_PROGRESS" +; https://php.net/session.upload-progress.name +;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" + +; How frequently the upload progress should be updated. +; Given either in percentages (per-file), or in bytes +; Default Value: "1%" +; Development Value: "1%" +; Production Value: "1%" +; https://php.net/session.upload-progress.freq +;session.upload_progress.freq = "1%" + +; The minimum delay between updates, in seconds +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; https://php.net/session.upload-progress.min-freq +;session.upload_progress.min_freq = "1" + +; Only write session data when session data is changed. Enabled by default. +; https://php.net/session.lazy-write +;session.lazy_write = On + +[Assertion] +; Switch whether to compile assertions at all (to have no overhead at run-time) +; -1: Do not compile at all +; 0: Jump over assertion at run-time +; 1: Execute assertions +; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 +; https://php.net/zend.assertions +zend.assertions = -1 + +; Assert(expr); active by default. +; https://php.net/assert.active +;assert.active = On + +; Throw an AssertionError on failed assertions +; https://php.net/assert.exception +;assert.exception = On + +; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) +; https://php.net/assert.warning +;assert.warning = On + +; Don't bail out by default. +; https://php.net/assert.bail +;assert.bail = Off + +; User-function to be called if an assertion fails. +; https://php.net/assert.callback +;assert.callback = 0 + +[COM] +; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +; https://php.net/com.typelib-file +;com.typelib_file = + +; allow Distributed-COM calls +; https://php.net/com.allow-dcom +;com.allow_dcom = true + +; autoregister constants of a component's typelib on com_load() +; https://php.net/com.autoregister-typelib +;com.autoregister_typelib = true + +; register constants casesensitive +; https://php.net/com.autoregister-casesensitive +;com.autoregister_casesensitive = false + +; show warnings on duplicate constant registrations +; https://php.net/com.autoregister-verbose +;com.autoregister_verbose = true + +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + +; The version of the .NET framework to use. The value of the setting are the first three parts +; of the framework's version number, separated by dots, and prefixed with "v", e.g. "v4.0.30319". +;com.dotnet_version= + +[mbstring] +; language for internal character representation. +; This affects mb_send_mail() and mbstring.detect_order. +; https://php.net/mbstring.language +;mbstring.language = Japanese + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; internal/script encoding. +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;mbstring.internal_encoding = + +; Use of this INI entry is deprecated, use global input_encoding instead. +; http input encoding. +; mbstring.encoding_translation = On is needed to use this setting. +; If empty, default_charset or input_encoding or mbstring.input is used. +; The precedence is: default_charset < input_encoding < mbstring.http_input +; https://php.net/mbstring.http-input +;mbstring.http_input = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, default_charset or output_encoding or mbstring.http_output is used. +; The precedence is: default_charset < output_encoding < mbstring.http_output +; To use an output encoding conversion, mbstring's output handler must be set +; otherwise output encoding conversion cannot be performed. +; https://php.net/mbstring.http-output +;mbstring.http_output = + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +; https://php.net/mbstring.encoding-translation +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; "auto" detect order is changed according to mbstring.language +; https://php.net/mbstring.detect-order +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +; https://php.net/mbstring.substitute-character +;mbstring.substitute_character = none + +; Enable strict encoding detection. +;mbstring.strict_detection = Off + +; This directive specifies the regex pattern of content types for which mb_output_handler() +; is activated. +; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml) +;mbstring.http_output_conv_mimetypes= + +; This directive specifies maximum stack depth for mbstring regular expressions. It is similar +; to the pcre.recursion_limit for PCRE. +;mbstring.regex_stack_limit=100000 + +; This directive specifies maximum retry count for mbstring regular expressions. It is similar +; to the pcre.backtrack_limit for PCRE. +;mbstring.regex_retry_limit=1000000 + +[gd] +; Tell the jpeg decode to ignore warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +; https://php.net/gd.jpeg-ignore-warning +;gd.jpeg_ignore_warning = 1 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +; https://php.net/exif.encode-unicode +;exif.encode_unicode = ISO-8859-15 + +; https://php.net/exif.decode-unicode-motorola +;exif.decode_unicode_motorola = UCS-2BE + +; https://php.net/exif.decode-unicode-intel +;exif.decode_unicode_intel = UCS-2LE + +; https://php.net/exif.encode-jis +;exif.encode_jis = + +; https://php.net/exif.decode-jis-motorola +;exif.decode_jis_motorola = JIS + +; https://php.net/exif.decode-jis-intel +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +; https://php.net/tidy.default-config +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +; https://php.net/tidy.clean-output +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +; https://php.net/soap.wsdl-cache-enabled +soap.wsdl_cache_enabled=1 + +; Sets the directory name where SOAP extension will put cache files. +; https://php.net/soap.wsdl-cache-dir +soap.wsdl_cache_dir="/tmp" + +; (time to live) Sets the number of second while cached file will be useduser +; instead of original one. +; https://php.net/soap.wsdl-cache-ttl +soap.wsdl_cache_ttl=86400 + +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + +[sysvshm] +; A default size of the shared memory segment +;sysvshm.init_mem = 10000 + +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + +[dba] +;dba.default_handler= + +[opcache] +; Determines if Zend OPCache is enabled +;opcache.enable=1 + +; Determines if Zend OPCache is enabled for the CLI version of PHP +;opcache.enable_cli=0 + +; The OPcache shared memory storage size. +;opcache.memory_consumption=128 + +; The amount of memory for interned strings in Mbytes. +;opcache.interned_strings_buffer=8 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 1000000 are allowed. +;opcache.max_accelerated_files=10000 + +; The maximum percentage of "wasted" memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files with the same name (basename). Disabling the directive improves +; performance, but may break existing applications. +;opcache.use_cwd=1 + +; When disabled, you must reset the OPcache manually or restart the +; webserver for changes to the filesystem to take effect. +;opcache.validate_timestamps=1 + +; How often (in seconds) to check file timestamps for changes to the shared +; memory storage allocation. ("1" means validate once per second, but only +; once per request. "0" means always validate) +;opcache.revalidate_freq=2 + +; Enables or disables file search in include_path optimization +;opcache.revalidate_path=0 + +; If disabled, all PHPDoc comments are dropped from the code to reduce the +; size of the optimized code. +;opcache.save_comments=1 + +; If enabled, compilation warnings (including notices and deprecations) will +; be recorded and replayed each time a file is included. Otherwise, compilation +; warnings will only be emitted when the file is first cached. +;opcache.record_warnings=0 + +; Allow file existence override (file_exists, etc.) performance feature. +;opcache.enable_file_override=0 + +; A bitmask, where each bit enables or disables the appropriate OPcache +; passes +;opcache.optimization_level=0x7FFFBFFF + +;opcache.dups_fix=0 + +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files +; that should not be accelerated. The file format is to add each filename +; to a new line. The filename may be a full path or just a file prefix +; (i.e., /var/www/x blacklists all the files and directories in /var/www +; that start with 'x'). Line starting with a ; are ignored (comments). +;opcache.blacklist_filename= + +; Allows exclusion of large files from being cached. By default all files +; are cached. +;opcache.max_file_size=0 + +; Check the cache checksum each N requests. +; The default value of "0" means that the checks are disabled. +;opcache.consistency_checks=0 + +; How long to wait (in seconds) for a scheduled restart to begin if the cache +; is not being accessed. +;opcache.force_restart_timeout=180 + +; OPcache error_log file name. Empty string assumes "stderr". +;opcache.error_log= + +; All OPcache errors go to the Web server log. +; By default, only fatal errors (level 0) or errors (level 1) are logged. +; You can also enable warnings (level 2), info messages (level 3) or +; debug messages (level 4). +;opcache.log_verbosity_level=1 + +; Preferred Shared Memory back-end. Leave empty and let the system decide. +;opcache.preferred_memory_model= + +; Protect the shared memory from unexpected writing during script execution. +; Useful for internal debugging only. +;opcache.protect_memory=0 + +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Mapping base of shared memory segments (for Windows only). All the PHP +; processes have to map shared memory into the same address space. This +; directive allows to manually fix the "Unable to reattach to base address" +; errors. +;opcache.mmap_base= + +; Facilitates multiple OPcache instances per user (for Windows only). All PHP +; processes with the same cache ID and user share an OPcache instance. +;opcache.cache_id= + +; Enables and sets the second level cache directory. +; It should improve performance when SHM memory is full, at server restart or +; SHM reset. The default "" disables file based caching. +;opcache.file_cache= + +; Enables or disables opcode caching in shared memory. +;opcache.file_cache_only=0 + +; Enables or disables checksum validation when script loaded from file cache. +;opcache.file_cache_consistency_checks=1 + +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + +; Enables or disables copying of PHP code (text segment) into HUGE PAGES. +; This should improve performance, but requires appropriate OS configuration. +;opcache.huge_code_pages=1 + +; Validate cached file permissions. +;opcache.validate_permission=0 + +; Prevent name collisions in chroot'ed environment. +;opcache.validate_root=0 + +; If specified, it produces opcode dumps for debugging different stages of +; optimizations. +;opcache.opt_debug_level=0 + +; Specifies a PHP script that is going to be compiled and executed at server +; start-up. +; https://php.net/opcache.preload +;opcache.preload= + +; Preloading code as root is not allowed for security reasons. This directive +; facilitates to let the preloading to be run as another user. +; https://php.net/opcache.preload_user +;opcache.preload_user= + +; Prevents caching files that are less than this number of seconds old. It +; protects from caching of incompletely updated files. In case all file updates +; on your site are atomic, you may increase performance by setting it to "0". +;opcache.file_update_protection=2 + +; Absolute path used to store shared lockfiles (for *nix only). +;opcache.lockfile_path=/tmp + +[curl] +; A default value for the CURLOPT_CAINFO option. This is required to be an +; absolute path. +;curl.cainfo = + +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + +[ffi] +; FFI API restriction. Possible values: +; "preload" - enabled in CLI scripts and preloaded files (default) +; "false" - always disabled +; "true" - always enabled +;ffi.enable=preload + +; List of headers files to preload, wildcard patterns allowed. +;ffi.preload= \ No newline at end of file diff --git a/docker/socioboard/Dockerfile b/docker/socioboard/Dockerfile index b3b10cc7..3f82495c 100644 --- a/docker/socioboard/Dockerfile +++ b/docker/socioboard/Dockerfile @@ -3,30 +3,17 @@ LABEL maintainer="vaughngx4 (vaughng@pm.me)" WORKDIR / RUN mkdir -p /usr/socioboard/app RUN apk add --no-cache --upgrade \ + php8 \ + php8-common \ + php8-cli \ + php8-mysqli \ openssl \ ca-certificates \ su-exec \ bash \ - jq \ - apache2 \ - apache2-utils \ - php8 \ - php8-session \ - php8-dom \ - php8-tokenizer \ - php8-fileinfo \ - php8-apache2 \ - php8-mysqli \ - php8-opcache \ - php8-common \ - php8-cli \ - php8-curl \ - php8-xml \ - php8-xmlwriter \ - composer + jq WORKDIR /usr/socioboard/app COPY ./socioboard-api/ ./socioboard-api -COPY ./socioboard-web-php/ ./socioboard-web-php RUN cd /usr/socioboard/app/socioboard-api/User && npm install && \ cd ../Feeds && npm install && \ cd ../Common && npm install && \ @@ -34,7 +21,6 @@ RUN cd /usr/socioboard/app/socioboard-api/User && npm install && \ cd ../Publish && npm install && \ cd ../Notification && npm install && \ cd ../Admin && npm install -RUN cd ./socioboard-web-php && composer install RUN chown -R node /usr/socioboard/app COPY ./sql-ping.php /sql-ping.php COPY ./entrypoint.sh /docker-entrypoint.sh diff --git a/docker/socioboard/entrypoint.sh b/docker/socioboard/entrypoint.sh index 55aced92..edd9bf12 100755 --- a/docker/socioboard/entrypoint.sh +++ b/docker/socioboard/entrypoint.sh @@ -30,7 +30,6 @@ done cd /usr/socioboard/app/ echo "Starting API" npm i pm2 -g && \ -export NODE_ENV=development && \ cd ./socioboard-api/User && su-exec node pm2 start user.server.js && \ cd ../Feeds && su-exec node pm2 start feeds.server.js && \ cd ../Publish && su-exec node pm2 start publish.server.js && \ @@ -38,10 +37,4 @@ cd ../Notification && su-exec node pm2 start notify.server.js && \ cd ../Update && su-exec node pm2 start update.server.js && \ cd ../Admin && su-exec node pm2 start admin.server.js -# start frontend -echo "Starting Frontend" -cd /usr/socioboard/app/socioboard-web-php -php8 artisan key:generate -su-exec node php8 artisan serve --host=0.0.0.0 --port=8000 -echo "Running" tail -f > /dev/null diff --git a/docker/socioboard/init.sh b/docker/socioboard/init.sh index 7be05c6f..777757e7 100755 --- a/docker/socioboard/init.sh +++ b/docker/socioboard/init.sh @@ -8,13 +8,7 @@ config=$(echo $config | jq --arg a "$SQL_DB_PASS" '.development.password = $a') config=$(echo $config | jq --arg a "socioboard-mysql" '.development.host = $a') rm -f config.json echo $config > config.json - -# if non standard https port, change URL scheme, else leave blank -port="" -while [[ $HTTPS_PORT != "443" ]];do - port=":$HTTPS_PORT" - break; -done +sed -i "s;development;production;g" config.json # apply configs to config files cd / @@ -25,23 +19,26 @@ cd / ./config.sh "/usr/socioboard/app/socioboard-api/Publish/config/development.json" ./config.sh "/usr/socioboard/app/socioboard-api/Admin/config/development.json" -cd /usr/socioboard/app/socioboard-web-php/ -cp example.env .env -sed -i "s;<>;${LARAVEL_KEY};g" .env -sed -i "s;APP_ENV=local;APP_ENV=development;g" .env -sed -i "s;<>;https://socio.${BASE_DOMAIN}${port}/;g" .env -sed -i "s;<>;https://socio-api.${BASE_DOMAIN}${port}/;g" .env -sed -i "s;<>;https://socio-feeds.${BASE_DOMAIN}${port}/;g" .env -sed -i "s;<>;https://socio-publish.${BASE_DOMAIN}${port}/;g" .env -sed -i "s;<>;https://socio-update.${BASE_DOMAIN}${port}/;g" .env -sed -i "s;<>;https://socio-notifications.${BASE_DOMAIN}${port}/;g" .env +# rename config files +cd /usr/socioboard/app/socioboard-api +cd ./User/config +mv development.json production.json +cd ../../Update/config +mv development.json production.json +cd ../../Feeds/config +mv development.json production.json +cd ../../Notification/config +mv development.json production.json +cd ../../Publish/config +mv development.json production.json +cd ../../Admin/config +mv development.json production.json # init mysql db while [ ! -e "/data/db.init" ];do echo "Initializing MySQL Database" cd /usr/socioboard/app/socioboard-api/Common/Sequelize-cli dbi=$(ls seeders | grep '[0-9]*initialize_application_informations.cjs') - export NODE_ENV=development && \ su-exec node npx sequelize-cli db:migrate && \ su-exec node npx sequelize-cli db:seed --seed seeders/$dbi && \ touch /data/db.init From 5008da19a1a901d4271308080df282f84e8ba6be Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Mon, 8 Aug 2022 06:54:22 +0200 Subject: [PATCH 10/12] Fixed Dashboard Prompts - Fixed dashboard prompts(grammar, capitalisation and some information) --- .../Http/Controllers/DashboardController.php | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/socioboard-web-php/Modules/Home/Http/Controllers/DashboardController.php b/socioboard-web-php/Modules/Home/Http/Controllers/DashboardController.php index 8158dd16..5f057e54 100644 --- a/socioboard-web-php/Modules/Home/Http/Controllers/DashboardController.php +++ b/socioboard-web-php/Modules/Home/Http/Controllers/DashboardController.php @@ -257,13 +257,13 @@ public function addTwitterCallback(Request $request) $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { Session::forget('twitterChecked'); - return redirect('dashboard')->with("success", 'Added Account Successfully'); + return redirect('dashboard')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { Session::forget('twitterChecked'); return redirect('dashboard')->with("failed", $response['data']->error); } else { Session::forget('twitterChecked'); - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { Session::forget('twitterChecked'); @@ -290,11 +290,11 @@ public function addFacebookCallback(Request $request) $apiUrl = ApiConfig::get('/socialaccount/add-social-profile?state=' . session::get('state') . '&code=' . $request['code']); $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { - return redirect('dashboard')->with("success", 'Added Account Successfully'); + return redirect('dashboard')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addFacebookCallback() {DashboardController}'); @@ -318,17 +318,17 @@ public function addLinkedInCallback(Request $request) $apiUrl = ApiConfig::get('/socialaccount/add-social-profile?state=' . session::get('state') . '&code=' . $request['code']); $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { - return redirect('dashboard')->with("success", 'Added Account Successfully'); + return redirect('dashboard')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else if ($response['data']->code === 401) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addLinkedInCallback() {DashboardController}'); - return redirect('dashboard')->with(["failed" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["failed" => 'An error occurred! Please reload the page.']); } } @@ -349,7 +349,7 @@ public function addFacebookPageCallBack(Request $request) $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { if (count($response['data']->pages) === count($response['data']->availablePages)) { - return redirect('dashboard')->with("failed", "Facebook Pages have Already added!"); + return redirect('dashboard')->with("failed", "Facebook pages have already been added, or none are available."); } else { Session::put('pages', $response['data']->pages); return redirect('dashboard'); @@ -357,7 +357,7 @@ public function addFacebookPageCallBack(Request $request) } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addFacebookPageCallBack() {DashboardController}'); @@ -428,15 +428,15 @@ public function addInstagramCallback(Request $request) $apiUrl = ApiConfig::get('/socialaccount/add-social-profile?state=' . session::get('state') . '&code=' . $request['code']); $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { - return redirect('dashboard')->with("success", 'Added Account Successfully'); + return redirect('dashboard')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addLinkedInCallback() {DashboardController}'); - return redirect('dashboard')->with(["Errormessage" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["Errormessage" => 'An error occurred! Please reload the page.']); } } @@ -451,7 +451,7 @@ public function addInstagramBusinessCallback(Request $request) if ($response['data']->code === 200) { if (count($response['data']->pages) > 0) { if (count($response['data']->pages) === count($response['data']->availablePages)) { - return redirect('dashboard')->with("failed", "Instagram business accounts have already been added by you or other users of SocioBoard"); + return redirect('dashboard')->with("failed", "Instagram business accounts have already been added, or none are available."); } else { Session::put('instagramPages', $response['data']->pages); return redirect('dashboard'); @@ -462,7 +462,7 @@ public function addInstagramBusinessCallback(Request $request) } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addInstagramBusinessCallback() {DashboardController}'); @@ -483,7 +483,7 @@ function addLinkedInPagesCallback(Request $request) if ($response['data']->code === 200) { if (count($response['data']->company) > 0) { if (count($response['data']->company) === count($response['data']->availablePages)) { - return redirect('dashboard')->with("failed", "LinkedIn Pages have Already added!"); + return redirect('dashboard')->with("failed", "LinkedIn pages have already been added, or none are available."); } else { Session::put('LinkedInpages', $response['data']->company); return redirect('dashboard'); @@ -496,11 +496,11 @@ function addLinkedInPagesCallback(Request $request) } else if ($response['data']->code === 403) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addLinkedInCallback() {DashboardController}'); - return redirect('dashboard')->with(["failed" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["failed" => 'An error occurred! Please reload the page.']); } } } @@ -511,15 +511,15 @@ function addBitlyCallback(Request $request) $apiUrl = ApiConfig::get('/socialaccount/add-social-profile?state=' . session::get('state') . '&code=' . $request['code']); $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { - return redirect('shortening-links')->with("success", 'Added Account Successfully'); + return redirect('shortening-links')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { return redirect('shortening-links')->with("failed", $response['data']->error); } else { - return redirect('shortening-links')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('shortening-links')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addBitlyCallback() {DashboardController}'); - return redirect('shortening-links')->with(["Errormessage" => 'Some Error Occurred please,reload the page']); + return redirect('shortening-links')->with(["Errormessage" => 'An error occurred! Please reload the page.']); } } @@ -644,7 +644,7 @@ public function recentActivities() $response = $this->helper->postApiCallWithAuth('post', $apiUrl); return $this->helper->responseHandler($response['data']); } catch (Exception $e) { - return redirect('dashboard')->with(["Errormessage" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["Errormessage" => 'An error occurred! Please reload the page.']); } } @@ -678,7 +678,7 @@ public function getScheduledReportsDashboard(Request $request) $result['data'] = $this->helper->responseHandler($response['data']); return $result; } catch (Exception $e) { - return redirect('dashboard')->with(["Errormessage" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["Errormessage" => 'An error occurred! Please reload the page.']); } } @@ -719,7 +719,7 @@ public function getTeamCounts() return $teamDetail; } } catch (Exception $e) { - return redirect('dashboard')->with(["Errormessage" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["Errormessage" => 'An error occurred! Please reload the page.']); } } @@ -1262,7 +1262,7 @@ function addAccountUsingCallback(Request $request) } else if ($response['data']->code === 400) { return view('home::thankYouPage')->with("failed", $response['data']->error); } else { - return view('home::thankYouPage')->with("failed", 'Some Error Occurred please,reload the page'); + return view('home::thankYouPage')->with("failed", 'An error occurred! Please reload the page.'); } } catch (\Exception $e) { return $this->helper->errorHandler($e->getLine(), $e->getCode(), $e->getMessage(), 'addAccountUsingCallback() {DashboardController}'); @@ -1282,7 +1282,7 @@ function addFacebookInviteCallback(Request $request) } else if ($response['code'] === 400) { return view('home::thankYouPage')->with("failed", $response['error']); } else { - return view('home::thankYouPage')->with("failed", 'Some Error Occurred please,reload the page'); + return view('home::thankYouPage')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addFacebookCallback() {DashboardController}'); @@ -1377,7 +1377,7 @@ public function addinstagramBusinessCallbackInvite(Request $request) if ($response['code'] === 200) { if (count($response['pages']) > 0) { if (count($response['pages']) === count($response['availablePages'])) { - return view('home::thankYouPage')->with(["failed" => "Instagram businees accounts have Already added!", 'instagramPageValue' => $inp]); + return view('home::thankYouPage')->with(["failed" => "Instagram businees accounts have already been added, or none are available.", 'instagramPageValue' => $inp]); } else { $inp = 1; Session::put('instaPages', $response['pages']); @@ -1548,7 +1548,7 @@ function addLinkedInPagesCallbackInvite(Request $request) if ($response['code'] === 200) { if (count($response['company']) > 0) { if (count($response['company']) === count($response['availablePages'])) { - return view('home::thankYouPage')->with(["failed" => "LinkedIn pages accounts have Already added!", 'linkedInPageValue' => $inp]); + return view('home::thankYouPage')->with(["failed" => "LinkedIn pages have already been added, or none are available.", 'linkedInPageValue' => $inp]); } else { $inp = 1; Session::put('linkedInPages', $response['company']); @@ -1581,7 +1581,7 @@ function addFaceboookPagesCallbackInvite(Request $request) if ($response['code'] === 200) { if (count($response['pages']) > 0) { if (count($response['pages']) === count($response['availablePages'])) { - return view('home::thankYouPage')->with(["failed" => "Facebook pages accounts have Already added!", 'facebookPageValue' => $inp]); + return view('home::thankYouPage')->with(["failed" => "Facebook pages have already been added, or none are available.", 'facebookPageValue' => $inp]); } else { $inp = 1; Session::put('FbInvitePages', $response['pages']); @@ -1848,7 +1848,7 @@ function addTumblrCallback(Request $request) $response = $this->helper->postApiCallWithAuth('post', $apiUrl2); if ($response['data']->code === 200) { if (count($response['data']->blogs) === count($response['data']->availableBlogs)) { - return redirect('view-accounts')->with("failed", "Tumblr Blogged Accounts have Already added!"); + return redirect('view-accounts')->with("failed", "Tumblr accounts have already been added, or none are available."); } else { Session::put('blogs', $response['data']->blogs); return redirect('view-accounts'); @@ -1856,7 +1856,7 @@ function addTumblrCallback(Request $request) } else if ($response['data']->code === 400) { return redirect('view-accounts')->with("failed", $response['data']->error); } else { - return redirect('view-accounts')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('view-accounts')->with("failed", 'An error occurred! Please reload the page.'); } } catch (\Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addTumblrCallback() {DashboardController}'); @@ -1944,15 +1944,15 @@ function addPinterestCallback(Request $request) $apiUrl = ApiConfig::get('/socialaccount/add-social-profile?state=' . session::get('state') . '&code=' . $request['code']); $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { - return redirect('dashboard')->with("success", 'Added Account Successfully'); + return redirect('dashboard')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addPinterestCallback() {DashboardController}'); - return redirect('dashboard')->with(["Errormessage" => 'Some Error Occurred please,reload the page']); + return redirect('dashboard')->with(["Errormessage" => 'An error occurred! Please reload the page.']); } } @@ -1970,11 +1970,11 @@ function addTikTokCallBack(Request $request) $apiUrl = ApiConfig::get('/socialaccount/add-social-profile?state=' . $state . '&code=' . $code . '&flag=1'); $response = $this->helper->postApiCallWithAuth('post', $apiUrl); if ($response['data']->code === 200) { - return redirect('dashboard')->with("success", 'Account Added Successfully'); + return redirect('dashboard')->with("success", 'Account added successfully!'); } else if ($response['data']->code === 400) { return redirect('dashboard')->with("failed", $response['data']->error); } else { - return redirect('dashboard')->with("failed", 'Some Error Occurred please,reload the page'); + return redirect('dashboard')->with("failed", 'An error occurred! Please reload the page.'); } } catch (\Exception $e) { $this->helper->logException($e->getLine(), $e->getCode(), $e->getMessage(), 'addTikTokCallBack() {DashboardController}'); From 9ed05f70f237728a76babb6cf37563c02cf5f624 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Mon, 8 Aug 2022 15:30:31 +0200 Subject: [PATCH 11/12] Minor Docker Fixes - Default mail title change - Removed some old code --- docker/socioboard/config.sh | 2 +- docker/socioboard/entrypoint.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/socioboard/config.sh b/docker/socioboard/config.sh index 4b18229d..f361dd07 100755 --- a/docker/socioboard/config.sh +++ b/docker/socioboard/config.sh @@ -76,7 +76,7 @@ while [[ $(echo $config | jq '.jest') != 'null' ]];do done # mail titles while [[ $(echo $config | jq '.mailTitles') != 'null' ]];do - config=$(echo $config | jq --arg a "Activation link" '.mailTitles.activation_link = $a') + config=$(echo $config | jq --arg a "Account Activation" '.mailTitles.activation_link = $a') config=$(echo $config | jq --arg a "Invitation from SocioBoard to Add Account" '.mailTitles.Invitation_user = $a') config=$(echo $config | jq --arg a "Reset Password" '.mailTitles.forgot_password_request = $a') config=$(echo $config | jq --arg a "Payment Invoice" '.mailTitles.payment_invoice = $a') diff --git a/docker/socioboard/entrypoint.sh b/docker/socioboard/entrypoint.sh index edd9bf12..d4ef04e7 100755 --- a/docker/socioboard/entrypoint.sh +++ b/docker/socioboard/entrypoint.sh @@ -10,8 +10,6 @@ ready="" while [[ $(echo $ready | grep -o 'Ready') != 'Ready' ]];do echo "Waiting for MySQL database to be ready" ready=$(php8 /sql-ping.php) -# echo "Latest response:" -# echo $ready sleep 5; done echo "MySQL database is ready" From ef75d98309dca86ee57f245d012af90365de4d30 Mon Sep 17 00:00:00 2001 From: vaughngx4 <72740493+vaughngx4@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:09:54 +0200 Subject: [PATCH 12/12] Fixed Ansible Issues - Fixed yum repo permissions - Fixed order of roles in playbook --- ansible/roles/socio-docker/tasks/redhat.yml | 4 ++-- ansible/socioboard-deploy.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/socio-docker/tasks/redhat.yml b/ansible/roles/socio-docker/tasks/redhat.yml index 686f6c76..5fb2bbe7 100644 --- a/ansible/roles/socio-docker/tasks/redhat.yml +++ b/ansible/roles/socio-docker/tasks/redhat.yml @@ -4,8 +4,8 @@ ansible.builtin.template: src: "{{ role_path }}/files/yum.repos.d/docker-ce-centos.repo" dest: "/etc/yum.repos.d/docker-ce.repo" - owner: "{{ socioboard_user_username }}" - group: "{{ socioboard_user_groupname }}" + owner: "root" + group: "root" mode: 0644 - name: Ensure Docker's RPM key is trusted (RHEL) diff --git a/ansible/socioboard-deploy.yml b/ansible/socioboard-deploy.yml index 2dd223c1..480ae8e6 100755 --- a/ansible/socioboard-deploy.yml +++ b/ansible/socioboard-deploy.yml @@ -7,6 +7,6 @@ vars_files: - vars/config.yml roles: - - socio-env - socio-docker + - socio-env - socio-base