mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-08-24 02:41:42 +02:00
Merge branch '1745alt' into 'master'
Bump SQL and Redis for new installs See merge request allianceauth/allianceauth!1751
This commit is contained in:
commit
9ff926ae4d
@ -44,8 +44,8 @@ x-allianceauth-health-check: &allianceauth-health-checks
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
auth_mysql:
|
auth_mysql:
|
||||||
image: mariadb:10.11
|
image: mariadb:11.8
|
||||||
command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --default-authentication-plugin=mysql_native_password]
|
command: [mariadbd, --default-authentication-plugin=mysql_native_password]
|
||||||
volumes:
|
volumes:
|
||||||
- ./mysql-data:/var/lib/mysql
|
- ./mysql-data:/var/lib/mysql
|
||||||
- ./setup.sql:/docker-entrypoint-initdb.d/setup.sql
|
- ./setup.sql:/docker-entrypoint-initdb.d/setup.sql
|
||||||
@ -77,7 +77,7 @@ services:
|
|||||||
max-file: "5"
|
max-file: "5"
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:7
|
image: redis:8
|
||||||
command: redis-server
|
command: redis-server
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
@ -132,7 +132,7 @@ services:
|
|||||||
replicas: 2
|
replicas: 2
|
||||||
|
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana-oss:9.5.2
|
image: grafana/grafana-oss:latest
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- auth_mysql
|
- auth_mysql
|
||||||
|
@ -14,9 +14,8 @@ Alliance Auth can be installed on any in-support *nix operating system.
|
|||||||
|
|
||||||
Our install documentation targets the following operating systems.
|
Our install documentation targets the following operating systems.
|
||||||
|
|
||||||
- Ubuntu 20.04 - Not Recommended for new installs
|
|
||||||
- Ubuntu 22.04
|
- Ubuntu 22.04
|
||||||
- Centos 7
|
- Ubuntu 24.04
|
||||||
- CentOS Stream 8
|
- CentOS Stream 8
|
||||||
- CentOS Stream 9
|
- CentOS Stream 9
|
||||||
|
|
||||||
@ -27,7 +26,7 @@ To install on your favorite flavour of Linux, identify and install equivalent pa
|
|||||||
It is recommended to ensure your OS is fully up-to-date before proceeding. We may also add Package Repositories here, used later in the documentation.
|
It is recommended to ensure your OS is fully up-to-date before proceeding. We may also add Package Repositories here, used later in the documentation.
|
||||||
|
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
@ -35,14 +34,6 @@ sudo apt-get upgrade
|
|||||||
sudo do-dist-upgrade
|
sudo do-dist-upgrade
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
|
|
||||||
```shell
|
|
||||||
yum install epel-release
|
|
||||||
sudo yum upgrade
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
|
|
||||||
@ -70,7 +61,7 @@ Install Python 3.11 and related tools on your system.
|
|||||||
|
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
|
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo add-apt-repository ppa:deadsnakes/ppa
|
sudo add-apt-repository ppa:deadsnakes/ppa
|
||||||
@ -78,20 +69,6 @@ sudo apt-get update
|
|||||||
sudo apt-get install python3.11 python3.11-dev python3.11-venv
|
sudo apt-get install python3.11 python3.11-dev python3.11-venv
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
We need to build Python from source
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd ~
|
|
||||||
sudo yum install gcc openssl-devel bzip2-devel libffi-devel wget
|
|
||||||
wget https://www.python.org/ftp/python/3.11.7/Python-3.11.7.tgz
|
|
||||||
tar xvf Python-3.11.7.tgz
|
|
||||||
cd Python-3.11.7/
|
|
||||||
./configure --enable-optimizations --enable-shared
|
|
||||||
sudo make altinstall
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
We need to build Python from source
|
We need to build Python from source
|
||||||
@ -125,27 +102,19 @@ sudo make altinstall
|
|||||||
|
|
||||||
### Database
|
### Database
|
||||||
|
|
||||||
It's recommended to use a database service instead of SQLite. Many options are available, but this guide will use MariaDB 10.11
|
It's recommended to use a database service instead of SQLite. Many options are available, but this guide will use MariaDB 11.8
|
||||||
|
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=20.04+%22focal%22&v=10.11&r_m=osuosl> to add the MariaDB repository to your host.
|
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=24.04+"noble"&v=11.8> to add the MariaDB repository to your host.
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo apt-get install mariadb-server mariadb-client libmysqlclient-dev
|
sudo apt-get install mariadb-server mariadb-client libmysqlclient-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=CentOS+7&v=10.11&r_m=osuosl> to add the MariaDB repository to your host.
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo yum install MariaDB-server MariaDB-client MariaDB-devel MariaDB-shared
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=CentOS+Stream&v=10.11&r_m=osuosl> to add the MariaDB repository to your host.
|
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=CentOS+Stream&v=11.8> to add the MariaDB repository to your host.
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo dnf install mariadb mariadb-server mariadb-devel
|
sudo dnf install mariadb mariadb-server mariadb-devel
|
||||||
@ -153,7 +122,7 @@ sudo dnf install mariadb mariadb-server mariadb-devel
|
|||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 9
|
:::{group-tab} CentOS Stream 9
|
||||||
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=CentOS+Stream&v=10.11&r_m=osuosl> to add the MariaDB repository to your host.
|
Follow the instructions at <https://mariadb.org/download/?t=repo-config&d=CentOS+Stream&v=11.8> to add the MariaDB repository to your host.
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo dnf install mariadb mariadb-server mariadb-devel
|
sudo dnf install mariadb mariadb-server mariadb-devel
|
||||||
@ -164,12 +133,9 @@ sudo dnf install mariadb mariadb-server mariadb-devel
|
|||||||
|
|
||||||
:::::{important}
|
:::::{important}
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
If you don't plan on running the database on the same server as auth you still need to install the `libmysqlclient-dev` package
|
If you don't plan on running the database on the same server as auth you still need to install the `libmysqlclient-dev` package
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
If you don't plan on running the database on the same server as auth you still need to install the `mariadb-devel` package
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
If you don't plan on running the database on the same server as auth you still need to install the `mariadb-devel` package
|
If you don't plan on running the database on the same server as auth you still need to install the `mariadb-devel` package
|
||||||
:::
|
:::
|
||||||
@ -185,7 +151,7 @@ A few extra utilities are also required for the installation of packages.
|
|||||||
|
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
|
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
|
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
|
||||||
@ -195,18 +161,6 @@ sudo apt-get update
|
|||||||
sudo apt-get install unzip git redis-server curl libssl-dev libbz2-dev libffi-dev build-essential pkg-config
|
sudo apt-get install unzip git redis-server curl libssl-dev libbz2-dev libffi-dev build-essential pkg-config
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo yum install gcc gcc-c++ unzip git redis curl bzip2-devel openssl-devel libffi-devel wget pkg-config
|
|
||||||
```
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo systemctl enable redis.service
|
|
||||||
sudo systemctl start redis.service
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
|
|
||||||
@ -282,19 +236,12 @@ mysql_secure_installation
|
|||||||
For security and permissions, it's highly recommended you create a separate user to install auth under. Do not log in as this account.
|
For security and permissions, it's highly recommended you create a separate user to install auth under. Do not log in as this account.
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
|
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo adduser --disabled-login allianceserver --shell /bin/bash
|
sudo adduser --disabled-login allianceserver --shell /bin/bash
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo passwd -l allianceserver
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
|
|
||||||
@ -497,27 +444,12 @@ exit
|
|||||||
|
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
|
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo apt-get install supervisor
|
sudo apt-get install supervisor
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo dnf install supervisor
|
|
||||||
```
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo systemctl enable supervisord.service
|
|
||||||
```
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo systemctl start supervisord.service
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
|
|
||||||
@ -554,19 +486,12 @@ sudo systemctl start supervisord.service
|
|||||||
Once installed, it needs a configuration file to know which processes to watch. Your Alliance Auth project comes with a ready-to-use template which will ensure the Celery workers, Celery task scheduler and Gunicorn are all running.
|
Once installed, it needs a configuration file to know which processes to watch. Your Alliance Auth project comes with a ready-to-use template which will ensure the Celery workers, Celery task scheduler and Gunicorn are all running.
|
||||||
::::{tabs}
|
::::{tabs}
|
||||||
|
|
||||||
:::{group-tab} Ubuntu 2004, 2204, 2404
|
:::{group-tab} Ubuntu 2204, 2404
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
ln -s /home/allianceserver/myauth/supervisor.conf /etc/supervisor/conf.d/myauth.conf
|
ln -s /home/allianceserver/myauth/supervisor.conf /etc/supervisor/conf.d/myauth.conf
|
||||||
```
|
```
|
||||||
|
|
||||||
:::
|
|
||||||
:::{group-tab} CentOS 7
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo ln -s /home/allianceserver/myauth/supervisor.conf /etc/supervisord.d/myauth.ini
|
|
||||||
```
|
|
||||||
|
|
||||||
:::
|
:::
|
||||||
:::{group-tab} CentOS Stream 8
|
:::{group-tab} CentOS Stream 8
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user