Merge pull request #466 from freehackquest/dev

v0.2.49

Author: sea5kg

.gitignore

@@ -82,5 +82,6 @@ fhq-server/fhq-server.debian95
 fhq-server
 
 contrib/docker_compose_example/logs/*.log
+contrib/docker_compose_example/data/logs/*.log
 contrib/docker_compose_example/mysql_data
 contrib/docker_compose_example/nginx/logs/*.log

CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to fhq-server project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.2.49] - 2022-08-28 (2022 Aug 28)
+
+### Added 
+
+- web-user: Few records to CTF WALL
+
+### Fixed 
+
+- Fixed contrib/docker_compose_example
+
+### Removed
+
+- web-user: Removed links to twitter
+
+### Security
+
+- web-user: few upgrades of dependency packages
+
 ## [v0.2.48] - 2022-01-09 (2022 Jan 9)
 
 ### Added 

Dockerfile.build-environment

@@ -7,7 +7,7 @@ LABEL "repository"="https://github.com/freehackquest/fhq-server"
 RUN apt-get update && \
     apt-get install -y curl
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x -o setup_node_16x.sh && bash setup_node_16x.sh
+RUN curl -sL https://deb.nodesource.com/setup_17.x -o setup_node_16x.sh && bash setup_node_16x.sh
 
 # basic libs
 RUN apt-get update && apt-get install -y --no-install-recommends \

contrib/docker_compose_example/conf.d/fhq-server.conf

@@ -0,0 +1,33 @@
+# fhq-server travis config
+
+## Database Configuration
+usemysql: yes
+storage_type: mysql
+dbhost: fhqserver_db
+dbname: fhqserver
+dbport: 3306
+dbuser: fhqserver
+dbpass: "VveGJemxFb"
+
+## Server configurations
+port: 1234
+ssl_on: no
+ssl_port: 4613
+ssl_key_file: /usr/share/fhq-server/ssl/test_fhqserver.key
+ssl_cert_file: /usr/share/fhq-server/ssl/test_fhqserver.crt
+
+# Web Configuration
+web_port: 7080
+web_max_threads: 4
+web_admin_folder: /usr/share/fhq-server/web-admin
+web_user_folder: /usr/share/fhq-server/web-user
+
+web_public_folder: /usr/share/fhq-server/public/
+web_public_folder_url: http://localhost:7080/public/
+
+# Jobs Pool Config
+jobs_fast_threads: 2
+jobs_slow_threads: 1
+
+# fhqjad-store
+web_fhqjad_store: ./fhqjad-store

contrib/docker_compose_example/data/config.yml

@@ -19,16 +19,12 @@ services:
     depends_on:
       - fhqserver_db
     image: sea5kg/fhq-server:latest
+    command: fhq-server -wd /opt/data start
     volumes:
-      - "./data/public:/usr/share/fhq-server/public"
-      - "./conf.d:/etc/fhq-server"
+      - "./data:/opt/data"
       - "./logs:/var/log/fhq-server"
       - "./ssl:/usr/share/fhq-server/ssl"
-      # - "./fhq-server_data/web_admin_conf/fhq.ws.config.js:/usr/share/fhq-server/web-admin/fhq.ws.config.js"
-      # - "./fhq-server_data/public:/usr/share/fhq-server/fhq-web-public"
-      # - "./fhq-server_data/fhqjad-store:/usr/share/fhq-server/fhqjad-store"
     ports:
-      - "1234:1234"
       - "4613:4613"
       - "7080:7080"
     restart: always

…b/docker_compose_example/data/.gitkeeper …ose_example/data/fhqjad-store/.gitkeepercontrib/docker_compose_example/data/.gitkeeper renamed to contrib/docker_compose_example/data/fhqjad-store/.gitkeeper contrib/docker_compose_example/data/.gitkeeper renamed to contrib/docker_compose_example/data/fhqjad-store/.gitkeeper

@@ -1,4 +1,4 @@
-FROM debian:buster-20210816
+FROM debian:buster-20220328
 LABEL "maintainer"="FreeHackQuest Team <freehackquest@gmail.com>"
 LABEL "repository"="https://github.com/freehackquest/fhq-server"
 

contrib/docker_compose_example/docker-compose.yml

@@ -1,7 +1,7 @@
 # Automaticly generated by wsjcpp@v0.2.2
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_APP_VERSION="v0.2.48")
+add_definitions(-DWSJCPP_APP_VERSION="v0.2.49")
 add_definitions(-DWSJCPP_APP_NAME="fhq-server")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

docker_dev/Dockerfile.dev

@@ -28,8 +28,6 @@ EmployMails::EmployMails()
         "\r\n"
         "Write message via e-mail to freehackquest@gmail.com\r\n"
         "Contact by Telegram: https://t.me/freehackquest\r\n"
-        "Follow in Twitter: https://twitter.com/freehackquest\r\n"
-        "Google+ Community: https://plus.google.com/communities/107112500285357136727\r\n"
     ).inDatabase();
 }