diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0c0b33c..19c52f6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,31 +22,13 @@ jobs: - name: Build run: nix build -L - - uses: actions/upload-artifact@v4 - with: - name: website - path: result - - deploy: - runs-on: ubuntu-latest - needs: build - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - uses: actions/upload-artifact@v4 - with: - name: website-static - path: result - - name: Patch run: | mv result result-old mkdir result cp -r result-old/* result chmod +w -R result - echo "User-agent: *\nDisallow: /" > result/browser/robots.txt + echo "User-agent: *\nDisallow: /" > result/robots.txt - name: Publish to Cloudflare Pages uses: cloudflare/pages-action@v1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c4a847d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/result diff --git a/derivation.nix b/derivation.nix index 1ec6a33..32c5946 100644 --- a/derivation.nix +++ b/derivation.nix @@ -21,12 +21,9 @@ stdenv.mkDerivation { foundation --content-directory ./content/ & APP_DIR=${frontend} node ${frontend}/server.mjs & sleep 1 - wget --recursive --page-requisites --convert-links --no-parent --continue --adjust-extension http://127.0.0.1:4000/en/|| true - mkdir $out - lndir ${frontend}/browser $out - (cd "127.0.0.1:4000" && find . -type f -name '*.html' -exec bash -c '(mkdir -p ${placeholder "out"}/$(dirname {}) && mv {} ${placeholder "out"}/{})' \;) - (cd "127.0.0.1:4000" && find . -type f -name '*.css' -exec bash -c '(mkdir -p ${placeholder "out"}/$(dirname {}) && mv {} ${placeholder "out"}/{})' \;) - mv "127.0.0.1:8080" $out - find $out -type f -name '*.js' -delete + mkdir data + wget --recursive --page-requisites --no-parent --convert-links --continue --adjust-extension http://127.0.0.1:4000/ || true + find '127.0.0.1:4000' -type f -iname '*.js' -delete + mv '127.0.0.1:4000' $out ''; } diff --git a/flake.lock b/flake.lock index ec34b29..3a95d18 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "pnpm2nix": "pnpm2nix" }, "locked": { - "lastModified": 1723323178, - "narHash": "sha256-MEqKIypt2B38MxdQo0TQy/A/aC4NPQUa+IZZce2md4Q=", + "lastModified": 1723403124, + "narHash": "sha256-Ws64/OJDz4IYv/XkMsDxHZACuYIDCeggwk9IiwVZzmM=", "owner": "dd-ix", "repo": "website", - "rev": "c6299f51ab08201a32dce19ceb1d847d71786781", + "rev": "e12c414107cb78295520664a17d80972fa09764a", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1723060422, - "narHash": "sha256-K3XNDBhZHDvOD78rXKG3AEOG9PRvju4O8gMLY9TJKMQ=", + "lastModified": 1723403104, + "narHash": "sha256-EgQO7LTWfHeFsMd2Nbf0wJrsnWxreLcQWQ8cG6kOqgo=", "owner": "dd-ix", "repo": "website-content-api", - "rev": "8eaca6a3e3d06cbb96f4151b7b77e49f9a51d754", + "rev": "348c19417f0a14bdb9ea4cc835ac2c8f21fc6fff", "type": "github" }, "original": { diff --git a/impressum-unter.kontakt.md b/impressum-unter.kontakt.md deleted file mode 100644 index 4785f7e..0000000 --- a/impressum-unter.kontakt.md +++ /dev/null @@ -1,35 +0,0 @@ -### Registereintrag: -Eintragung im Registergericht: Musterstadt (todo) - -Registernummer: 12345 (todo) - -### Umsatzsteuer-ID: -Umsatzsteuer-Identifikationsnummer gemäß §27a Umsatzsteuergesetz: Musterustid (todo). -[DD-IX Mitgliedsantrag.pdf](content%2Fdocuments%2Fdownload%2FDD-IX%20Mitgliedsantrag.pdf) -### Wirtschafts-ID: -Musterwirtschaftsid (todo) - -### Aufsichtsbehörde: -Musteraufsicht Musterstadt (todo) - - - -------------------------- -Datenschutzerklärung unter Kontakt - -Datenschutzbeauftragte/r beim Anbieter ist: - -\[DSB – Vorname, Nachname\] -Telefon: \[DSB – Telefonnummer\] -E-Mail: \[DSB – E-Mail\] \[nachfolgende Angaben sind zu ergänzen, sofern ein Externer Datenschutzbeauftragter bestellt ist\] \[DSB-Extern – Straße, Hausnummer\] -\[DSB-Extern – Postleitzahl, Ort\] - - -The controller’s data protection officer is: - -\[DSB – Vorname, Nachname\] -Telefon: \[DSB – Telefonnummer\] -E-Mail: \[DSB – E-Mail\] \[The following information must be added if an external data protection officer has been appointed\]. - -\[DSB-Extern – Straße, Hausnummer\] -\[DSB-Extern – Postleitzahl, Ort\] diff --git a/result b/result deleted file mode 120000 index b07cbb7..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/hj4qmr22vp1vhlv0fgyg2lfnlrd1d0y4-website-content-preview \ No newline at end of file