From b28cbdad31b3dcef9d68891927c6439848754133 Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Thu, 14 Aug 2025 02:27:14 +0000 Subject: [PATCH] Bump SQL and Redis for new installs --- docker/docker-compose.yml | 8 +-- docs/installation/allianceauth.md | 101 ++++-------------------------- 2 files changed, 17 insertions(+), 92 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5958d063..9f86af0c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -44,8 +44,8 @@ x-allianceauth-health-check: &allianceauth-health-checks services: auth_mysql: - image: mariadb:10.11 - command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --default-authentication-plugin=mysql_native_password] + image: mariadb:11.8 + command: [mariadbd, --default-authentication-plugin=mysql_native_password] volumes: - ./mysql-data:/var/lib/mysql - ./setup.sql:/docker-entrypoint-initdb.d/setup.sql @@ -77,7 +77,7 @@ services: max-file: "5" redis: - image: redis:7 + image: redis:8 command: redis-server restart: always volumes: @@ -132,7 +132,7 @@ services: replicas: 2 grafana: - image: grafana/grafana-oss:9.5.2 + image: grafana/grafana-oss:latest restart: always depends_on: - auth_mysql diff --git a/docs/installation/allianceauth.md b/docs/installation/allianceauth.md index 2b7c3924..296fab9c 100644 --- a/docs/installation/allianceauth.md +++ b/docs/installation/allianceauth.md @@ -14,9 +14,8 @@ Alliance Auth can be installed on any in-support *nix operating system. Our install documentation targets the following operating systems. -- Ubuntu 20.04 - Not Recommended for new installs - Ubuntu 22.04 -- Centos 7 +- Ubuntu 24.04 - CentOS Stream 8 - 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. ::::{tabs} -:::{group-tab} Ubuntu 2004, 2204, 2404 +:::{group-tab} Ubuntu 2204, 2404 ```shell sudo apt-get update @@ -35,14 +34,6 @@ sudo apt-get upgrade sudo do-dist-upgrade ``` -::: -:::{group-tab} CentOS 7 - -```shell -yum install epel-release -sudo yum upgrade -``` - ::: :::{group-tab} CentOS Stream 8 @@ -70,7 +61,7 @@ Install Python 3.11 and related tools on your system. ::::{tabs} -:::{group-tab} Ubuntu 2004, 2204, 2404 +:::{group-tab} Ubuntu 2204, 2404 ```shell 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 ``` -::: -:::{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 We need to build Python from source @@ -125,27 +102,19 @@ sudo make altinstall ### 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} -:::{group-tab} Ubuntu 2004, 2204, 2404 -Follow the instructions at to add the MariaDB repository to your host. +:::{group-tab} Ubuntu 2204, 2404 +Follow the instructions at to add the MariaDB repository to your host. ```shell sudo apt-get install mariadb-server mariadb-client libmysqlclient-dev ``` -::: -:::{group-tab} CentOS 7 -Follow the instructions at 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 -Follow the instructions at to add the MariaDB repository to your host. +Follow the instructions at to add the MariaDB repository to your host. ```shell 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 -Follow the instructions at to add the MariaDB repository to your host. +Follow the instructions at to add the MariaDB repository to your host. ```shell sudo dnf install mariadb mariadb-server mariadb-devel @@ -164,12 +133,9 @@ sudo dnf install mariadb mariadb-server mariadb-devel :::::{important} ::::{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 ::: -:::{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 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} -:::{group-tab} Ubuntu 2004, 2204, 2404 +:::{group-tab} Ubuntu 2204, 2404 ```shell 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 ``` -::: -:::{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 @@ -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. ::::{tabs} -:::{group-tab} Ubuntu 2004, 2204, 2404 +:::{group-tab} Ubuntu 2204, 2404 ```shell sudo adduser --disabled-login allianceserver --shell /bin/bash ``` -::: -:::{group-tab} CentOS 7 - -```shell -sudo passwd -l allianceserver -``` - ::: :::{group-tab} CentOS Stream 8 @@ -497,27 +444,12 @@ exit ::::{tabs} -:::{group-tab} Ubuntu 2004, 2204, 2404 +:::{group-tab} Ubuntu 2204, 2404 ```shell 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 @@ -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. ::::{tabs} -:::{group-tab} Ubuntu 2004, 2204, 2404 +:::{group-tab} Ubuntu 2204, 2404 ```shell 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