Merge pull request #256 from OpenFactorioServerManager/develop

Update 0.10.0

Author: knoxfighter

.github/workflows/create-release-workflow.yml

@@ -8,6 +8,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
       - uses: actions/setup-go@v2
+      - name: Install mingw-w64
+        run: sudo apt-get update && sudo apt-get install gcc-multilib g++-multilib gcc-mingw-w64 g++-mingw-w64
       - name: Get git tag
         id: tag_name
         uses: little-core-labs/[email protected]

.github/workflows/test-workflow.yml

@@ -60,9 +60,10 @@ jobs:
   docker-push:
     needs:  [test-npm, test-go]
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+    if: github.event_name == 'push' && github.ref != 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
+      - uses: rlespinasse/[email protected]
       - uses: actions/setup-node@v1
       - uses: actions/setup-go@v2
       - uses: docker/setup-buildx-action@v1
@@ -78,4 +79,4 @@ jobs:
           context: ./docker/
           file: ./docker/Dockerfile-local
           push: true
-          tags: ofsm/ofsm:develop
+          tags: ofsm/ofsm:${{ env.GITHUB_REF_SLUG }}

.gitignore

@@ -1,8 +1,8 @@
 node_modules/
 dev/
 dev_packs/
-/factorio-server-manager*
-/factorio_server_manager*
+factorio-server-manager*
+factorio_server_manager*
 auth.leveldb*
 conf.json
 *.exe
@@ -18,3 +18,4 @@ mix-manifest.json
 /app/*.css*
 .vscode
 .env
+*.db

CHANGELOG.md

@@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Unreleased]
+
+## [0.10.0] - 2021-02-10
+### Added
+- Config files can be defined with absolute paths. - Thanks to @FoxAmes
+- Support for >= 1.1.14 factorio saves - Thanks to @knoxfighter
+- Setting in `info.json` to allow usage without ssl/tls - Thanks to @knoxfighter
+
+### Changed
+- Rework of the authentication, to have a bit more security. - Thanks to @knoxfighter
+- Changed from leveldb to sqlite3 as backend database. - Thanks to @knoxfighter
+- generate new random passwords, if no exist, or if they are "factorio". - Thanks to @knoxfighter
+- Use "OpenFactorioServerManager" instead of "mroote" as go package name. - Thanks to @mroote
+- Disable mods-page, while server is running - Thanks to @knoxfighter
+- Renamed GO-package from `mroote` to `OpenFactorioServerManager` to match git repo - Thanks to @mroote
+
+### Fixed
+- old factorio versions depended by mods always shown as compatible - Thanks to @knoxfighter
+- Crosscompilation with mingw-w64 on linux. (Broke with sqlite3) - Thanks to @knoxfighter
+- Crash on async writing to websocket room array. - Thanks to @knoxfighter
+
 ## [0.9.0] - 2021-01-07
 ### Added
 - Autostart factorio, when starting the server-manager - Thanks to @Psychomantis71
@@ -13,7 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Rework of the docker image, so it allows easy updating of factorio - Thanks to @ita-sammann
 
 ### Fixed
-- Console page is now working correctly (directly reloading still bugged until new UI) - Thanks to @jannaahs
+- Console page is now working correctly - Thanks to @jannaahs
 - Mod Search fixed by new implementation, which does not rely on the search endpoint of the mod portal - Thanks to @jannaahs
 - Listen on port 80, previously port 8080 was used. Can be changed with `--port <port>`
 - Update version numbers in Docker containers

Makefile

@@ -18,6 +18,7 @@ build/factorio-server-manager-%.zip: clean app/bundle factorio-server-manager-%
 	@cp -r app/ factorio-server-manager/
 	@cp conf.json.example factorio-server-manager/conf.json
 	@zip -r $@ factorio-server-manager > /dev/null
+	@rm -r factorio-server-manager/
 
 app/bundle:
 	@echo "Building Frontend"
@@ -27,13 +28,13 @@ factorio-server-manager-linux:
 	@echo "Building Backend - Linux"
 	@mkdir -p factorio-server-manager
 	@cd src; \
-	GO111MODULE=on GOOS=linux GOARCH=amd64 go build -ldflags="-extldflags=-static" -o ../factorio-server-manager/factorio-server-manager .
+	CGO_ENABLED=1 GO111MODULE=on GOOS=linux GOARCH=amd64 go build -ldflags="-extldflags=-static" -o ../factorio-server-manager/factorio-server-manager .
 
 factorio-server-manager-windows:
 	@echo "Building Backend - Windows"
 	@mkdir -p factorio-server-manager
 	@cd src; \
-	GO111MODULE=on GOOS=windows GOARCH=386 go build -ldflags="-extldflags=-static" -o ../factorio-server-manager/factorio-server-manager.exe .
+	GO111MODULE=on GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -ldflags="-extldflags=-static" -o ../factorio-server-manager/factorio-server-manager.exe .
 
 gen_release: build/factorio-server-manager-linux.zip build/factorio-server-manager-windows.zip
 	@echo "Done"

conf.json.example

@@ -1,9 +1,7 @@
 {
-    "username": "admin",
-    "password": "factorio",
-    "database_file": "auth.leveldb",
-    "cookie_encryption_key": "topsecretkey",
-    "settings_file": "server-settings.json",
-    "log_file": "factorio-server-manager.log",
-    "rcon_pass": "factorio_rcon"
+	"rcon_pass": "",
+	"sq_lite_database_file": "sqlite.db",
+	"cookie_encryption_key": "",
+	"settings_file": "server-settings.json",
+	"log_file": "factorio-server-manager.log"
 }

docker/.env

@@ -1,6 +1,3 @@
-ADMIN_USER=admin
-ADMIN_PASS=factorio
 RCON_PASS=
-COOKIE_ENCRYPTION_KEY=
 DOMAIN_NAME=<YOUR DOMAIN NAME>
 EMAIL_ADDRESS=<YOUR EMAIL ADDRESS>

docker/Dockerfile

@@ -2,11 +2,8 @@
 FROM frolvlad/alpine-glibc
 
 ENV FACTORIO_VERSION=stable \
-    MANAGER_VERSION=0.9.0 \
-    ADMIN_USER=admin \
-    ADMIN_PASS=factorio \
-    RCON_PASS="" \
-    COOKIE_ENCRYPTION_KEY=""
+    MANAGER_VERSION=0.10.0 \
+    RCON_PASS=""
 
 VOLUME /opt/fsm-data /opt/factorio/saves /opt/factorio/mods /opt/factorio/config
 

docker/Dockerfile-build

@@ -1,21 +1,22 @@
 FROM alpine:latest as build
 
-RUN apk add --no-cache git make musl-dev go nodejs npm zip
+RUN apk add --no-cache git make musl-dev go nodejs npm zip mingw-w64-gcc
 
-ENV FACTORIO_BRANCH=develop
 ENV GOROOT /usr/lib/go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 ENV FACTORIO_ROOT /go/src/factorio-server-manager
 
-COPY build-release.sh /usr/local/bin/build-release.sh
+COPY docker/build-release.sh /usr/local/bin/build-release.sh
+COPY ./ $FACTORIO_ROOT
 
 RUN mkdir -p ${GOPATH}/bin
 RUN chmod u+x /usr/local/bin/build-release.sh
 
 WORKDIR $FACTORIO_ROOT
 
 VOLUME /build
+VOLUME $FACTORIO_ROOT
 
 RUN ["/usr/local/bin/build-release.sh"]
 

docker/Dockerfile-local

@@ -2,10 +2,7 @@
 FROM frolvlad/alpine-glibc
 
 ENV FACTORIO_VERSION=latest \
-    ADMIN_USER=admin \
-    ADMIN_PASS=factorio \
-    RCON_PASS="" \
-    COOKIE_ENCRYPTION_KEY=""
+    RCON_PASS=""
 
 VOLUME /opt/fsm-data /opt/factorio/saves /opt/factorio/mods /opt/factorio/config