diff --git a/.forgejo/workflows/cleanup-docs.yaml b/.forgejo/workflows/cleanup-docs.yaml deleted file mode 100644 index df56258..0000000 --- a/.forgejo/workflows/cleanup-docs.yaml +++ /dev/null @@ -1,24 +0,0 @@ -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 }}/" diff --git a/.forgejo/workflows/deploy-docs.yaml b/.forgejo/workflows/deploy-docs.yaml deleted file mode 100644 index 537d983..0000000 --- a/.forgejo/workflows/deploy-docs.yaml +++ /dev/null @@ -1,75 +0,0 @@ -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 diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index e390c5e..0000000 --- a/docs/index.md +++ /dev/null @@ -1,3 +0,0 @@ -# CCCHH Infrastructure Documentation - -Home for CCCHH infrastructure documentation. diff --git a/docs_requirements.txt b/docs_requirements.txt deleted file mode 100644 index ddabb05..0000000 --- a/docs_requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -mkdocs -mkdocs-shadcn -pygments diff --git a/mkdocs.yml b/mkdocs.yml deleted file mode 100644 index 5a8af7b..0000000 --- a/mkdocs.yml +++ /dev/null @@ -1,20 +0,0 @@ -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 diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone index 8c30fb4..a9c4851 100644 --- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone +++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone @@ -287,8 +287,6 @@ spaceapiccc IN CNAME public-reverse-proxy acmedns IN CNAME public-reverse-proxy cpuccc 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. diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf index 304072b..e8b8c8e 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf @@ -85,8 +85,6 @@ map $host $upstream_acme_challenge_host { diday.org 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; - 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 ""; } diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf index 5e89aa9..0a004c9 100644 --- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf +++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf @@ -108,8 +108,6 @@ stream { *.staging.diday.org 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; - 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 {