Merge branch 'master' into develop

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,50 +0,0 @@
----
-name: Bug Report
-about: Found a bug? Raise a report.
-title: "[BUG]"
-labels: "type: bug"
-assignees: ""
----
-
-Issues raised here are **ONLY** for:
-
--   LinuxGSM bugs.
--   Feature suggestions.
--   Code contributions.
-
-Issues raised here are **NOT** for:
-
--   General support.
--   Specific game server issues (e.g CS:GO, TF2).
--   Dedicated server issues (e.g Ubuntu, CentOS).
--   Anything not directly related to LinuxGSM development.
-
-For general support visit the **[LinuxGSM-Support](https://linuxgsm.com/support)**.
-
-**_Please use the template below, deleting the above text_**
-
-## User Story
-
-As a [user description], I want [desired action] so that [desired outcome].
-
-## Basic info
-
--   **Distro:** [Ubuntu 18.04]
--   **Game:** [Garry's Mod]
--   **Command:** [Monitor]
--   **LinuxGSM version:** [v20.1.3]
-
-## Further Information
-
-A clear description of what the bug is and any ideas on how to resolve it. Plus any further context that might be relevant to the issue.
-
-## To Reproduce
-
-Steps to reproduce the behaviour:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected behaviour

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,95 @@
+---
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["type: bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: user-story
+    attributes:
+      label: User story
+      description: As a [user description], I want [desired action] so that [desired outcome].
+      placeholder: As a [user description], I want [desired action] so that [desired outcome].
+    validations:
+      required: true
+  - type: input
+    id: game
+    attributes:
+      label: Game
+      description: What game server are you hosting?
+      placeholder: Valheim
+    validations:
+      required: true
+  - type: dropdown
+    id: distro
+    attributes:
+      label: Linux distro
+      multiple: true
+      options:
+        - Ubuntu 22.04
+        - Ubuntu 20.04
+        - Ubuntu 18.04
+        - Ubuntu 16.04
+        - Debian 11
+        - Debian 10
+        - Debian 9
+        - RedHat 9
+        - RedHat 8
+        - RedHat 7
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: command
+    attributes:
+      label: Command
+      multiple: true
+      options:
+        - "command: start"
+        - "command: stop"
+        - "command: restart"
+        - "command: monitor"
+        - "command: details"
+        - "command: update"
+        - "command: validate"
+        - "command: backup"
+        - "command: mods-install"
+        - "command: mods-update"
+        - "command: mods-remove"
+        - "command: debug"
+        - "command: console"
+        - "command: install"
+        - "command: auto-update"
+        - "command: update-lgsm"
+        - "command: wipe"
+        - "command: send"
+    validations:
+      required: true
+  - type: textarea
+    id: further-info
+    attributes:
+      label: Further information
+      description: A clear description of what the bug is, any ideas on how to resolve it and any further context that might be relevant to the issue.
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behaviour.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    about: Ask questions and discuss with other users of LinuxGSM.
+    url: https://github.com/GameServerManagers/LinuxGSM/discussions
+  - name: Discord Server
+    about: Join the LinuxGSM Discord community server. Discuss your LinuxGSM setup, get help and advice
+    url: https://linuxgsm.com/discord

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,43 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for LinuxGSM.
-title: "[FEATURE]"
-labels: "type: feature request"
-assignees: ""
----
-
-Issues raised here are **ONLY** for:
-
--   LinuxGSM bugs.
--   Feature suggestions.
--   Code contributions.
-
-Issues raised here are **NOT** for:
-
--   General support.
--   Specific game server issues (e.g CS:GO, TF2).
--   Dedicated server issues (e.g Ubuntu, CentOS).
--   Anything not directly related to LinuxGSM development.
-
-For general support visit the **[LinuxGSM Support](https://linuxgsm.com/support)** page.
-
-**_Please use the template below, deleting the above text_**
-
-## User Story
-
-As a [user description], I want [desired action] so that [desired outcome].
-
-## Basic info
-
--   **Distro:** [Ubuntu 20.04]
--   **Game:** [Garry's Mod]
--   **Command:** [Monitor]
--   **LinuxGSM version:** [v20.1.3]
-
-## Further Information
-
-A clear description of what the feature is and any ideas on how to achieve this.
-
-## Further Reading
-
-Provide any useful documentation or resources that might help.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,78 @@
+---
+name: Feature Request
+description: Suggest a feature
+title: "[Feature]: "
+labels: ["type: feature"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+  - type: input
+    id: user-story
+    attributes:
+      label: User story
+      description: As a [user description], I want [desired action] so that [desired outcome].
+      placeholder: As a [user description], I want [desired action] so that [desired outcome].
+    validations:
+      required: true
+  - type: input
+    id: game
+    attributes:
+      label: Game
+      description: What game server are you hosting?
+      placeholder: Valheim
+    validations:
+      required: false
+  - type: dropdown
+    id: distro
+    attributes:
+      label: Linux distro
+      multiple: true
+      options:
+        - Ubuntu 22.04
+        - Ubuntu 20.04
+        - Ubuntu 18.04
+        - Ubuntu 16.04
+        - Debian 11
+        - Debian 10
+        - Debian 9
+        - RedHat 9
+        - RedHat 8
+        - RedHat 7
+        - Other
+    validations:
+      required: false
+  - type: dropdown
+    id: command
+    attributes:
+      label: Command
+      multiple: true
+      options:
+        - "command: start"
+        - "command: stop"
+        - "command: restart"
+        - "command: monitor"
+        - "command: details"
+        - "command: update"
+        - "command: validate"
+        - "command: backup"
+        - "command: mods-install"
+        - "command: mods-update"
+        - "command: mods-remove"
+        - "command: debug"
+        - "command: console"
+        - "command: install"
+        - "command: auto-update"
+        - "command: update-lgsm"
+        - "command: wipe"
+        - "command: send"
+    validations:
+      required: true
+  - type: textarea
+    id: further-info
+    attributes:
+      label: Further information
+      description: A clear description of what the feature is and any ideas on how to achieve this.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/new-server-request.md

@@ -1,31 +0,0 @@
----
-name: New Server Request
-about: Suggest a new game server to be added.
-title: "[Server Request]"
-labels: "type: game server request"
-assignees: ""
----
-
-## What game server would you like to add?
-
-[game server]
-
-## Can you link to any tutorials or guides?
-
-Provide any useful documentation or resources that might help.
-
-## Is the server on Steam?
-
--   [ ] Yes
--   [ ] No
-
-If yes Use SteamDB to get the appid. (https://steamdb.info).
-
-[appid]
-
-## Is the server supported on Linux?
-
-We only support Linux servers and do **not** support Wine.
-
--   [ ] Yes
--   [ ] No

.github/ISSUE_TEMPLATE/server_request.yml

@@ -0,0 +1,57 @@
+---
+name: Server Request
+description: Suggest a new game server to be added
+title: "[Server Request]: "
+labels: ["type: game server request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this game server!
+  - type: input
+    id: game-server
+    attributes:
+      label: Game server
+      description: What game server would you like to add?
+    validations:
+      required: true
+  - type: checkboxes
+    id: on-linux
+    attributes:
+      label: Linux support
+      description: Does this game server have Linux support? (not wine)
+      options:
+        - label: "Yes"
+    validations:
+      required: true
+  - type: dropdown
+    id: on-steam
+    attributes:
+      label: Steam
+      description: Is this game server available on Steam?
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+  - type: input
+    id: steam-id
+    attributes:
+      label: Steam appid
+      description: What is the Steam appid of the game server? Use SteamDB to get the appid. (https://steamdb.info).
+      placeholder: "892970"
+    validations:
+      required: false
+  - type: textarea
+    id: guides
+    attributes:
+      label: Guides
+      description: Links to guides on how to install the game server
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

.github/labeler.yml

@@ -1,53 +1,45 @@
-# Add/remove 'critical' label if issue contains the words 'urgent' or 'critical'
-# Type
-"type: game server request":
-  - "/(Server Request)/i"
-"type: bug":
-  - "/(bug)/i"
-"type: feature request":
-  - "/(feature)/i"
-# Commands
 "command: backup":
   - "/(backup)/i"
 "command: console":
   - "/(console|tmux)/i"
 "command: debug":
-  - "/(debug)/i"
+  - "/(command: debug)/i"
 "command: details":
-  - "/(details)/i"
+  - "/(command: details)/i"
 "command: fast-dl":
   - "/(fast-dl|fastdl)/i"
 "command: install":
   - "/(install)/i"
 "command: mods":
-  - "/(mods)/i"
+  - "/(command: mods)/i"
 "command: monitor":
-  - "/(monitor)/i"
+  - "/(command: monitor)/i"
 "command: post-details":
-  - "/(post-details)/i"
+  - "/(command: post-details)/i"
 "command: restart":
-  - "/(restart)/i"
+  - "/(command: restart)/i"
 "command: send":
-  - "/(send)/i"
+  - "/(command: send)/i"
 "command: skeleton":
-  - "/(skeleton)/i"
+  - "/(command: skeleton)/i"
 "command: start":
-  - "/(start)/i"
+  - "/(command: start)/i"
 "command: stop":
-  - "/(stop)/i"
+  - "/(command: stop)/i"
 "command: update-lgsm":
   - "/(update-lgsm)/i"
 "command: update":
-  - "/(update)/i"
+  - "/(command: update)/i"
 "command: validate":
   - "/(validate)/i"
 "command: wipe":
   - "/(wipe)/i"
+
 # Distros
 "distro: AlmaLinux":
   - "/(Alma)/i"
 "distro: Arch Linux":
-  - "/(Arch)/i"
+  - "/(Arch Linux)/i"
 "distro: CentOS":
   - "/(CentOS)/i"
 "distro: Debian":
@@ -62,6 +54,81 @@
   - "/(Slackware)/i"
 "distro: Ubuntu":
   - "/(Ubuntu)/i"
+
+# Games
+"game: 7 Days to Die":
+  - "/(7 Days to Die|sdtd)/i"
+"game: Ark: Survival Evolved":
+  - "/(Ark: Survival Evolved|Ark)/i"
+"game: ARMA 3":
+  - "/(ARMA 3|ARMA3)/i"
+"game: Assetto Corsa":
+  - "/(Assetto Corsa)/i"
+"game: Avorion":
+  - "/(Avorion)/i"
+"game: Ballistic Overkill":
+  - "/(Ballistic Overkill)/i"
+"game: Battalion 1944":
+  - "/(Battalion 1944)/i"
+"game: Barotrauma":
+  - "/(Barotrauma)/i"
+"game: Counter-Strike: Global Offensive":
+  - "/(Counter-Strike: Global Offensive|CS:GO|csgo)/i"
+"game: Counter-Strike: Source":
+  - "/(Counter-Strike: Source|CS:S)/i"
+"game: Counter-Strike 1.6":
+  - "/(Counter-Strike 1.6|Counter Strike 1.6|CS 1.6|cs1.6)/i"
+"game: Dayz":
+  - "/(Dayz)/i"
+"game: Don't Starve Together":
+  - "/(Don't Starve Together|Dont Starve Together|DST)/i"
+"game: Eco":
+  - "/(^Eco$)/i"
+"game: Factorio":
+  - "/(Factorio)/i"
+"game: Garry's Mod":
+  - "/(Garry's Mod|Garrys Mod|GMod)/i"
+"game: Insurgency: Sandstorm":
+  - "/(Insurgency: Sandstorm|Insurgency)/i"
+"game: Killing Floor 2":
+  - "/(Killing Floor 2|KF2)/i"
+"game: Left 4 Dead 2":
+  - "/(Left 4 Dead 2|L4D2)/i"
+"game: Minecraft":
+  - "/(minecraft)((?!bedrock).)*$/i"
+"game: Minecraft Bedrock":
+  - "/(Bedrock)/i"
+"game: Mumble":
+  - "/(Mumble)/i"
+"game: Project Zomboid":
+  - "/(Project Zomboid)/i"
+"game: Quake 3":
+  - "/(Quake 3|Q3A|q3)/i"
+"game: Rising World":
+  - "/(Rising World)/i"
+"game: Satisfactory":
+  - "/(Satisfactory)/i"
+"game: Squad":
+  - "/(Squad)/i"
+"game: Starbound":
+  - "/(Starbound)/i"
+"game: Stationeers":
+  - "/(Stationeers)/i"
+"game: Teamspeak 3":
+  - "/(Teamspeak 3|ts3)/i"
+"game: Rust":
+  - "/(Rust)/i"
+"game: Unturned":
+  - "/(Unturned)/i"
+"game: Unreal Tournament 99":
+  - "/(Unreal Tournament 99|ut99)/i"
+"game: Unreal Tournament 2004":
+  - "/(Unreal Tournament 2004|ut2k4)/i"
+"game: Unreal Tournament 3":
+  - "/(Unreal Tournament 3|ut3)/i"
+"game: Valheim":
+  - "/(Valheim)/i"
+
 # Info
 "info: alerts":
   - "/(alert)/i"
@@ -70,7 +137,7 @@
 "info: docker":
   - "/(docker)/i"
 "info: docs":
-  - "/(documentation|docs)/i"
+  - "/(documentation|^docs$)/i"
 "info: email":
   - "/(postfix|sendmail|exim|smtp)/i"
 "info: query":
@@ -83,16 +150,11 @@
   - "/(tmux)/i"
 "info: website":
   - "/(website)/i"
-# Games
+
-"game: Ark: Survival Evolved":
+# Type
-  - "/(Ark: Survival Evolved|Ark)/i"
+"type: game server request":
-"game: ARMA 3":
+  - "/(Server Request)/i"
-  - "/(ARMA 3)/i"
+"type: bug":
-"game: Assetto Corsa":
+  - "/(bug)/i"
-  - "/(Assetto Corsa)/i"
+"type: feature request":
-"game: Avorion":
+  - "/(feature)/i"
-  - "/(Avorion)/i"
-"game: Ballistic Overkill":
-  - "/(Ballistic Overkill)/i"
-"game: Barotrauma":
-  - "/(Barotrauma)/i"

.github/pull_request_template.md

@@ -7,7 +7,7 @@ Fixes #[issue]
 ## Type of change
 
 -   [ ] Bug fix (a change which fixes an issue).
--   [ ] New feature (change which adds functionality).
+-   [ ] New feature (a change which adds functionality).
 -   [ ] New Server (new server added).
 -   [ ] Refactor (restructures existing code).
 -   [ ] Comment update (typo, spelling, explanation, examples, etc).
@@ -18,12 +18,12 @@ PR will not be merged until all steps are complete.
 
 -   [ ] This pull request links to an issue.
 -   [ ] This pull request uses the `develop` branch as its base.
--   [ ] This pull request Subject follows the Conventional Commits standard.
+-   [ ] This pull request subject follows the Conventional Commits standard.
 -   [ ] This code follows the style guidelines of this project.
 -   [ ] I have performed a self-review of my code.
 -   [ ] I have checked that this code is commented where required.
--   [ ] I have provided a detailed with enough description of this PR.
+-   [ ] I have provided a detailed enough description of this PR.
--   [ ] I have checked If documentation needs updating.
+-   [ ] I have checked if documentation needs updating.
 
 ## Documentation
 

.github/workflows/create-release.yml

@@ -1,23 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    # branches to consider in the event; optional, defaults to all
-    branches:
-      - master
-permissions:
-  contents: read
-
-jobs:
-  update_release_draft:
-    permissions:
-      contents: write # for release-drafter/release-drafter to create a github release
-      pull-requests: write # for release-drafter/release-drafter to add label to PR
-    runs-on: ubuntu-latest
-    steps:
-      # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/[email protected]
-        with:
-          config-name: release-drafter.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/labeler.yml

@@ -2,6 +2,8 @@ name: "Issue Labeler"
 on:
   issues:
     types: [opened, edited]
+  pull_request:
+    types: [opened, edited]
 
 permissions:
   contents: read
@@ -13,9 +15,10 @@ jobs:
       issues: write # for github/issue-labeler to create or remove labels
     runs-on: ubuntu-latest
     steps:
-    - uses: github/[email protected]
+      - uses: github/[email protected]
-      with:
+        with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        configuration-path: .github/labeler.yml
+          configuration-path: .github/labeler.yml
-        not-before:
+          not-before:
-        enable-versioned-regex: 0
+          enable-versioned-regex: 0
+          include-title: 1

.github/workflows/potential-duplicates.yml

@@ -20,7 +20,7 @@ jobs:
           # Get issues with state to compare. Supported state: 'all', 'closed', 'open'.
           state: all
           # If similarity is higher than this threshold([0,1]), issue will be marked as duplicate.
-          threshold: 0.6
+          threshold: 0.8
           # Reactions to be add to comment when potential duplicates are detected.
           # Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes"
           #reactions: 'eyes, confused'

.github/workflows/trigger-docker-build.yml

@@ -1,8 +1,8 @@
 name: Trigger Docker Build
 on:
-  push:
+  release:
-    branches:
+    types:
-      - master
+      - published
 jobs:
   trigger_build_docker-linuxgsm:
     name: Trigger Build docker-linuxgsm