Merge branch 'v5.x' of gitlab.com:allianceauth/allianceauth into djangomumble

docs/features/apps/srp.md

@@ -40,10 +40,10 @@ To use and administer this feature, users will require some of the following.
 +----------------------+------------------+------------------------------------------------------------+
 | Permission           | Admin Site       | Auth Site                                                  |
 +======================+==================+============================================================+
-| auth.access_srp      | None             | Can create an SRP request from a fleet                     |
+| srp.access_srp       | None             | Can create an SRP request from a fleet                     |
 +----------------------+------------------+------------------------------------------------------------+
 | auth.srp_management  | None             | Can Approve and Deny SRP requests, Can create an SRP Fleet |
 +----------------------+------------------+------------------------------------------------------------+
-| srp.add_srpfleetmain | Can Add Model    | Can Create an SRP Fleet                                    |
+| srp.add_srpfleetmain | None             | Can Create an SRP Fleet                                    |
 +----------------------+------------------+------------------------------------------------------------+
 ```

docs/features/core/analytics.md

@@ -27,6 +27,7 @@ Analytics comes preloaded with our Google Analytics token, and the three types o
 Our Daily Stats contain the following:
 
 - A phone-in task to identify a server's existence
+- A phone-in task to identify if a server is Bare-Metal or Dockerized
 - A task to send the Number of User models
 - A task to send the Number of Token Models
 - A task to send the Number of Installed Apps

docs/features/services/mumble-docker.md

@@ -25,6 +25,15 @@ INSTALLED_APPS += [
 MUMBLE_URL = "mumble.example.com"
 ```
 
+Add the following lines to your `.env` file
+
+```bash
+# Mumble
+MUMBLE_SUPERUSER_PASSWORD = superuser_password
+MUMBLE_ICESECRETWRITE = icesecretwrite
+MUMBLE_SERVERPASSWORD = serverpassword
+```
+
 Finally, restart your stack and run migrations
 
 ```shell

docs/features/services/mumble.md

@@ -17,14 +17,14 @@ This guide is currently for Ubuntu only.
 The mumble server package can be retrieved from a repository, which we need to add:
 
 ::::{tabs}
-:::{group-tab} Ubuntu 2004, 2204, 2404
+:::{group-tab} Ubuntu 2204, 2404
 
 ```shell
 sudo apt-add-repository ppa:mumble/release
 ```
 
 :::
-:::{group-tab} CentOS 7, Stream 8, Stream 9
+:::{group-tab} CentOS Stream 9, 10
 
 sudo yum install epel-release
 sudo yum update
@@ -35,14 +35,14 @@ sudo yum update
 Now three packages need to be installed:
 
 ::::{tabs}
-:::{group-tab} Ubuntu 2004, 2204, 2404
+:::{group-tab} Ubuntu 2204, 2404
 
 ```shell
 sudo apt-get install software-properties-common mumble-server libqt5sql5-mysql
 ```
 
 :::
-:::{group-tab} CentOS 7, Stream 8, Stream 9
+:::{group-tab} CentOS Stream 9, 10
 
 sudo yum install mumble-server
 

docs/features/services/openfire-docker.md

@@ -25,7 +25,7 @@ BROADCAST_SERVICE_NAME = "broadcast"
 
 Add the following lines to your `.env` file
 
-```env
+```bash
 # Openfire
 OPENFIRE_SECRET_KEY = superuser_password
 BROADCAST_USER_PASSWORD = icesecretwrite

docs/features/services/openfire.md

@@ -24,28 +24,14 @@ BROADCAST_SERVICE_NAME = "broadcast"
 Openfire require a Java 8 runtime environment.
 
 ::::{tabs}
-:::{group-tab} Ubuntu 2004, 2204
+:::{group-tab} Ubuntu 2204, 2404
 
 ```shell
 sudo apt-get install openjdk-11-jre
 ```
 
 :::
-:::{group-tab} CentOS 7
-
-```shell
-sudo yum install java-11-openjdk java-11-openjdk-devel
-```
-
-:::
-:::{group-tab} CentOS Stream 8
-
-```shell
-sudo dnf install java-11-openjdk java-11-openjdk-devel
-```
-
-:::
-:::{group-tab} CentOS Stream 9
+:::{group-tab} CentOS Stream 9, 10
 
 ```shell
 sudo dnf install java-11-openjdk java-11-openjdk-devel
@@ -73,18 +59,10 @@ cd ~
 Download and install the package, replacing the URL with the latest you got from the Openfire download page earlier
 
 ::::{tabs}
-:::{group-tab} Ubuntu 2004, 2204
+:::{group-tab} Ubuntu 2204, 2404
 
 :::
-:::{group-tab} CentOS 7
-wget <https://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_4.7.2_all.deb>
-dpkg -i openfire_4.7.2_all.deb
-:::
-:::{group-tab} CentOS Stream 8
-wget <https://www.igniterealtime.org/downloadServlet?filename=openfire/openfire-4.7.2-1.noarch.rpm>
-yum install -y openfire-4.7.2-1.noarch.rpm
-:::
-:::{group-tab} CentOS Stream 9
+:::{group-tab} CentOS Stream 9, 10
 wget <https://www.igniterealtime.org/downloadServlet?filename=openfire/openfire-4.7.2-1.noarch.rpm>
 yum install -y openfire-4.7.2-1.noarch.rpm
 :::

docs/features/services/teamspeak3-docker.md

@@ -34,7 +34,7 @@ CELERYBEAT_SCHEDULE['run_ts3_group_update'] = {
 
 - Add the following lines to your `.env` file
 
-```env
+```bash
 # Temspeak
 TEAMSPEAK3_SERVERQUERY_USER = "serverquery"
 TEAMSPEAK3_SERVERQUERY_PASSWORD = ""