Add common module managing common services and scripts (act_runner, create/restore backups)

Fix script environment variables
Add Fefan configuration
Fix gateway services file provisionning through ssh
This commit is contained in:
2026-01-20 15:42:17 +01:00
parent 152f09ac50
commit 1de2fe9ab4
53 changed files with 285 additions and 442 deletions

View File

@@ -100,6 +100,7 @@ module "vm" {
ssh_public_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
cloudinit_config = templatefile(
"${path.module}/cloud-init/service.yaml",
{
@@ -107,7 +108,7 @@ module "vm" {
domain = var.domain
ssh_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
environment-setup-script = indent(6, file("${path.module}/../common/scripts/env.sh"))
env-file-content = indent(6, file("${path.module}/.env"))
}
)
@@ -193,6 +194,8 @@ variable "vm_ip_address" {
description = "Virtual machine ip"
type = string
}
```
#### `modules/apps/<service-name>/output.tf`
@@ -237,10 +240,6 @@ package_upgrade: false
##### Environment variables for scripts
```hcl
write_files:
- path: /opt/<service-name>/env.sh
permissions: "0644"
content: |
${environment-setup-script}
- path: /opt/<service-name>/<service-name>.env
permissions: "0644"
content: |

41
main.tf
View File

@@ -27,38 +27,40 @@ locals {
}
resource "local_file" "traefik_config" {
filename = "${path.module}/${var.gateway_repository}/services.yml"
filename = "${path.module}/services.yml"
content = templatefile("${path.module}/templates/traefik.services.tpl", {
services = local.traefik_services
})
}
resource "null_resource" "commit_traefik" {
depends_on = [local_file.traefik_config]
resource "null_resource" "deploy_traefik_config" {
depends_on = [
local_file.traefik_config,
module.gateway
]
triggers = {
config_sha = sha256(local_file.traefik_config.content)
}
provisioner "local-exec" {
working_dir = "${path.module}/${var.gateway_repository}"
command = "git add services.yml && git commit -m 'Update Traefik services' && git push"
}
}
provisioner "file" {
source = "${path.module}/services.yml"
destination = "/home/gateway/services.yaml"
resource "null_resource" "notify_gateway" {
depends_on = [null_resource.commit_traefik]
triggers = {
config_sha = sha256(local_file.traefik_config.content)
}
provisioner "local-exec" {
command = "curl -X POST -H 'X-Webhook-Token: ${var.gateway_token}' http://192.168.1.89:5555/reload"
connection {
type = "ssh"
host = module.gateway.vm_ip_address
user = "gateway"
agent = true
}
}
}
module "gateway" {
source = "./modules/apps/gateway"
providers = {}
vm_ip_address = "192.168.1.89"
name = "gateway"
hostname = "gateway"
@@ -80,6 +82,7 @@ module "gateway" {
module "gitea" {
source = "./modules/apps/gitea"
providers = {}
vm_ip_address = "192.168.1.90"
name = "gitea"
hostname = "gitea"
@@ -98,10 +101,14 @@ module "gitea" {
proxmox_host_ip = var.proxmox_host_ip
}
# Needs gitea
module "bookshelf" {
source = "./modules/apps/bookshelf"
providers = {}
vm_ip_address = "192.168.1.91"
depends_on = [
module.gitea
]
name = "bookshelf"
hostname = "bookshelf"
@@ -120,10 +127,14 @@ module "bookshelf" {
proxmox_host_ip = var.proxmox_host_ip
}
# Needs gitea
module "fefan" {
source = "./modules/apps/fefan"
providers = {}
vm_ip_address = "192.168.1.92"
depends_on = [
module.gitea
]
name = "fefan"
hostname = "fefan"

View File

@@ -1,20 +1,32 @@
# Environment files
ENV_FILE_LOCATION=/opt/environment/.env
# gitea act_runner
ACT_RUNNER_VERSION=0.2.13
ACT_RUNNER_LOCATION=/usr/local/bin
ACT_RUNNER_USER=act_runner
ENV_FILE_LOCATION=/opt/bookshelf/bookshelf.env
GITEA_INSTANCE_URL=https://gitea.aldon.fr
GITEA_RUNNER_REGISTRATION_TOKEN=<gitea-repository-runner-token>
GITEA_BOOKSHELF_APPLICATION_TOKEN=<gitea-auth-token>
GITEA_BOOKSHELF_REPOSITORY=mop/bookshelf
USERNAME=bookshelf
BOOKSHELF_BACKUPS_DIR=/backups/bookshelf
BOOKSHELF_BACKUP_PREFIX=bookshelf-dump
# gitea instance
GITEA_INSTANCE_URL=https://gitea.aldon.fr
GITEA_SERVICE_APPLICATION_TOKEN=<gitea-auth-token>
GITEA_SERVICE_REPOSITORY=mop/bookshelf
GITEA_WORKFLOW_NAME=deploy.yaml
# Applicaiton specifics
MARIADB_USER=bookshelf
MARIADB_PASSWORD=<mariadb-password>
MARIADB_DATABASE=Biblio
MARIADB_ROOT_PASSWORD=<mariadb-root-password>
SERVICE_SECRET_KEY=<bookshelf-secret-key>
SERVICE_ORIGIN=https://bookshelf.aldon.fr
SERVICE_ROOT_FQDN=https://bookshelf.aldon.fr/api
SERVICE_ROOT_FQDN=https://bookshelf.aldon.fr/api
SERVICE_DATABASE_CONTAINER_NAME=bookshelf-database-1
# VM
USERNAME=bookshelf
# Backup specifics
SERVICE_BACKUPS_DIR=/backups/bookshelf
SERVICE_BACKUPS_PREFIX=bookshelf-dump
SERVICE_BACKUPS_EXTENSION=sql

View File

@@ -30,11 +30,7 @@ mounts:
- [ "192.168.1.12:/main/backups", "/backups", "nfs", "defaults,_netdev,x-systemd.requires=network-online.target", "0", "0" ]
write_files:
- path: /opt/bookshelf/env.sh
permissions: "0644"
content: |
${environment-setup-script}
- path: /opt/bookshelf/bookshelf.env
- path: /opt/environment/.env
permissions: "0644"
content: |
${env-file-content}
@@ -66,10 +62,10 @@ write_files:
permissions: "0755"
content: |
${act_runner-install-script}
- path: /opt/bookshelf/install-bookshelf.sh
- path: /opt/bookshelf/install-service.sh
permissions: "0755"
content: |
${bookshelf-install-script}
${service-install-script}
runcmd:
# Backup setup
@@ -86,7 +82,7 @@ runcmd:
- systemctl enable act_runner.service
- systemctl start act_runner.service
# Bookshelf install
- /opt/bookshelf/install-bookshelf.sh
- /opt/bookshelf/install-service.sh
final_message: |

View File

@@ -1,8 +1,8 @@
#!/bin/bash
source /opt/bookshelf/env.sh
source /opt/environment/.env
TIMESTAMP=$(date +'%Y-%m-%d_%H%M%S')
docker exec bookshelf-database-1 mariadb-dump --all-databases -u root -p"$MARIADB_ROOT_PASSWORD" > $BOOKSHELF_BACKUPS_DIR/bookshelf-dump-$TIMESTAMP.sql
docker exec bookshelf-database-1 mariadb-dump --all-databases -u root -p"$MARIADB_ROOT_PASSWORD" > $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-$TIMESTAMP.$SERVICE_BACKUPS_EXTENSION
ls -1dt $BOOKSHELF_BACKUPS_DIR/$BOOKSHELF_BACKUP_PREFIX-*.sql | tail -n +5 | xargs -r rm -f
ls -1dt $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION | tail -n +5 | xargs -r rm -f

View File

@@ -1,4 +0,0 @@
#!/bin/bash
set -a
[ -f /opt/bookshelf/bookshelf.env ] && source /opt/bookshelf/bookshelf.env
set +a

View File

@@ -1,49 +0,0 @@
#!/bin/bash
source /opt/bookshelf/env.sh
# trigger manually a CI/CD pipeline
curl -X POST -H "Authorization: token $GITEA_BOOKSHELF_APPLICATION_TOKEN" \
-H "Content-Type: application/json" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_BOOKSHELF_REPOSITORY/actions/workflows/deploy.yaml/dispatches \
-d '{"ref": "main", "inputs": {"ref": "main"}}'
RUN_ID=$(curl -s -H "Authorization: token $GITEA_BOOKSHELF_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_BOOKSHELF_REPOSITORY/actions/runs \
| jq -r '.workflow_runs | sort_by(.created_at) | .[0].id')
while true; do
STATUS=$(curl -s -H "Authorization: token $GITEA_BOOKSHELF_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_BOOKSHELF_REPOSITORY/actions/runs/$RUN_ID \
| jq -r '.status')
if [ "$STATUS" = "completed" ]; then
CONCLUSION=$(curl -s -H "Authorization: token $GITEA_BOOKSHELF_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_BOOKSHELF_REPOSITORY/actions/runs/$RUN_ID \
| jq -r '.conclusion')
echo "Workflow finished with status: $CONCLUSION"
break
fi
echo "Waiting 10 seconds..."
sleep 10
done
if [ "$CONCLUSION" = "success" ]; then
echo "Launching command..."
while [ "$(docker inspect -f '{{.State.Running}}' bookshelf-database-1 2>/dev/null)" != "true" ]; do
echo "Waiting database container status"
sleep 5
done
until docker exec bookshelf-database-1 sh -c "mariadb -u root -p$MARIADB_ROOT_PASSWORD -e 'SELECT 1;' >/dev/null 2>&1"; do
echo "Waitin mariadb to accept connections"
sleep 5
done
echo "Restoring backup"
systemctl start restore-backup.service
else
echo "Workflow failed or was cancelled, aborting."
exit 1
fi

View File

@@ -1,8 +1,8 @@
#!/bin/bash
source /opt/bookshelf/env.sh
source /opt/environment/.env
LATEST_BACKUP=$(ls -1 $BOOKSHELF_BACKUPS_DIR/$BOOKSHELF_BACKUP_PREFIX-*.sql 2>/dev/null | sort | tail -n1)
LATEST_BACKUP=$(ls -1 $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION 2>/dev/null | sort | tail -n1)
if [ -n "$LATEST_BACKUP" ] && [ -f "$LATEST_BACKUP" ]; then
cat $LATEST_BACKUP | docker exec -i bookshelf-database-1 mariadb -u root -p"$MARIADB_ROOT_PASSWORD" -D $MARIADB_DATABASE

View File

@@ -1,9 +0,0 @@
[Unit]
Description=Run backup weekly
[Timer]
OnCalendar=Sun *-*-* 01:00:00
Persistent=true
[Install]
WantedBy=timers.target

View File

@@ -15,22 +15,24 @@ module "vm" {
ssh_public_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
cloudinit_config = templatefile(
"${path.module}/cloud-init/service.yaml",
{
hostname = var.hostname
domain = var.domain
ssh_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
environment-setup-script = indent(6, file("${path.module}/lib/scripts/env.sh"))
proxmox_host_ip = var.proxmox_host_ip
restore-backup-script = indent(6, file("${path.module}/lib/scripts/restore-backup.sh"))
restore-backup-service = indent(6, file("${path.module}/lib/services/restore-backup.service"))
restore-backup-service = indent(6, file("${path.module}/../common/services/docker/restore-backup.service"))
create-backup-script = indent(6, file("${path.module}/lib/scripts/create-backup.sh"))
create-backup-service = indent(6, file("${path.module}/lib/services/create-backup.service"))
create-backup-timer = indent(6, file("${path.module}/lib/services/create-backup.timer"))
act_runner-service = indent(6, file("${path.module}/lib/services/act_runner.service"))
act_runner-install-script = indent(6, file("${path.module}/lib/scripts/install-runner.sh"))
bookshelf-install-script = indent(6, file("${path.module}/lib/scripts/install-bookshelf.sh"))
create-backup-service = indent(6, file("${path.module}}/../common/services/docker/create-backup.service"))
create-backup-timer = indent(6, file("${path.module}/../common/services/create-backup.timer"))
act_runner-service = indent(6, file("${path.module}/../common/services/act_runner.service"))
act_runner-install-script = indent(6, file("${path.module}/../common/scripts/install-runner.sh"))
service-install-script = indent(6, file("${path.module}/../common/scripts/install-service-ci.sh"))
env-file-content = indent(6, file("${path.module}/.env"))
}

View File

@@ -1,22 +1,27 @@
variable "name" {
description = "Virtual Machine name"
type = string
}
variable "vm_id" {
description = "Virtual Machine id"
type = number
}
variable "node_name" {
description = "Proxmox node name"
type = string
default = "mop"
}
variable "cores" {
description = "Number of CPU cores for this virtual machine"
type = number
default = 2
}
variable "memory" {
description = "Memory RAM for this virtual machine"
type = number
default = 2048
}
@@ -28,35 +33,39 @@ variable "balloon" {
}
variable "template_id" {
description = "Virtual machine template ID"
type = number
}
variable "ssh_public_key" {
type = string
description = "Public SSH key for cloud-init user"
type = string
}
variable "hostname" {
description = "VM hostname"
description = "Virtual Machine hostname (<service-name>)"
type = string
default = "test"
}
variable "domain" {
description = "VM domain"
description = "Virtual Machine domain (example.fr)"
type = string
default = ""
}
variable "disk_size" {
description = "Disk size for the virtual machine"
type = number
default = 10
}
variable "proxmox_host_ip" {
description = "Proxmox host base ip"
type = string
}
variable "vm_ip_address" {
description = "Virtual machine ip"
type = string
}

View File

@@ -1,16 +1,17 @@
#!/bin/bash
source /opt/bookshelf/env.sh
source /opt/environment/.env
## .env should define
## This script installs `act_runner` onto the machine.
## Environment variables
# ACT_RUNNER_USER: act_runner username (act_runner)
# ACT_RUNNER_LOCATION: act_runner binary location (/usr/local/bin)
# ACT_RUNNER_VERSION: act_runner version (0.2.13)
# ENV_FILE_LOCATION: .env file location on vm (/opt/bookshelf/bookshelf.env)
# GITEA_INSTANCE_URL: url of the gitea instance (https://gitea.aldon.fr)
# GITEA_RUNNER_REGISTRATION_TOKEN: registration token for gitea runner (repository scope)
# USERNAME: username of the vm (bookshelf)
# REPOSITORY: repository on which service code is hosted (mop/bookshelf)
# USERNAME: username of the vm (ex: bookshelf)
if ! id -u $ACT_RUNNER_USER >/dev/null 2>&1; then
adduser \

View File

@@ -0,0 +1,58 @@
#!/bin/bash
source /opt/environment/.env
## This script triggers a CI/CD pipeline.
# It then restores a backup using `restore-backup.service` systemd service
## This script requires `restore-backup.service` in `/etc/systemd/system`
## Dependencies (in service.yaml `packages` section)
# - jq
# - curl
## Environment variables
# GITEA_SERVICE_APPLICATION_TOKEN: Gitea API token.
# GITEA_SERVICE_REPOSITORY: repository where the project resides.
# GITEA_INSTANCE_URL: Gitea url.
# SERVICE_DATABASE_CONTAINER_NAME: Container name for database.
# GITEA_WORKFLOW_NAME: deploy.yaml
curl -X POST -H "Authorization: token $GITEA_SERVICE_APPLICATION_TOKEN" \
-H "Content-Type: application/json" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_SERVICE_REPOSITORY/actions/workflows/$GITEA_WORKFLOW_NAME/dispatches \
-d '{"ref": "main", "inputs": {"ref": "main"}}'
RUN_ID=$(curl -s -H "Authorization: token $GITEA_SERVICE_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_SERVICE_REPOSITORY/actions/runs \
| jq -r '.workflow_runs | sort_by(.created_at) | .[0].id')
while true; do
STATUS=$(curl -s -H "Authorization: token $GITEA_SERVICE_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_SERVICE_REPOSITORY/actions/runs/$RUN_ID \
| jq -r '.status')
if [ "$STATUS" = "completed" ]; then
CONCLUSION=$(curl -s -H "Authorization: token $GITEA_SERVICE_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_SERVICE_REPOSITORY/actions/runs/$RUN_ID \
| jq -r '.conclusion')
echo "Workflow finished with status: $CONCLUSION"
break
fi
echo "Waiting 10 seconds..."
sleep 10
done
if [ "$CONCLUSION" = "success" ]; then
echo "Launching command..."
while [ "$(docker inspect -f '{{.State.Running}}' $SERVICE_DATABASE_CONTAINER_NAME-1 2>/dev/null)" != "true" ]; do
echo "Waiting database container status"
sleep 5
done
systemctl start restore-backup.service
else
echo "Workflow failed or was cancelled, aborting."
exit 1
fi

View File

@@ -0,0 +1,9 @@
[Unit]
Description=Run backup
[Timer]
OnCalendar=*-*-* 01:00:00
Persistent=true
[Install]
WantedBy=timers.target

View File

@@ -1,24 +1,35 @@
# Environment files
ENV_FILE_LOCATION=/opt/environment/.env
# Gitea act_runner
ACT_RUNNER_VERSION=0.2.13
ACT_RUNNER_LOCATION=/usr/local/bin
ACT_RUNNER_USER=act_runner
ENV_FILE_LOCATION=/opt/fefan/fefan.env
GITEA_INSTANCE_URL=https://gitea.aldon.fr
GITEA_RUNNER_REGISTRATION_TOKEN=<gitea-repository-runner-token>
GITEA_FEFAN_APPLICATION_TOKEN=<gitea-auth-token>
GITEA_FEFAN_REPOSITORY=Mop/fefan
# Gitea instance
GITEA_INSTANCE_URL=https://gitea.aldon.fr
GITEA_SERVICE_APPLICATION_TOKEN=<gitea-auth-token>
GITEA_SERVICE_REPOSITORY=mop/fefan
GITEA_WORKFLOW_NAME=deploy.yaml
# Application specifics
NEXT_PUBLIC_CONTENT_URI=https://content.fefan.fr/api
NEXT_PUBLIC_IMG_URI=https://content.fefan.fr
NEXT_PUBLIC_ORIGIN=https://fefan.fr
POSTGRES_USER=strapi
POSTGRES_PASSWORD=password
POSTGRES_PASSWORD=
STRAPI_APP_KEYS=
STRAPI_TOKEN_SALT=
STRAPI_ADMIN_JWT_SECRET=
STRAPI_TRANSFER_TOKEN_SALT=
STRAPI_JWT_SECRET=
SERVICE_DATABASE_CONTAINER_NAME=fefan-db
# VM
USERNAME=fefan
FEFAN_BACKUPS_DIR=/backups/fefan
FEFAN_BACKUP_PREFIX=fefan-dump
# Backup specifics
SERVICE_BACKUPS_DIR=/backups/fefan
SERVICE_BACKUPS_PREFIX=fefan-dump
SERVICE_BACKUPS_EXTENSION=tar.gz

View File

@@ -30,11 +30,7 @@ mounts:
- [ "192.168.1.12:/main/backups", "/backups", "nfs", "defaults,_netdev,x-systemd.requires=network-online.target", "0", "0" ]
write_files:
- path: /opt/fefan/env.sh
permissions: "0644"
content: |
${environment-setup-script}
- path: /opt/fefan/fefan.env
- path: /opt/environment/.env
permissions: "0644"
content: |
${env-file-content}
@@ -69,7 +65,7 @@ write_files:
- path: /opt/fefan/install-fefan.sh
permissions: "0755"
content: |
${fefan-install-script}
${service-install-script}
runcmd:
# Backup setup

View File

@@ -1,14 +1,15 @@
#!/bin/bash
source /opt/fefan/env.sh
source /opt/environment/.env
# FEFAN_BACKUPS_DIR=/backups/fefan
# FEFAN_BACKUP_PREFIX=fefan-dump
# SERVICE_BACKUPS_DIR=/backups/fefan
# SERVICE_BACKUPS_PREFIX=fefan-dump
# SERVICE_BACKUPS_EXTENSION=tar.gz
TIMESTAMP=$(date +'%Y-%m-%d_%H%M%S')
docker exec fefan-strapi-1 yarn strapi export -f export --no-encrypt
docker cp fefan-strapi-1:/app/export.tar.gz $FEFAN_BACKUPS_DIR/$FEFAN_BACKUP_PREFIX-$TIMESTAMP.tar.gz
docker exec fefan-strapi-1 rm /app/export.tar.gz
docker cp fefan-strapi-1:/app/export.$SERVICE_BACKUPS_EXTENSION $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-$TIMESTAMP.$SERVICE_BACKUPS_EXTENSION
docker exec fefan-strapi-1 rm /app/export.$SERVICE_BACKUPS_EXTENSION
ls -1dt $FEFAN_BACKUPS_DIR/$FEFAN_BACKUP_PREFIX-*.tar.gz | tail -n +5 | xargs -r rm -f
ls -1dt $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION | tail -n +5 | xargs -r rm -f

View File

@@ -1,4 +0,0 @@
#!/bin/bash
set -a
[ -f /opt/fefan/fefan.env ] && source /opt/fefan/fefan.env
set +a

View File

@@ -1,44 +0,0 @@
#!/bin/bash
source /opt/fefan/env.sh
# trigger manually a CI/CD pipeline
curl -X POST -H "Authorization: token $GITEA_FEFAN_APPLICATION_TOKEN" \
-H "Content-Type: application/json" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_FEFAN_REPOSITORY/actions/workflows/deploy.yaml/dispatches \
-d '{"ref": "main", "inputs": {"ref": "main"}}'
RUN_ID=$(curl -s -H "Authorization: token $GITEA_FEFAN_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_FEFAN_REPOSITORY/actions/runs \
| jq -r '.workflow_runs | sort_by(.created_at) | .[0].id')
while true; do
STATUS=$(curl -s -H "Authorization: token $GITEA_FEFAN_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_FEFAN_REPOSITORY/actions/runs/$RUN_ID \
| jq -r '.status')
if [ "$STATUS" = "completed" ]; then
CONCLUSION=$(curl -s -H "Authorization: token $GITEA_FEFAN_APPLICATION_TOKEN" \
$GITEA_INSTANCE_URL/api/v1/repos/$GITEA_FEFAN_REPOSITORY/actions/runs/$RUN_ID \
| jq -r '.conclusion')
echo "Workflow finished with status: $CONCLUSION"
break
fi
echo "Waiting 10 seconds..."
sleep 10
done
if [ "$CONCLUSION" = "success" ]; then
echo "Launching command..."
while [ "$(docker inspect -f '{{.State.Running}}' fefan-db-1 2>/dev/null)" != "true" ]; do
echo "Waiting database container status"
sleep 5
done
systemctl start restore-backup.service
else
echo "Workflow failed or was cancelled, aborting."
exit 1
fi

View File

@@ -1,69 +0,0 @@
#!/bin/bash
source /opt/fefan/env.sh
## .env should define
# ACT_RUNNER_USER: act_runner username (act_runner)
# ACT_RUNNER_LOCATION: act_runner binary location (/usr/local/bin)
# ACT_RUNNER_VERSION: act_runner version (0.2.13)
# ENV_FILE_LOCATION: .env file location on vm (/opt/fefan/fefan.env)
# GITEA_INSTANCE_URL: url of the gitea instance (https://gitea.aldon.fr)
# GITEA_RUNNER_REGISTRATION_TOKEN: registration token for gitea runner (repository scope)
# USERNAME: username of the vm (fefan)
# REPOSITORY: repository on which service code is hosted (mop/fefan)
if ! id -u $ACT_RUNNER_USER >/dev/null 2>&1; then
adduser \
--system \
--shell /bin/bash \
--gecos 'Action runner user' \
--ingroup docker\
--disabled-password \
--home /home/$ACT_RUNNER_USER \
$ACT_RUNNER_USER
fi
wget -O $ACT_RUNNER_LOCATION/act_runner https://dl.gitea.com/act_runner/$ACT_RUNNER_VERSION/act_runner-$ACT_RUNNER_VERSION-linux-amd64
chmod +x $ACT_RUNNER_LOCATION/act_runner
cat <<EOF > /home/$ACT_RUNNER_USER/config.yaml
log:
level: info
runner:
file: .runner
capacity: 1
timeout: 3h
shutdown_timeout: 0s
insecure: false
fetch_timeout: 5s
env_file: $ENV_FILE_LOCATION
fetch_interval: 2s
github_mirror: ''
labels:
- 'ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest'
- 'ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04'
- 'ubuntu-20.04:docker://docker.gitea.com/runner-images:ubuntu-20.04'
cache:
enabled: true
dir: ""
host: ""
port: 0
external_server: ""
container:
network: ""
privileged: false
options:
workdir_parent:
valid_volumes: []
docker_host: ""
force_pull: true
force_rebuild: false
require_docker: false
docker_timeout: 0s
host:
workdir_parent:
EOF
cd /home/act_runner
sudo -u $ACT_RUNNER_USER act_runner register --no-interactive --instance $GITEA_INSTANCE_URL --token $GITEA_RUNNER_REGISTRATION_TOKEN --name $USERNAME --labels $USERNAME
chown -R $ACT_RUNNER_USER:docker /home/$ACT_RUNNER_USER

View File

@@ -1,14 +1,16 @@
#!/bin/bash
source /opt/fefan/env.sh
source /opt/environment/.env
# FEFAN_BACKUPS_DIR=/backups/fefan
# FEFAN_BACKUP_PREFIX=fefan-dump
## Environment variables
# SERVICE_BACKUPS_DIR=/backups/fefan
# SERVICE_BACKUPS_PREFIX=fefan-dump
# SERVICE_BACKUPS_EXTENSION=tar.gz
LATEST_BACKUP=$(ls -1 $FEFAN_BACKUPS_DIR/$FEFAN_BACKUP_PREFIX-*.tar.gz 2>/dev/null | sort | tail -n1)
LATEST_BACKUP=$(ls -1 $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION 2>/dev/null | sort | tail -n1)
if [ -n "$LATEST_BACKUP" ] && [ -f "$LATEST_BACKUP" ]; then
docker cp $LATEST_BACKUP fefan-strapi-1:/app/${LATEST_BACKUP#"$FEFAN_BACKUPS_DIR"/}
docker exec fefan-strapi-1 yarn strapi import -f /app/${LATEST_BACKUP#"$FEFAN_BACKUPS_DIR"/} --force
docker exec fefan-strapi-1 rm /app/${LATEST_BACKUP#"$FEFAN_BACKUPS_DIR"/}
docker cp $LATEST_BACKUP fefan-strapi-1:/app/${LATEST_BACKUP#"$SERVICE_BACKUPS_DIR"/}
docker exec fefan-strapi-1 yarn strapi import -f /app/${LATEST_BACKUP#"$SERVICE_BACKUPS_DIR"/} --force
docker exec fefan-strapi-1 rm /app/${LATEST_BACKUP#"$SERVICE_BACKUPS_DIR"/}
fi

View File

View File

@@ -1,16 +0,0 @@
[Unit]
Description=Gitea Actions runner
Documentation=https://gitea.com/gitea/act_runner
After=docker.service
[Service]
ExecStart=/usr/local/bin/act_runner daemon --config /home/act_runner/config.yaml
ExecReload=/bin/kill -s HUP $MAINPID
WorkingDirectory=/home/act_runner
TimeoutSec=0
RestartSec=10
Restart=always
User=act_runner
[Install]
WantedBy=multi-user.target

View File

@@ -1,9 +0,0 @@
[Unit]
Description=Backup Service
Wants=network.target
After=network.target docker.service
[Service]
Type=oneshot
User=root
ExecStart=/usr/local/bin/backup.sh

View File

@@ -1,9 +0,0 @@
[Unit]
Description=Run backup weekly
[Timer]
OnCalendar=Sun *-*-* 01:00:00
Persistent=true
[Install]
WantedBy=timers.target

View File

@@ -1,9 +0,0 @@
[Unit]
Description=Restore latest backup
After=network.target
Requires=docker.service
[Service]
Type=oneshot
User=root
ExecStart=/usr/local/bin/restore-backup.sh

View File

@@ -15,6 +15,7 @@ module "vm" {
ssh_public_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
cloudinit_config = templatefile(
"${path.module}/cloud-init/service.yaml",
{
@@ -22,15 +23,17 @@ module "vm" {
domain = var.domain
ssh_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
environment-setup-script = indent(6, file("${path.module}/lib/scripts/env.sh"))
restore-backup-script = indent(6, file("${path.module}/lib/scripts/restore-backup.sh"))
restore-backup-service = indent(6, file("${path.module}/lib/services/restore-backup.service"))
restore-backup-service = indent(6, file("${path.module}/../common/services/docker/restore-backup.service"))
create-backup-script = indent(6, file("${path.module}/lib/scripts/create-backup.sh"))
create-backup-service = indent(6, file("${path.module}/lib/services/create-backup.service"))
create-backup-timer = indent(6, file("${path.module}/lib/services/create-backup.timer"))
act_runner-service = indent(6, file("${path.module}/lib/services/act_runner.service"))
act_runner-install-script = indent(6, file("${path.module}/lib/scripts/install-runner.sh"))
fefan-install-script = indent(6, file("${path.module}/lib/scripts/install-fefan.sh"))
create-backup-service = indent(6, file("${path.module}}/../common/services/docker/create-backup.service"))
create-backup-timer = indent(6, file("${path.module}/../common/services/create-backup.timer"))
act_runner-service = indent(6, file("${path.module}/../common/services/act_runner.service"))
act_runner-install-script = indent(6, file("${path.module}/../common/scripts/install-runner.sh"))
service-install-script = indent(6, file("${path.module}/../common/scripts/install-service-ci.sh"))
env-file-content = indent(6, file("${path.module}/.env"))
}
)

View File

@@ -1,22 +1,27 @@
variable "name" {
description = "Virtual Machine name"
type = string
}
variable "vm_id" {
description = "Virtual Machine id"
type = number
}
variable "node_name" {
description = "Proxmox node name"
type = string
default = "mop"
}
variable "cores" {
description = "Number of CPU cores for this virtual machine"
type = number
default = 2
}
variable "memory" {
description = "Memory RAM for this virtual machine"
type = number
default = 2048
}
@@ -28,35 +33,39 @@ variable "balloon" {
}
variable "template_id" {
description = "Virtual machine template ID"
type = number
}
variable "ssh_public_key" {
type = string
description = "Public SSH key for cloud-init user"
type = string
}
variable "hostname" {
description = "VM hostname"
description = "Virtual Machine hostname (<service-name>)"
type = string
default = "test"
}
variable "domain" {
description = "VM domain"
description = "Virtual Machine domain (example.fr)"
type = string
default = ""
}
variable "disk_size" {
description = "Disk size for the virtual machine"
type = number
default = 10
}
variable "proxmox_host_ip" {
description = "Proxmox host base ip"
type = string
}
variable "vm_ip_address" {
description = "Virtual machine ip"
type = string
}

View File

@@ -1,8 +1,11 @@
# Environment files
ENV_FILE_LOCATION=/opt/environment/.env
# Application Specifics
#openssl rand -hex 20
WEBHOOK_SECRET=xxx
TRAEFIK_VERSION=v3.6.7
TRAEFIK_BINARY=/usr/local/bin/traefik
TRAEFIK_USER=traefik
TRAEFIK_CONF=/home/traefik/traefik.yml
GATEWAY_REPOSITORY=/Mop/gateway
GATEWAY_REPOSITORY_LOCATION=/home/traefik/gateway
DYNAMIC_CONFIG_LOCATION=/home/gateway/services.yaml

View File

@@ -26,11 +26,7 @@ packages:
- gunicorn
write_files:
- path: /opt/gateway/env.sh
permissions: "0644"
content: |
${environment-setup-script}
- path: /opt/gateway/gateway.env
- path: /opt/environment/.env
permissions: "0644"
content: |
${env-file-content}
@@ -38,14 +34,6 @@ write_files:
permissions: "0755"
content: |
${install-traefik-script}
- path: /usr/local/bin/pull-webhook.py
permissions: "0755"
content: |
${pull-webhook-script}
- path: /etc/systemd/system/pull-webhook.service
permissions: "0755"
content: |
${pull-webhook-service}
- path: /etc/systemd/system/traefik.service
permissions: "0755"
content: |
@@ -53,8 +41,6 @@ write_files:
runcmd:
- /opt/gateway/install-traefik.sh
- systemctl enable pull-webhook.service
- systemctl start pull-webhook.service
final_message: |
Base system ready for ${hostname}

View File

@@ -1,4 +0,0 @@
#!/bin/bash
set -a
[ -f /opt/gateway/gateway.env ] && source /opt/gateway/gateway.env
set +a

View File

@@ -1,13 +1,13 @@
#!/bin/bash
# GATEWAY_REPOSITORY_LOCATION (path on vm)
# DYNAMIC_CONFIG_LOCATION (path on vm)
# GATEWAY_REPOSITORY (path on gitea)
# TRAEFIK_USER
# TRAEFIK_BINARY
# TRAEFIK_VERSION
# TRAEFIK_CONF
source /opt/gateway/env.sh
source /opt/environment/.env
if ! id -u $TRAEFIK_USER >/dev/null 2>&1; then
adduser \
@@ -32,8 +32,6 @@ chown $TRAEFIK_USER:$TRAEFIK_USER /etc/traefik/acme.json
chmod 600 /etc/traefik/acme.json
setcap 'cap_net_bind_service=+ep' /usr/local/bin/traefik
git clone https://gitea.aldon.fr/$GATEWAY_REPOSITORY.git $GATEWAY_REPOSITORY_LOCATION
cat > "$TRAEFIK_CONF" <<EOF
entryPoints:
web:
@@ -42,7 +40,7 @@ entryPoints:
address: ":443"
providers:
file:
directory: $GATEWAY_REPOSITORY_LOCATION
filename: $DYNAMIC_CONFIG_LOCATION
watch: true
api:
dashboard: false

View File

@@ -1,23 +0,0 @@
from flask import Flask, request, abort
import subprocess
import os
SECRET = os.environ.get("WEBHOOK_SECRET")
REPOSITORY = os.environ.get("GATEWAY_REPOSITORY_LOCATION")
app = Flask(__name__)
@app.route("/reload", methods=["POST"])
def reload():
token = request.headers.get("X-Webhook-Token")
if token != SECRET:
abort(403)
subprocess.run(
["git", "-C", REPOSITORY, "pull"],
check=True
)
return "ok\n"
if __name__ == "__main__":
app.run()

View File

@@ -1,13 +0,0 @@
[Unit]
Description=Traefik config webhook
After=network.target
[Service]
WorkingDirectory=/usr/local/bin
ExecStart=/usr/bin/gunicorn --bind 0.0.0.0:5555 pull-webhook:app
EnvironmentFile=/opt/gateway/gateway.env
Restart=always
User=root
[Install]
WantedBy=multi-user.target

View File

@@ -15,19 +15,18 @@ module "vm" {
ssh_public_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
cloudinit_config = templatefile(
"${path.module}/cloud-init/service.yaml",
{
hostname = var.hostname
domain = var.domain
ssh_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
environment-setup-script = indent(6, file("${path.module}/lib/scripts/env.sh"))
env-file-content = indent(6, file("${path.module}/.env"))
pull-webhook-service = indent(6, file("${path.module}/lib/services/pull-webhook.service"))
pull-webhook-script = indent(6, file("${path.module}/lib/scripts/pull-webhook.py"))
proxmox_host_ip = var.proxmox_host_ip
traefik-service = indent(6, file("${path.module}/lib/services/traefik.service"))
install-traefik-script = indent(6, file("${path.module}/lib/scripts/install-traefik.sh"))
env-file-content = indent(6, file("${path.module}/.env"))
}
)
}

View File

@@ -0,0 +1,3 @@
output "vm_ip_address" {
value = var.vm_ip_address
}

View File

@@ -1,22 +1,27 @@
variable "name" {
description = "Virtual Machine name"
type = string
}
variable "vm_id" {
description = "Virtual Machine id"
type = number
}
variable "node_name" {
description = "Proxmox node name"
type = string
default = "mop"
}
variable "cores" {
description = "Number of CPU cores for this virtual machine"
type = number
default = 2
}
variable "memory" {
description = "Memory RAM for this virtual machine"
type = number
default = 2048
}
@@ -28,35 +33,39 @@ variable "balloon" {
}
variable "template_id" {
description = "Virtual machine template ID"
type = number
}
variable "ssh_public_key" {
type = string
description = "Public SSH key for cloud-init user"
type = string
}
variable "hostname" {
description = "VM hostname"
description = "Virtual Machine hostname (<service-name>)"
type = string
default = "test"
}
variable "domain" {
description = "VM domain"
description = "Virtual Machine domain (example.fr)"
type = string
default = ""
}
variable "disk_size" {
description = "Disk size for the virtual machine"
type = number
default = 10
}
variable "proxmox_host_ip" {
description = "Proxmox host base ip"
type = string
}
variable "vm_ip_address" {
description = "Virtual machine ip"
type = string
}

View File

@@ -1,9 +1,17 @@
GITEA_HOME="/var/lib/gitea"
GITEA_CONF="/var/lib/gitea/app.ini"
GITEA_USER="git"
GITEA_VERSION="1.25.3"
GITEA_BINARY="/usr/local/bin/gitea"
GITEA_SERVICE="/etc/systemd/system/gitea.service"
DB_NAME="giteadb"
DB_USER="gitea"
GITEA_BACKUPS_DIR="/backups/gitea"
# Environment files
ENV_FILE_LOCATION=/opt/environment/.env
# Application specifics
GITEA_HOME=/var/lib/gitea
GITEA_CONF=$GITEA_HOME/app.ini
GITEA_USER=git
GITEA_VERSION=1.25.3
GITEA_BINARY=/usr/local/bin/gitea
GITEA_SERVICE=/etc/systemd/system/gitea.service
DB_NAME=giteadb
DB_USER=gitea
# Backup specifics
SERVICE_BACKUPS_DIR=/backups/gitea
SERVICE_BACKUPS_PREFIX=gitea-dump
SERVICE_BACKUPS_EXTENSION=zip

View File

@@ -35,14 +35,10 @@ mounts:
- [ "192.168.1.12:/main/backups", "/backups", "nfs", "defaults,_netdev,x-systemd.requires=network-online.target", "0", "0" ]
write_files:
- path: /opt/gitea/gitea.env
- path: /opt/environment/.env
permissions: "0644"
content: |
${env-file-content}
- path: /opt/gitea/env.sh
permissions: "0644"
content: |
${environment-setup-script}
- path: /usr/local/bin/restore-backup.sh
permissions: "0755"
content: |

View File

@@ -1,10 +1,10 @@
#!/bin/bash
set -euo pipefail
source /opt/gitea/env.sh
source /opt/environment/.env
TIMESTAMP=$(date +'%Y-%m-%d_%H%M%S')
sudo -u "$GITEA_USER" gitea dump -c "$GITEA_HOME/app.ini" -f $GITEA_BACKUPS_DIR/gitea-dump-$TIMESTAMP.zip
sudo -u "$GITEA_USER" gitea dump -c "$GITEA_CONF" -f $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-$TIMESTAMP.$SERVICE_BACKUPS_EXTENSION
ls -1dt $GITEA_BACKUPS_DIR/gitea-dump-*.zip | tail -n +5 | xargs -r rm -f
ls -1dt $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION | tail -n +5 | xargs -r rm -f

View File

@@ -1,4 +0,0 @@
#!/bin/bash
set -a
[ -f /opt/gitea/gitea.env ] && source /opt/gitea/gitea.env
set +a

View File

@@ -1,7 +1,7 @@
#!/bin/bash
set -euo pipefail
source /opt/gitea/env.sh
source /opt/environment/.env
# Gitea user
if ! id -u $GITEA_USER >/dev/null 2>&1; then
@@ -41,15 +41,15 @@ CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';
CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMPLATE template0 ENCODING UTF8 LC_COLLATE 'en_US.UTF-8' LC_CTYPE 'en_US.UTF-8';
EOF
if ls -1 "$GITEA_BACKUPS_DIR"/gitea-dump-*.zip >/dev/null 2>&1; then
if ls -1 "$SERVICE_BACKUPS_DIR"/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION >/dev/null 2>&1; then
echo "---- Backup found, restoring Gitea ----"
/usr/local/bin/restore-backup.sh
else
echo "---- No backup found in $GITEA_BACKUPS_DIR, skipping restore ----"
echo "---- No backup found in $SERVICE_BACKUPS_DIR, skipping restore ----"
fi
sudo chown -R $GITEA_USER:$GITEA_USER $GITEA_BACKUPS_DIR
sudo chmod -R 770 $GITEA_BACKUPS_DIR
sudo chown -R $GITEA_USER:$GITEA_USER $SERVICE_BACKUPS_DIR
sudo chmod -R 770 $SERVICE_BACKUPS_DIR
GITEA_SECRET_KEY=$("$GITEA_BINARY" generate secret SECRET_KEY)
GITEA_JWT_SECRET=$("$GITEA_BINARY" generate secret JWT_SECRET)
@@ -90,7 +90,7 @@ ENABLED=true
EOF
echo "---- Generated Gitea app.ini with secrets ----"
chown git:git $GITEA_CONF
chown $GITEA_USER:$GITEA_USER $GITEA_CONF
chmod 640 $GITEA_CONF
systemctl daemon-reload

View File

@@ -1,7 +1,7 @@
#!/bin/bash
set -euo pipefail
source /opt/gitea/env.sh
source /opt/environment/.env
sudo -u postgres psql <<EOF
DO \$\$
@@ -16,7 +16,7 @@ END
\$\$;
EOF
LATEST_BACKUP=$(ls -1 $GITEA_BACKUPS_DIR/gitea-dump-*.zip 2>/dev/null | sort | tail -n1)
LATEST_BACKUP=$(ls -1 $SERVICE_BACKUPS_DIR/$SERVICE_BACKUPS_PREFIX-*.$SERVICE_BACKUPS_EXTENSION 2>/dev/null | sort | tail -n1)
if [ -n "$LATEST_BACKUP" ] && [ -f "$LATEST_BACKUP" ]; then
TMP_DIR=$(mktemp -d)

View File

@@ -1,9 +0,0 @@
[Unit]
Description=Run backup weekly
[Timer]
OnCalendar=Sun *-*-* 01:00:00
Persistent=true
[Install]
WantedBy=timers.target

View File

@@ -15,6 +15,7 @@ module "vm" {
ssh_public_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
cloudinit_config = templatefile(
"${path.module}/cloud-init/service.yaml",
{
@@ -22,12 +23,12 @@ module "vm" {
domain = var.domain
ssh_key = var.ssh_public_key
proxmox_host_ip = var.proxmox_host_ip
environment-setup-script = indent(6, file("${path.module}/lib/scripts/env.sh"))
restore-backup-script = indent(6, file("${path.module}/lib/scripts/restore-backup.sh"))
restore-backup-service = indent(6, file("${path.module}/lib/services/restore-backup.service"))
create-backup-script = indent(6, file("${path.module}/lib/scripts/create-backup.sh"))
create-backup-service = indent(6, file("${path.module}/lib/services/create-backup.service"))
create-backup-timer = indent(6, file("${path.module}/lib/services/create-backup.timer"))
create-backup-timer = indent(6, file("${path.module}/../common/services/create-backup.timer"))
install-gitea-script = indent(6, file("${path.module}/lib/scripts/install-gitea.sh"))
gitea-service = indent(6, file("${path.module}/lib/services/gitea.service"))

View File

@@ -1,22 +1,27 @@
variable "name" {
description = "Virtual Machine name"
type = string
}
variable "vm_id" {
description = "Virtual Machine id"
type = number
}
variable "node_name" {
description = "Proxmox node name"
type = string
default = "mop"
}
variable "cores" {
description = "Number of CPU cores for this virtual machine"
type = number
default = 2
}
variable "memory" {
description = "Memory RAM for this virtual machine"
type = number
default = 2048
}
@@ -28,35 +33,39 @@ variable "balloon" {
}
variable "template_id" {
description = "Virtual machine template ID"
type = number
}
variable "ssh_public_key" {
type = string
description = "Public SSH key for cloud-init user"
type = string
}
variable "hostname" {
description = "VM hostname"
description = "Virtual Machine hostname (<service-name>)"
type = string
default = "test"
}
variable "domain" {
description = "VM domain"
description = "Virtual Machine domain (example.fr)"
type = string
default = ""
}
variable "disk_size" {
description = "Disk size for the virtual machine"
type = number
default = 10
}
variable "proxmox_host_ip" {
description = "Proxmox host base ip"
type = string
}
variable "vm_ip_address" {
description = "Virtual machine ip"
type = string
}

View File

@@ -1,4 +1,3 @@
# testt
http:
routers:
http-catchall:

View File

@@ -1,6 +1,4 @@
ssh_public_key = "<ssh-public-key>"
proxmox_api_token = "<proxmox-api-token>"
proxmox_endpoint = "http://mop:8006"
proxmox_host_ip = "192.168.1.121"
gateway_repository = "../gateway"
gateway_token = "xxx"
proxmox_host_ip = "192.168.1.121"

View File

@@ -16,14 +16,4 @@ variable "proxmox_endpoint" {
variable "proxmox_host_ip" {
description = "Proxmox ip for backup nfs share"
type = string
}
variable "gateway_repository" {
description = "Gateway repository relative path (from this terraform repository), for traefik automatic config generation."
type = string
}
variable "gateway_token" {
description = "Gateway webhook token same in /module/apps/gateway/.env"
type = string
}