Compare commits
5 commits
0acb6ae272
...
617c288f44
| Author | SHA1 | Date | |
|---|---|---|---|
| 617c288f44 | |||
| 197b9c297c | |||
| abcc144711 | |||
| 31cc60c648 | |||
| a93d22fb05 |
19 changed files with 146 additions and 15 deletions
24
.forgejo/workflows/cleanup-docs.yaml
Normal file
24
.forgejo/workflows/cleanup-docs.yaml
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types:
|
||||||
|
- closed
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
cleanup-staging:
|
||||||
|
runs-on: docker
|
||||||
|
container:
|
||||||
|
image: code.forgejo.org/oci/node:22-bookworm
|
||||||
|
steps:
|
||||||
|
- name: Pipeline info PR
|
||||||
|
run: |
|
||||||
|
echo "Run triggered by ${{ github.event_name }} (${{ github.event.action }}) on ref ${{ github.ref_name }}"
|
||||||
|
|
||||||
|
- name: Staging Deployment - Prepare keys
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv
|
||||||
|
chmod 400 deploykey.priv
|
||||||
|
echo "${{ vars.SSH_KNOWN_HOSTS }}" > ./known_hosts
|
||||||
|
|
||||||
|
- name: Staging Deployment - Remove PR from staging
|
||||||
|
run: |
|
||||||
|
ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' infra-docs-deploy@public-web-static.hosts.hamburg.ccc.de -t "rm -r /var/www/staging.infra-docs.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/"
|
||||||
75
.forgejo/workflows/deploy-docs.yaml
Normal file
75
.forgejo/workflows/deploy-docs.yaml
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
env:
|
||||||
|
TZ: Europe/Berlin
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: docker
|
||||||
|
container:
|
||||||
|
image: docker.io/library/python:3.14-trixie
|
||||||
|
steps:
|
||||||
|
- name: Pipeline info
|
||||||
|
run: |
|
||||||
|
echo "Run triggered by ${{ github.event_name }} (${{ github.event.action }}) on ref ${{ github.ref_name }}"
|
||||||
|
|
||||||
|
- name: Install packages
|
||||||
|
run: |
|
||||||
|
apt update
|
||||||
|
apt -y install nodejs git rsync openssh-client
|
||||||
|
pip install --upgrade pip
|
||||||
|
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install Python packages
|
||||||
|
run: |
|
||||||
|
pip install -r docs_requirements.txt
|
||||||
|
|
||||||
|
- name: Build website - prod
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
run: |
|
||||||
|
mkdocs build
|
||||||
|
|
||||||
|
- name: Build website - staging
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
run: |
|
||||||
|
sed -i "s#site_url: https://infra-docs.hamburg.ccc.de#site_url: https://staging.infra-docs.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/#" mkdocs.yml
|
||||||
|
mkdocs build
|
||||||
|
|
||||||
|
- name: Deploy - Prepare keys
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv
|
||||||
|
chmod 400 deploykey.priv
|
||||||
|
echo "${{ vars.SSH_KNOWN_HOSTS }}" > ./known_hosts
|
||||||
|
|
||||||
|
- name: Deploy - Upload PR to staging
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
run: |
|
||||||
|
echo "Deploying to staging.infra-docs.hamburg.ccc.de/pr${{ github.event.pull_request.number }}"
|
||||||
|
rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" site/ infra-docs-deploy@public-web-static.hosts.hamburg.ccc.de:/var/www/staging.infra-docs.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/
|
||||||
|
|
||||||
|
- name: Deploy - Add comment to PR with staging URL
|
||||||
|
if: github.event_name == 'pull_request' && github.event.action == 'opened'
|
||||||
|
run: |
|
||||||
|
curl \
|
||||||
|
-X POST \
|
||||||
|
${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Authorization: token $FORGEJO_TOKEN" \
|
||||||
|
--data '{ "body": "You can view your changes at https://staging.infra-docs.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" }'
|
||||||
|
|
||||||
|
- name: Deploy - Upload to prod
|
||||||
|
if: github.event_name != 'pull_request'
|
||||||
|
run: |
|
||||||
|
rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" site/ infra-docs-deploy@public-web-static.hosts.hamburg.ccc.de:/var/www/infra-docs.hamburg.ccc.de/
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v3
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
with:
|
||||||
|
name: docs-build
|
||||||
|
path: site/
|
||||||
|
retention-days: 3
|
||||||
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
# work in our environmnet.
|
# work in our environmnet.
|
||||||
# Rather manually setup python (pip) before instead.
|
# Rather manually setup python (pip) before instead.
|
||||||
- name: Run ansible-lint
|
- name: Run ansible-lint
|
||||||
uses: https://github.com/ansible/ansible-lint@v26.3.0
|
uses: https://github.com/ansible/ansible-lint@v26.4.0
|
||||||
with:
|
with:
|
||||||
setup_python: "false"
|
setup_python: "false"
|
||||||
requirements_file: "requirements.yml"
|
requirements_file: "requirements.yml"
|
||||||
|
|
|
||||||
3
docs/index.md
Normal file
3
docs/index.md
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
# CCCHH Infrastructure Documentation
|
||||||
|
|
||||||
|
Home for CCCHH infrastructure documentation.
|
||||||
3
docs_requirements.txt
Normal file
3
docs_requirements.txt
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
mkdocs
|
||||||
|
mkdocs-shadcn
|
||||||
|
pygments
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
# renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
||||||
nextcloud__version: 32
|
nextcloud__version: 32
|
||||||
# renovate: datasource=docker depName=docker.io/library/postgres
|
# renovate: datasource=docker depName=docker.io/library/postgres
|
||||||
nextcloud__postgres_version: 15.17
|
nextcloud__postgres_version: 15.18
|
||||||
nextcloud__fqdn: cloud.hamburg.ccc.de
|
nextcloud__fqdn: cloud.hamburg.ccc.de
|
||||||
nextcloud__data_dir: /data/nextcloud
|
nextcloud__data_dir: /data/nextcloud
|
||||||
nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
|
nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
||||||
netbox__version: "v4.5.5"
|
netbox__version: "v4.6.1"
|
||||||
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
||||||
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
||||||
|
|
||||||
|
|
|
||||||
20
mkdocs.yml
Normal file
20
mkdocs.yml
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
site_name: CCCHH Infrastructure Documentation
|
||||||
|
site_url: https://infra-docs.hamburg.ccc.de
|
||||||
|
repo_url: https://git.hamburg.ccc.de/CCCHH/ansible-infra
|
||||||
|
copyright: MIT
|
||||||
|
markdown_extensions:
|
||||||
|
- smarty
|
||||||
|
- admonition
|
||||||
|
- attr_list
|
||||||
|
- codehilite
|
||||||
|
|
||||||
|
theme:
|
||||||
|
name: shadcn
|
||||||
|
show_title: true
|
||||||
|
show_stargazers: false
|
||||||
|
pygments_style:
|
||||||
|
light: shadcn-light
|
||||||
|
dark: github-dark
|
||||||
|
icon: oui:documentation
|
||||||
|
topbar_sections: false
|
||||||
|
show_datetime: false
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
oauth2-proxy:
|
oauth2-proxy:
|
||||||
container_name: oauth2-proxy
|
container_name: oauth2-proxy
|
||||||
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.1
|
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
|
||||||
command: --config /oauth2-proxy.cfg
|
command: --config /oauth2-proxy.cfg
|
||||||
hostname: oauth2-proxy
|
hostname: oauth2-proxy
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
|
|
@ -287,6 +287,8 @@ spaceapiccc IN CNAME public-reverse-proxy
|
||||||
acmedns IN CNAME public-reverse-proxy
|
acmedns IN CNAME public-reverse-proxy
|
||||||
cpuccc IN CNAME public-reverse-proxy
|
cpuccc IN CNAME public-reverse-proxy
|
||||||
did IN CNAME public-reverse-proxy
|
did IN CNAME public-reverse-proxy
|
||||||
|
infra-docs IN CNAME public-reverse-proxy
|
||||||
|
staging.infra-docs IN CNAME public-reverse-proxy
|
||||||
|
|
||||||
|
|
||||||
auth.acmedns IN NS acmedns.hosts.hamburg.ccc.de.
|
auth.acmedns IN NS acmedns.hosts.hamburg.ccc.de.
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
image: docker.io/prom/prometheus:v3.10.0
|
image: docker.io/prom/prometheus:v3.11.3
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
command:
|
command:
|
||||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
|
|
@ -19,7 +19,7 @@ services:
|
||||||
- prom_data:/prometheus
|
- prom_data:/prometheus
|
||||||
|
|
||||||
alertmanager:
|
alertmanager:
|
||||||
image: docker.io/prom/alertmanager:v0.31.1
|
image: docker.io/prom/alertmanager:v0.32.1
|
||||||
container_name: alertmanager
|
container_name: alertmanager
|
||||||
command:
|
command:
|
||||||
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
||||||
|
|
@ -46,7 +46,7 @@ services:
|
||||||
- graf_data:/var/lib/grafana
|
- graf_data:/var/lib/grafana
|
||||||
|
|
||||||
pve-exporter:
|
pve-exporter:
|
||||||
image: docker.io/prompve/prometheus-pve-exporter:3.8.2
|
image: docker.io/prompve/prometheus-pve-exporter:3.9.0
|
||||||
container_name: pve-exporter
|
container_name: pve-exporter
|
||||||
ports:
|
ports:
|
||||||
- 9221:9221
|
- 9221:9221
|
||||||
|
|
@ -59,7 +59,7 @@ services:
|
||||||
- /dev/null:/etc/prometheus/pve.yml
|
- /dev/null:/etc/prometheus/pve.yml
|
||||||
|
|
||||||
loki:
|
loki:
|
||||||
image: docker.io/grafana/loki:3.7.1
|
image: docker.io/grafana/loki:3.7.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
ports:
|
ports:
|
||||||
- 13100:3100
|
- 13100:3100
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
keycloak:
|
keycloak:
|
||||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.5.7
|
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.0
|
||||||
pull_policy: always
|
pull_policy: always
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: start --optimized
|
command: start --optimized
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
ntfy:
|
ntfy:
|
||||||
image: docker.io/binwiederhier/ntfy:v2.20.1
|
image: docker.io/binwiederhier/ntfy:v2.23.0
|
||||||
container_name: ntfy
|
container_name: ntfy
|
||||||
command:
|
command:
|
||||||
- serve
|
- serve
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
image: docker.io/onlyoffice/documentserver:9.3.1
|
image: docker.io/onlyoffice/documentserver:9.4.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/library/redis:8.6.2
|
image: docker.io/library/redis:8.6.3
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
|
|
@ -23,7 +23,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
static:
|
static:
|
||||||
image: docker.io/library/nginx:1.29.7
|
image: docker.io/library/nginx:1.31.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- public:/usr/share/nginx/html
|
- public:/usr/share/nginx/html
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,8 @@ map $host $upstream_acme_challenge_host {
|
||||||
diday.org public-web-static.hosts.hamburg.ccc.de:31820;
|
diday.org public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
|
infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
|
staging.infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:31820;
|
||||||
default "";
|
default "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,8 @@ stream {
|
||||||
*.staging.diday.org public-web-static.hosts.hamburg.ccc.de:8443;
|
*.staging.diday.org public-web-static.hosts.hamburg.ccc.de:8443;
|
||||||
docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
||||||
staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
staging.docs.c3voc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
||||||
|
infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
||||||
|
staging.infra-docs.hamburg.ccc.de public-web-static.hosts.hamburg.ccc.de:8443;
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/library/redis:8.6.2
|
image: docker.io/library/redis:8.6.3
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "6379:6379"
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:18.3
|
image: docker.io/library/postgres:18.4
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./database:/var/lib/postgresql
|
- ./database:/var/lib/postgresql
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue