Merge branch 'main' into feat/e2e

Author: meumar-osec

.dependabot/config.yml

@@ -137,6 +137,7 @@ jobs:
 
   docker-build:
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'otter-sec/rctf'
     needs:
       - shellcheck
       - lint

CODE_OF_CONDUCT.md .github/CODE_OF_CONDUCT.mdCODE_OF_CONDUCT.md renamed to .github/CODE_OF_CONDUCT.md

@@ -1,7 +1,7 @@
 <img src="/assets/rctf-logotype-light-1024.png" width="350px">
 
-rCTF is redpwnCTF's CTF platform. It is developed and maintained by the [redpwn](https://redpwn.net) CTF team.
+rCTF is redpwnCTF's CTF platform. It is now developed and maintained by the [OtterSec](https://osec.io) team.
 
-To install rCTF, see [the installation doc](installation.md).
+To install rCTF, see [the installation doc](rctf/installation.md).
 
 If you need help with rCTF, join the [the redpwnCTF Discord server](https://discord.gg/NkDNEE2) and ask questions in the `#rctf-help` channel.

CONTRIBUTING.md .github/CONTRIBUTING.mdCONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -1,5 +1,6 @@
+title: rCTF
+
 arrange:
-  - index.md
   - installation.md
   - configuration.md
   - management

SECURITY.md .github/SECURITY.mdSECURITY.md renamed to .github/SECURITY.md

@@ -81,6 +81,7 @@ Configuration for advanced users - sane defaults are automatically set by the in
 | `proxy.trust`                 | _(none)_                             | yes                                           | `false`       | boolean, string, string array, or integer | X-Forwarded-For trust: the trust parameter to [proxy-addr](https://www.npmjs.com/package/proxy-addr) |
 | `loginTimeout`                | `RCTF_LOGIN_TIMEOUT`                 | yes                                           | 3600000       | integer                                   | lifetime of registration, email update, and recovery links, in milliseconds                          |
 | `userMembers`                 | `RCTF_USER_MEMBERS`                  | yes                                           | `true`        | boolean                                   | whether to allow a user to provide emails for individual members                                     |
+| `registrationsEnabled`        | _(none)_                             | yes                                           | `true`        | boolean                                   | whether to allow new teams creation                                                                  |
 | `database.migrate`            | `RCTF_DATABASE_MIGRATE`              | yes                                           | `never`       | `before` \| `only` \| `never`             | how to run postgreSQL migrations. [documentation](management/migration.md)                           |
 | `instanceType`                | `RCTF_INSTANCE_TYPE`                 | yes                                           | `all`         | `all` \| `frontend` \| `leaderboard`      | what type of instance to run. [documentation](management/scaling.md)                                 |
 | `challengeProvider`           | _(none)_                             | yes                                           | `database`    | provider                                  | provider for challenges. [documentation](providers/challenges/index.md)                              |

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ curl -L https://get.rctf.osec.io | sh
 This installs rCTF into the `/opt/rctf` folder, where `/opt/rctf/rctf.d` contains all the configuration and the instance itself can be (re)started with the command:
 
 ```bash
-docker compose up --force-recreate --build -d
+docker compose up -d --force-recreate --build
 ```
 
 The instance is accessible by default only from localhost:8080, and can be changed in `/opt/rctf/docker-compose.yml` and applying the changes by restarting the instance.