commit 966e54e5c6645f67e0d02b0fecc51dbf59adcf97 Author: Askill Date: Thu Jul 18 11:30:33 2024 +0200 snapshot from private github repo diff --git a/.github/workflows/k8s_deploy.yml b/.github/workflows/k8s_deploy.yml new file mode 100644 index 0000000..4e94e27 --- /dev/null +++ b/.github/workflows/k8s_deploy.yml @@ -0,0 +1,57 @@ + +name: 'Deploy Optar to k8s' + +on: workflow_dispatch + +env: + ECR_REPOSITORY: optar + EKS_CLUSTER_NAME: optar-dev-eks + AWS_REGION: eu-central-1 + +# ref: https://dlmade.medium.com/ci-cd-with-github-action-and-aws-eks-5fd9714010cd +jobs: + build: + + name: Deployment + runs-on: ubuntu-latest + + steps: + - name: Set short git commit SHA + id: commit + uses: prompt/actions-commit-hash@v2 + + - name: Check out code + uses: actions/checkout@v4 + with: + submodules: true + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{env.AWS_REGION}} + + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: Build, tag, and push image to Amazon ECR + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} + IMAGE_TAG: ${{ steps.commit.outputs.short }} + run: | + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:v0.$IMAGE_TAG ./optar + docker push $ECR_REGISTRY/$ECR_REPOSITORY:v0.$IMAGE_TAG + docker tag $ECR_REGISTRY/$ECR_REPOSITORY:v0.$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest + docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest + + - name: Update kube config + run: aws eks update-kubeconfig --name $EKS_CLUSTER_NAME --region $AWS_REGION + + - name: Deploy to EKS + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} + IMAGE_TAG: ${{ steps.commit.outputs.short }} + run: | + kubectl apply -f ./optar/deployment.yaml \ No newline at end of file diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml new file mode 100644 index 0000000..112208e --- /dev/null +++ b/.github/workflows/terraform.yml @@ -0,0 +1,54 @@ +name: 'Terraform' + +on: + push: + branches: + - main + pull_request: + branches: + - '*' + +jobs: + terraform: + name: 'Terraform' + runs-on: ubuntu-latest + + # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest + defaults: + run: + shell: bash + + # Checkout the repository to the GitHub Actions runner + steps: + - name: Checkout + uses: actions/checkout@v4 + + # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: 1.9.2 + #with: + # cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + + # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. + - name: Terraform Init + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: terraform init + working-directory: terraform + + - name: Terraforrm Workspace + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: terraform workspace select `echo ${GITHUB_REF} | sed 's/\//-/g'` || terraform workspace new `echo ${GITHUB_REF} | sed 's/\//-/g'` + working-directory: terraform + + - name: Terraform apply + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: terraform apply -auto-approve -var-file ./dev.tfvars + working-directory: terraform \ No newline at end of file diff --git a/.github/workflows/terraform_teardown.yml b/.github/workflows/terraform_teardown.yml new file mode 100644 index 0000000..1483ce2 --- /dev/null +++ b/.github/workflows/terraform_teardown.yml @@ -0,0 +1,92 @@ +# This workflow installs the latest version of Terraform CLI and configures the Terraform CLI configuration file +# with an API token for Terraform Cloud (app.terraform.io). On pull request events, this workflow will run +# `terraform init`, `terraform fmt`, and `terraform plan` (speculative plan via Terraform Cloud). On push events +# to the master branch, `terraform apply` will be executed. +# +# Documentation for `hashicorp/setup-terraform` is located here: https://github.com/hashicorp/setup-terraform +# +# To use this workflow, you will need to complete the following setup steps. +# +# 1. Create a `main.tf` file in the root of this repository with the `remote` backend and one or more resources defined. +# Example `main.tf`: +# # The configuration for the `remote` backend. +# terraform { +# backend "remote" { +# # The name of your Terraform Cloud organization. +# organization = "example-organization" +# +# # The name of the Terraform Cloud workspace to store Terraform state files in. +# workspaces { +# name = "example-workspace" +# } +# } +# } +# +# # An example resource that does nothing. +# resource "null_resource" "example" { +# triggers = { +# value = "A example resource that does nothing!" +# } +# } +# +# +# 2. Generate a Terraform Cloud user API token and store it as a GitHub secret (e.g. TF_API_TOKEN) on this repository. +# Documentation: +# - https://www.terraform.io/docs/cloud/users-teams-organizations/api-tokens.html +# - https://help.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets +# +# 3. Reference the GitHub secret in step using the `hashicorp/setup-terraform` GitHub Action. +# Example: +# - name: Setup Terraform +# uses: hashicorp/setup-terraform@v1 +# with: +# cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + +name: 'Terraform Teardown' + +on: workflow_dispatch + +jobs: + terraform: + name: 'Terraform' + runs-on: ubuntu-latest + + # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest + defaults: + run: + shell: bash + + # Checkout the repository to the GitHub Actions runner + steps: + - name: Checkout + uses: actions/checkout@v4 + + # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token + - name: Setup Terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_version: 1.9.2 + #with: + # cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + + # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. + - name: Terraform Init + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: terraform init + working-directory: terraform + + - name: Terraforrm Workspace + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: terraform workspace select `echo ${GITHUB_REF} | sed 's/\//-/g'` || terraform workspace new `echo ${GITHUB_REF} | sed 's/\//-/g'` + working-directory: terraform + + - name: Terraform apply + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: terraform destroy -auto-approve -var-file ./dev.tfvars + working-directory: terraform \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12a9268 --- /dev/null +++ b/.gitignore @@ -0,0 +1,168 @@ +# custom +**/.terraform + + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class +*.exe + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ +.vscode/settings.json diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..46ceb8a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "optar"] + path = optar + url = https://github.com/Askill/optar diff --git a/README.md b/README.md new file mode 100644 index 0000000..67542a2 --- /dev/null +++ b/README.md @@ -0,0 +1,65 @@ +# Web-Crawler-on-EKS [![Terraform](https://github.com/Askill/Web-Crawler-on-EKS/actions/workflows/terraform.yml/badge.svg)](https://github.com/Askill/Web-Crawler-on-EKS/actions/workflows/terraform.yml) [![Deploy Optar to k8s](https://github.com/Askill/Web-Crawler-on-EKS/actions/workflows/k8s_deploy.yml/badge.svg)](https://github.com/Askill/Web-Crawler-on-EKS/actions/workflows/k8s_deploy.yml) + +## Tasks + +- Nutze `terraform` um diese Aufgabe umzusetzen. Wenn möglich gerne auch `terragrunt`. +- Mittels eines CI/CD Tools deiner Wahl soll der Terraform Code ausgeführt werden +- Nutze ein git repository(s), um deinen Code zu verwalten. +- Bau einen Docker Container (oder nutze einen vorhanden) der einen einfachen/einmaligen Crawler Job ausführt gegen eine Webseite deiner Wahl. + - *einmalger crawler run auf EKS erscheint mir nicht sinnvoll, hier würde ich üblicher Weise mit dem Kunden sprechen, warum EKS gewählt wurde und ob eine Alternative besser geeignet wäre.* + - *sinnvoller erscheint mir:* + - *entweder: kubernetes cronjob* + - *oder: ECS fargate scheduled task / lambda, abhängig von der Laufzeit und weiteren Anforderungen* +- Der Crawler Job soll die Daten auf einem S3 Bucket abspeichern. + - *bei dem gewählten crawler würde das Ergebnis am ehesten per SNS abgesetzt, der S3 bucket wird in diesem Fall aber als Cache genutzt, somint sind read und write auf dem Bucket implementiert* +- Provisioniere diesen Container in der AWS auf einem EKS Cluster, wo der Job ausgeführt werden soll. +- Stell sicher das der Code getestet wird + - *Tests demonstrieren die basics, auf extensive Implementierung oder hohe Testabdeckung wurde aber bewusst verzichtet* +- Bereite ein Deployment-Konzept auf und stelle es dar. +- Bereite deine Lösung vor, als würdest du sie einem Kunden vorstellen. + +## Solution + +See ./RUNBOOK.md for technical details on the implementation. + +All code, comments and documentation are written in english, as I am a big fan of lived inclusivity. Unless specifically requests otherwise by the client I prefere english as my working language, even if the current team at the client is fully german speaking, as they might decide in the future to hire international developers. + +### Crawler + +I reused a crawler I had made earlier: `https://github.com/Askill/optar` +This crawler traverses all links on a given website, caches this tree, compares the new tree to previously cached ones and searches all *new* sites for specific keywords. +This crawler is specifically designed for news sites and blogs and not for content changes on normally static sites like a companies home page. + +TODO: + +- tests + - unit tests: ✔️ tested manually, not robust enough to be a library, code coverage of 80% or higher would be unreasonable time invest + - int tests: + - pytest code ✔️ +- docker-compose ✔️ +- make work with S3 ✔️ + +### CI/CD + +Use github actions +This section builds on top of this repository: +, from a small AWS partnered consultancy in LA +The last commit was about 3 years ago, which is why I forked it and would, in a production environment, continue working on my fork: +As some of the terraform code is using deprecated variables, only the ci/cd code is used. + +TODO: + +- setup github actions ✔️ +- build image ✔️ +- run tests ✔️ +- run terraform deploy ✔️ + +### AWS + +TODO: + +- setup terraform ✔️ + - +- create Kubernetes deployment ✔️ +- create s3 ✔️ +- allow s3 access from terraform ✔️ diff --git a/RUNBOOK.md b/RUNBOOK.md new file mode 100644 index 0000000..7b2f2bc --- /dev/null +++ b/RUNBOOK.md @@ -0,0 +1,53 @@ +# Runbook + +## getting started + +To also pull the submodules, make sure to clone this repo like this: +`git clone --recurse-submodules https://github.com/Askill/Web-Crawler-on-EKS` + +## CI + +In this Github repo, there are multiple workflows: + +- to deploy all infrastructure + - runs on push to main or during a PR +- to destroy all infrastructure + - manual action +- to deploy a new latest version of the aplication + - manual action + +### Image build + +The app image can be built with: +`docker build -t 705632797485.dkr.ecr.eu-central-1.amazonaws.com/optar:latest-dev ./optar` +`docker push 705632797485.dkr.ecr.eu-central-1.amazonaws.com/optar:latest-dev` + +## Deployment + +The crawler is deployed as a K8s Job, defined in ./optar/deployment.yaml +Which can be rolled out to the cluster with: +`kubectl apply -f .\deployment.yaml` + +Prerequisite: the correct kubectl config has been set with: +`aws eks --region eu-central-1 update-kubeconfig --name optar-dev-eks` + +## Crawler config + +For this PoC, no changes have been made to how the crawler gets its config, meaning the sites and keywords are set during build time as lines in `./optar/keywords.txt` and `./optar/sites.txt`. + +I reused a crawler I had made earlier: `https://github.com/Askill/optar` +This crawler traverses all links on a given website, caches this tree, compares the new tree to previously cached ones and searches all *new* sites for specific keywords. +This crawler is specifically designed for news sites and blogs and not for content changes on normally static sites like a companies home page. + +## AWS Infrastructure + +Components of note: + +- EKS cluster + - using the standard Terraform EKS module, which utilizes ECS under the hood for auto managed nodes + - also has a service account which can read from the S3 bucket, the application needs, the account is specified in `./optar.deployment.yaml` +- ECR + - created one registry (optar) + - all users and roles in the account have pull and push access, fine for low security applications +- S3 Bucket + - lifecycle rule to delete objects older that 3 days, assuming this crawler is run at least once per day, this leaves some room for error, while also ensuring low overhead. diff --git a/optar/.github/workflows/pytest.yml b/optar/.github/workflows/pytest.yml new file mode 100644 index 0000000..bffd2ab --- /dev/null +++ b/optar/.github/workflows/pytest.yml @@ -0,0 +1,39 @@ +name: 'Pytest' + +on: + push: + branches: + - master + pull_request: + branches: + - '*' + +jobs: + pytest: + name: 'Pytest' + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.12"] + + # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest + defaults: + run: + shell: bash + + # Checkout the repository to the GitHub Actions runner + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pytest==8.2.2 + - name: run test + run: | + pytest tests/watcher_test.py \ No newline at end of file diff --git a/optar/.gitignore b/optar/.gitignore new file mode 100644 index 0000000..ded7f67 --- /dev/null +++ b/optar/.gitignore @@ -0,0 +1,4 @@ +venv/** +.idea/** +**__pycache__** +kubectl.exe diff --git a/optar/Dockerfile b/optar/Dockerfile new file mode 100644 index 0000000..a4469b0 --- /dev/null +++ b/optar/Dockerfile @@ -0,0 +1,16 @@ +FROM python:slim +WORKDIR /optar + +# Copy and run requirements install first to save time in following builds +COPY requirements.txt requirements.txt +RUN pip install -r requirements.txt + +COPY prod.py prod.py +COPY src ./src +COPY cache ./cache + +# yes, coping them at build time is not ideal, this is a PoC +COPY keywords.txt keywords.txt +COPY sites.txt sites.txt + +ENTRYPOINT [ "python", "prod.py" ] \ No newline at end of file diff --git a/optar/__init__.py b/optar/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/optar/cache/www.heise.de/2022-11-06_15-14-36.json b/optar/cache/www.heise.de/2022-11-06_15-14-36.json new file mode 100644 index 0000000..bca466f --- /dev/null +++ b/optar/cache/www.heise.de/2022-11-06_15-14-36.json @@ -0,0 +1,798 @@ +{ + "https://www.patricematz.de/": [ + "https://www.patricematz.de/", + "https://www.linkedin.com/in/patrice-matz-b73b6814a/", + "https://github.com/Askill", + "https://www.patricematz.de/images/praktikum.pdf", + "https://www.patricematz.de/images/bachelor.pdf", + "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf", + "https://irs.projects.patricematz.de", + "https://github.com/Askill/Inverse-Rezeptsuche", + "https://irs.projects.patricematz.de/", + "https://github.com/Askill/Video-Synopsis", + "https://github.com/Askill/UI", + "https://github.com/Askill/Photo-Wall", + "https://www.patricematz.de/photowall/demo/", + "https://github.com/Askill/Flask-URL-Checker", + "https://patricematz.de/starmapper.htm" + ], + "https://www.patricematz.de/photowall/demo/": [ + "javascript:void(0)" + ], + "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf": [], + "https://www.patricematz.de/images/bachelor.pdf": [], + "https://www.patricematz.de/images/praktikum.pdf": [], + "https://www.heise.de/": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://it-kenner.heise.de/it-mittelstands-lounge/?utm_medium=tt&utm_campaign=IT-Mittelstand", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/${url}", + "https://www.heise.de/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/hintergrund/Missing-Link-Das-Konzept-der-Schwammstadt-7328446.html", + "https://www.heise.de/hintergrund/Missing-Link-Das-Konzept-der-Schwammstadt-7328446.html", + "https://www.heise.de/news/Tim-Berners-Lee-vs-Blockchain-Web3-hat-nichts-mit-dem-Web-zu-tun-7331409.html", + "https://www.heise.de/news/Tim-Berners-Lee-vs-Blockchain-Web3-hat-nichts-mit-dem-Web-zu-tun-7331409.html", + "https://www.heise.de/meinung/Web3-Im-vollen-Galopp-vor-die-Wand-ein-Kommentar-6537611.html", + "https://www.heise.de/hintergrund/Wie-ein-Pentester-ein-Maschinenbauunternehmen-hackte-7313697.html", + "https://www.heise.de/hintergrund/Wie-ein-Pentester-ein-Maschinenbauunternehmen-hackte-7313697.html", + "https://www.heise.de/hintergrund/Penetrationstests-und-das-BSI-Anforderungen-an-Tests-und-zertifizierte-Tester-7017237.html", + "https://www.heise.de/news/Netzagentur-Fuellstand-der-Gasspeicher-sinkt-erstmals-wieder-leicht-7331509.html", + "https://www.heise.de/ratgeber/Raumluft-verbessern-Schimmel-erkennen-Vier-smarte-Thermometer-im-Test-7325999.html", + "https://www.heise.de/tests/Apple-TV-4K-2022-im-Test-Schneller-guenstiger-besser-7327142.html", + "https://www.heise.de/tests/iPhone-14-Pro-und-iPhone-14-im-Test-7265400.html", + "https://www.heise.de/tests/Apples-iPad-10-und-iPad-Pro-2022-im-Test-7326242.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/tests/iPad-Air-5-im-Test-Ganz-schoen-Pro-6656489.html", + "https://www.heise.de/tests/Flight-Simulator-schoen-wie-nie-Maximale-Details-mit-der-GeForce-RTX-4090-7326749.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/ratgeber/Microsoft-Flight-Simulator-Controller-selbst-bauen-auf-Basis-des-Arduino-Micro-4921281.html", + "https://www.heise.de/ratgeber/Make-Projekt-Filmnegative-mit-dem-ESP32-CAM-anzeigen-7280693.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/ratgeber/Lebend-Mausefalle-mit-ESP32-CAM-basteln-7159932.html", + "https://www.heise.de/tests/Kampf-der-Giganten-Google-Pixel-7-Pro-vs-Apple-iPhone-14-Pro-Max-im-Fotoduell-7321332.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/tests/Apple-iPhone-14-Pro-und-Pro-Max-im-Test-7317660.html", + "https://www.heise.de/tests/Smartphones-Pixel-7-und-Pixel-7-Pro-im-Test-7304601.html", + "https://shop.heise-academy.de/?wt_mc=intern.events.ho.academy_november_sale.ho_teaser.link.link", + "https://www.heise.de/news/Bilanz-Erste-Woche-im-Besitz-von-Elon-Musk-erschuettert-Twitter-7331316.html", + "https://www.heise.de/news/Bilanz-Erste-Woche-im-Besitz-von-Elon-Musk-erschuettert-Twitter-7331316.html", + "https://www.heise.de/news/Twitter-beginnt-mit-Entlassungen-7331154.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/news/Meta-Quest-Pro-im-Test-Die-Zukunft-des-Zwinkerns-7330886.html", + "https://www.heise.de/news/TGIQF-das-Quiz-zur-Windenergie-Netzausbau-und-Energiewende-7327275.html", + "https://www.heise.de/ratgeber/Private-Cloud-anlegen-Synology-Netzwerkspeicher-um-Cloud-Funktionen-erweitern-7304555.html", + "https://www.heise.de/news/BSI-Affaere-Kaltgestellter-Schoenbohm-zieht-vor-Gericht-7330915.html", + "https://www.heise.de/news/Chinesische-Raketenstufe-unkontrolliert-in-den-Pazifik-gestuerzt-7330418.html", + "https://www.heise.de/hintergrund/Was-Sie-ueber-elektrischen-Strom-wissen-muessen-7326890.html", + "https://www.heise.de/ratgeber/Balkonkraftwerke-Hoymiles-Wechselrichter-ueberwachen-per-Web-MQTT-7327187.html", + "https://www.heise.de/ratgeber/Mit-welchen-Foerderungen-der-Staat-Sie-beim-energetischen-Umbau-unterstuetzt-7306933.html", + "https://www.heise.de/news/Twitter-Update-fuer-8-Dollar-Abo-unterwegs-und-Kritik-am-Verifizierungshaekchen-7331585.html", + "https://www.heise.de/tests/Vier-M-2-SSDs-mit-PCIe-4-0-im-Test-Superflott-ab-1-TByte-7321666.html", + "https://www.heise.de/solutions/a1digital/ot-security-in-vier-schritten-zu-einer-sicheren-betriebsumgebung/?source=nat_teas", + "https://www.heise.de/ratgeber/Makrofotografie-Maximale-Bildqualitaet-wunderschoenes-Bokeh-So-geht-s-7331556.html", + "https://www.heise.de/news/Web-API-Entwicklung-in-der-Praxis-Die-Webinar-Serie-von-Heise-7310622.html", + "https://www.heise.de/news/Netzagentur-Fuellstand-der-Gasspeicher-sinkt-erstmals-wieder-leicht-7331509.html", + "https://www.heise.de/news/Hohe-Spritpreise-Das-Rekordjahr-steht-schon-fest-7331492.html", + "https://www.heise.de/tests/Fuenf-aktuelle-55-Zoll-Fernseher-mit-unterschiedlichen-Display-Techniken-im-Test-7325661.html", + "https://www.heise.de/news/Inflation-Investitionsoffensive-fuer-Klimaschutz-und-Energiesicherheit-gefordert-7331488.html", + "https://www.heise.de/ratgeber/Fritzbox-VPN-Was-WireGuard-ausmacht-und-wie-man-es-konfiguriert-7313143.html?wt_mc=intern.red.plus.plus_buehne.startseite.buehne.buehne", + "https://www.heise.de/tests/2FA-Fuenf-kostenlose-Authenticator-Apps-fuer-Android-im-Vergleich-7322126.html?wt_mc=intern.red.plus.plus_buehne.startseite.buehne.buehne", + "https://www.heise.de/ratgeber/Passwortsicherheit-So-richten-Sie-Zwei-Faktor-Authentifizierungen-ein-6662342.html", + "https://www.heise.de/ratgeber/Private-Cloud-anlegen-Synology-Netzwerkspeicher-um-Cloud-Funktionen-erweitern-7304555.html?wt_mc=intern.red.plus.plus_buehne.startseite.buehne.buehne", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000042_20928_3_57&wt_mc=intern.abo.plus.hp_2022_jahr-nk.ho-advt.ad1.ad1", + "https://www.heise.de/hintergrund/Missing-Link-Das-Konzept-der-Schwammstadt-7328446.html", + "https://www.heise.de/hintergrund/Was-Sie-ueber-elektrischen-Strom-wissen-muessen-7326890.html", + "https://www.heise.de/hintergrund/MangoHud-Overlay-fuer-Spiele-Anwendungen-unter-Linux-7324612.html", + "https://www.heise.de/meinung/Was-war-Was-wird-Von-Generationen-und-ihren-Perspektiven-7331445.html", + "https://www.techstage.de/ratgeber/kaufberatung-smarte-thermostate-fuer-fussbodenheizungen-ab-40-euro-nachruesten/3cbnn7f?wt_mc=intern.red.techstage.newsticker.anrissliste.teaser.teaser", + "https://www.heise.de/news/Baden-Wuerttemberg-Landesdatenschuetzer-wirbt-fuer-Transparenzgesetz-7331431.html", + "https://www.heise.de/news/Skeptische-Stimmen-vor-Beginn-der-Weltklimakonferenz-COP27-7331415.html", + "https://www.heise.de/news/Tim-Berners-Lee-vs-Blockchain-Web3-hat-nichts-mit-dem-Web-zu-tun-7331409.html", + "https://www.heise.de/meinung/Web3-Im-vollen-Galopp-vor-die-Wand-ein-Kommentar-6537611.html", + "https://www.techstage.de/test/die-guenstigste-funk-rueckfahrkamera-im-test-aeg-rv43-mit-solar-fuer-120-euro/2nptbx2?wt_mc=intern.red.techstage.newsticker.anrissliste.teaser.teaser", + "https://www.heise.de/news/FIFA-WM-2022-42-Domains-fuer-illegales-Fussball-Streaming-von-ACE-beschlagnahmt-7331381.html", + "https://www.heise.de/hintergrund/Renaissance-der-Atomkraft-im-Kleinen-Tschechien-setzt-auf-Mini-AKWs-7331352.html", + "https://pubads.g.doubleclick.net/gampad/clk?id=6142344238&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6124592849&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6091026857&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6142638189&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "http://pubads.g.doubleclick.net/gampad/clk?id=6075909777&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6133201360&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6122379975&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6129298551&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6139963199&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6129244232&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://www.heise.de/tests/2FA-Fuenf-kostenlose-Authenticator-Apps-fuer-Android-im-Vergleich-7322126.html", + "https://www.heise.de/ratgeber/Passwortsicherheit-So-richten-Sie-Zwei-Faktor-Authentifizierungen-ein-6662342.html", + "https://www.heise.de/news/Bilanz-Erste-Woche-im-Besitz-von-Elon-Musk-erschuettert-Twitter-7331316.html", + "https://www.heise.de/news/Twitter-beginnt-mit-Entlassungen-7331154.html", + "https://business-services.heise.de/specials/zusammen-das-data-center-weiterentwickeln/security/beitrag/server-sicherheit-auf-diese-funktionen-sollten-sie-achten-4419/?source=hbsad-ersatz", + "https://www.heise.de/news/Nur-fuer-kurze-Zeit-50-Prozent-Rabatt-auf-alle-Videokurse-der-heise-Academy-7330223.html", + "https://www.heise.de/news/Maengel-bei-der-Briefzustellung-Beschwerden-ueber-die-Post-verdoppeln-sich-7331320.html", + "https://www.heise.de/news/E-Government-Wirtschaft-macht-Druck-bei-der-Verwaltungsdigitalisierung-7331306.html", + "https://www.heise.de/tests/Fuenf-Monitore-gegen-Apples-Studio-Display-So-finden-Sie-den-richtigen-Screen-7328212.html", + "https://www.heise.de/ratgeber/Raumluft-verbessern-Schimmel-erkennen-Vier-smarte-Thermometer-im-Test-7325999.html", + "https://www.heise.de/news/Unter-der-Lupe-Ein-analoges-Speicher-Oszilloskop-aus-den-fruehen-1970ern-7330113.html", + "https://www.heise.de/news/Strandgeschichten-Die-Bilder-der-Woche-KW-44-7330357.html", + "https://www.heise.de/meinung/Kommentar-Angriffe-lassen-sich-nicht-vermeiden-uebernehmt-die-Verantwortung-7328918.html", + "https://www.heise.de/tests/Asus-TUF-Gaming-GeForce-RTX-4090-24GB-OC-im-Test-7328336.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/heise-online-5128.html?p=2", + "mailto:newstipps@heise.de", + "https://www.heise.de/news/Untersuchungen-an-Nord-Stream-2-Jetzt-schaut-der-Betreiber-in-die-Roehre-7326046.html", + "https://www.heise.de/ratgeber/Private-Fotos-Wann-muss-ich-um-Erlaubnis-bitten-7324852.html", + "https://www.heise.de/news/DSGVO-Urteil-Buerger-duerfen-Falschparker-zum-Anzeigen-fotografieren-7328875.html", + "https://www.heise.de/hintergrund/Wie-ein-Pentester-ein-Maschinenbauunternehmen-hackte-7313697.html", + "https://www.heise.de/tests/Apple-TV-4K-2022-im-Test-Schneller-guenstiger-besser-7327142.html", + "https://www.heise.de/tests/Flight-Simulator-schoen-wie-nie-Maximale-Details-mit-der-GeForce-RTX-4090-7326749.html", + "https://www.heise.de/news/C-Ungeliebt-aber-Entwickler-werden-dringend-gesucht-7329578.html", + "https://www.heise.de/news/Neues-Pantone-Lizenzmodell-Adobe-wirft-mehrere-Farbpaletten-aus-Photoshop-Co-7324477.html", + "https://www.heise.de/news/Twitter-schliesst-Bueros-am-Freitag-und-kuendigt-Entlassungen-per-E-Mail-an-7329864.html", + "https://www.heise.de/forum/startseite/", + "https://twitter.com/heiseonline", + "https://facebook.com/heiseonline", + "https://m.me/heiseonline", + "https://www.xing.com/news/pages/heise-online-195?sc_o=da980_e", + "https://www.heise.de/newsletter/", + "https://www.heise.de/news-extern/news.html", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html#datenschutz-newsletter", + "https://www.heise.de/meinung/Kommentar-Angriffe-lassen-sich-nicht-vermeiden-uebernehmt-die-Verantwortung-7328918.html", + "https://www.heise.de/news/UK-Cyber-Sicherheitsbehoerde-startet-landesweites-Schwachstellen-Scanning-7330532.html", + "https://www.heise.de/news/Matter-Erste-Firmware-Updates-fuer-Smart-Home-Zubehoer-noch-vor-Weihnachten-7329315.html", + "https://www.heise.de/news/Neue-Kameradrohne-von-DJI-Kein-Tele-aber-deutlich-guenstiger-7330572.html", + "https://www.heise.de/news/Matter-Erste-Firmware-Updates-fuer-Smart-Home-Zubehoer-noch-vor-Weihnachten-7329315.html", + "https://www.heise.de/news/Smartphone-mit-echten-Objektiven-Xiaomi-zeigt-Studie-mit-Leica-M-Bajonett-7328173.html", + "https://www.heise.de/preisvergleich/?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.heise.de/preisvergleich/2660252?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=mindfactory&loc=https%3A%2F%2Fwww.mindfactory.de%2Fproduct_info.php%2Finfo%2Fp1447835%2Fpid%2Fgeizhals&ghaID=2660252&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=c22714a23809c92a75482485113a5369", + "https://www.heise.de/preisvergleich/2433313?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=a3m9v4hr0uwn9l-am-de&loc=https%3A%2F%2Fwww.amazon.de%2Fdp%2FB08QVRZH3C%3FlinkCode%3Dxm2%26camp%3D2025%26creative%3D165953%26smid%3DA3M9V4HR0UWN9L%26creativeASIN%3DB08QVRZH3C%26tag%3Dgeizhals-ts-mpde-21&ghaID=2433313&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=33d9f3d29f081e8ee4077ef88adb1f18", + "https://www.heise.de/preisvergleich/2684845?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=conrad-de&loc=https%3A%2F%2Fwww.awin1.com%2Fawclick.php%3Fgid%3D371931%26mid%3D11354%26awinaffid%3D332667%26linkid%3D2470191%26clickref%3DxkyBxEmeTyyKm8Iq%26p%3Dhttps%253A%252F%252Fwww.conrad.de%252Fde%252Fp%252F2575020%253Fhk%253DWW1%2526insert%253DU0%2526utm_source%253Dgeizhals%2526utm_medium%253Dcpo%2526utm_term%253D2575020%2526utm_campaign%253Dgeizhals&ghaID=2684845&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=7500bf461cb5dc2e3a5ef0413958e299", + "https://www.heise.de/preisvergleich/2832426?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=caseking&loc=https%3A%2F%2Fpvn.geizhals.de%2Ftrck%2Feclick%2F%3Fcampaign_alias%3Dcaseking%26project_alias%3Dheisewidgets%26admedia_alias%3Dofferclick%26subid%3Dpv%26url%3Dhttps%253A%252F%252Fwww.caseking.de%252Fbe-quiet-12vhpwr-pcie-5.0-adapter-kabel-nebe-224.html%253FsPartner%253D185%2526utm_source%253Dgeizhals%2526utm_medium%253Dcomparison%2526utm_campaign%253DPC-Komponenten%252B%25253E%252BKabel%252B%252526%252BAdapter%252B%25253E%252BInterne%252BKabel%2526campaign%253Dpsm%252Fgeizhals%2526wt_mc%253Dpreisvergleich.geizhals.feed&ghaID=2832426&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=fa5fc59edf31fdc1f4ca3bb70d6e3c88", + "https://www.heise.de/preisvergleich/2810186?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=mindfactory&loc=https%3A%2F%2Fwww.mindfactory.de%2Fproduct_info.php%2Finfo%2Fp1468381%2Fpid%2Fgeizhals&ghaID=2810186&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=d6c0e67c3d71eb60a52e71ed3c6c6693", + "https://www.heise.de/preisvergleich/2810039?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=caseking&loc=https%3A%2F%2Fpvn.geizhals.de%2Ftrck%2Feclick%2F%3Fcampaign_alias%3Dcaseking%26project_alias%3Dheisewidgets%26admedia_alias%3Dofferclick%26subid%3Dpv%26url%3Dhttps%253A%252F%252Fwww.caseking.de%252Fintel-core-i9-13900k-3-00-ghz-raptor-lake-sockel-1700-boxed-hpit-785.html%253FsPartner%253D185%2526utm_source%253Dgeizhals%2526utm_medium%253Dcomparison%2526utm_campaign%253DPC-Komponenten%252B%25253E%252BCPUs%252B%25252F%252BProzessoren%252B%25253E%252BIntel%2526campaign%253Dpsm%252Fgeizhals%2526wt_mc%253Dpreisvergleich.geizhals.feed&ghaID=2810039&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=165b68f607852b5aec24ff4ae4ad5ad7", + "https://www.heise.de/preisvergleich/?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://partner.pcloud.com/r/35245", + "https://www.heise.de/news/Strandgeschichten-Die-Bilder-der-Woche-KW-44-7330357.html", + "https://www.heise.de/ratgeber/Private-Fotos-Wann-muss-ich-um-Erlaubnis-bitten-7324852.html", + "https://www.heise.de/news/YouTube-Trennung-zwischen-Videos-Shorts-und-Streams-7323667.html", + "https://www.heise.de/news/Kriminalpolizei-Massives-Dunkelfeld-und-geringe-Aufklaerung-bei-Cybercrime-7329869.html", + "https://www.heise.de/news/Bundestagsstudie-Grundrechtsschutz-stoesst-mit-digitaler-Ueberwachung-an-Grenzen-7326838.html", + "https://www.heise.de/news/EU-Konferenz-zur-Internetzukunft-Desinformation-toetet-taeglich-7328281.html", + "https://jobs.heise.de/Job/IT-Administrator-m-w-d.1006103985.html?jw_chl_seg=heise-widget", + "https://jobs.heise.de/Job/IT-Systemadministrator-m-w-d-im-Helpdesk-Support.987132475.html?jw_chl_seg=heise-widget", + "https://jobs.heise.de/Job/Netzwerkadministrator-m-w-d-vglb-dritte-Qualifikationsebene.1006452975.html?jw_chl_seg=heise-widget", + "https://jobs.heise.de", + "https://www.heise.de/hintergrund/Renaissance-der-Atomkraft-im-Kleinen-Tschechien-setzt-auf-Mini-AKWs-7331352.html", + "https://www.heise.de/hintergrund/E-Auto-EU-Kommissar-Thierry-Breton-fuerchtet-um-die-Autoindustrie-7330961.html", + "https://www.heise.de/news/Job-im-Start-up-Himmelfahrtskommando-oder-Karriere-Beschleuniger-7327199.html", + "https://www.heise.de/meinung/Was-war-Was-wird-Von-Generationen-und-ihren-Perspektiven-7331445.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/meinung/Ruhiger-Herbst-wenig-Neues-was-ist-faul-bei-Apple-7325734.html", + "https://www.heise.de/meinung/Kommentar-Luftgrenzwerte-sind-keine-Anleitungen-fuer-vorausschauende-Politik-7330410.html", + "https://www.heise.de/hintergrund/Bienenschwaerme-erzeugen-staerkere-elektrische-Felder-als-Gewitterwolken-7329614.html", + "https://www.heise.de/news/Chinesische-Raketenstufe-Spanischer-Luftraum-wegen-Absturz-teilweise-gesperrt-7330131.html", + "https://www.heise.de/thema/karriere", + "https://www.heise.de/news/Twitter-beginnt-mit-Entlassungen-7331154.html", + "https://www.heise.de/news/Twitter-schliesst-Bueros-am-Freitag-und-kuendigt-Entlassungen-per-E-Mail-an-7329864.html", + "https://www.heise.de/news/Angst-vor-Rezession-Apple-stoppt-Neueinstellungen-in-weiteren-Bereichen-7330334.html", + "https://www.heise.de/news/Rezession-Musk-Kuendigungswelle-in-IT-Branche-der-USA-7329786.html", + "https://www.heise.de/news/Bundesregierung-Beschaeftigte-mit-Homeoffice-Option-sind-weniger-krank-7328182.html", + "https://www.heise.de/video/", + "https://www.heise.de/multimediadatei/AMD-heizt-mit-Ryzen-7000-Intel-ein-c-t-uplink-45-3-7308764.html", + "https://www.heise.de/multimediadatei/AMD-heizt-mit-Ryzen-7000-Intel-ein-c-t-uplink-45-3-7308764.html", + "https://www.heise.de/multimediadatei/Kurz-informiert-vom-18-10-2022-by-heise-online-7312089.html", + "https://www.heise.de/multimediadatei/Kurz-informiert-vom-18-10-2022-by-heise-online-7312089.html", + "https://t3n.de/", + "https://t3n.de/news/palmoel-mikroplastik-nachhaltiger-einkaufen-apps-1500398/", + "https://t3n.de/news/wie-sich-buchhaendler-thalia-erfolgreich-gegen-amazon-behauptet-1507957/", + "https://t3n.de/news/mercedes-benz-eqe-test-hohe-erwartungen-1507120/", + "https://www.heise.de/meinung/Adobes-Midlife-Crisis-7324564.html", + "https://www.heise.de/news/BSI-Das-Ziel-der-Unabhaengigkeit-wackelt-7324576.html", + "https://www.heise.de/news/Photovoltaikausbau-Das-Potenzial-der-Supermaerkte-7309111.html", + "https://www.heise.de/tests/Dell-Pro-Webcam-WB5023-im-Kurztest-Folgsame-2K-Kamera-7322489.html", + "https://www.heise.de/tests/Logitech-MX-Mechanical-Mini-im-Kurztest-kompakte-Schreibmaschine-7313227.html", + "https://www.heise.de/ratgeber/iOS-16-und-watchOS-9-Tipps-und-Tricks-zu-den-besten-Neuerungen-7307692.html", + "https://www.heise.de/news/Zurueck-zu-den-Wurzeln-3D-Drucker-Snapmaker-J1-mit-zwei-Druckkoepfen-7328574.html", + "https://www.heise.de/ratgeber/Make-Projekt-Filmnegative-mit-dem-ESP32-CAM-anzeigen-7280693.html", + "https://www.heise.de/ratgeber/Lebend-Mausefalle-mit-ESP32-CAM-basteln-7159932.html", + "https://www.heise.de/ratgeber/Familienprojekt-Untersetzer-und-Taschenlampe-fuer-die-UV-Mottoparty-bauen-6522568.html", + "https://webinare.heise.de/web-api?wt_mc=intern.events.academy.web_api.teaser_1.teaser.teaser", + "https://www.heise.de/news/c-t-Fotografie-Aus-Schwarz-Weiss-wird-bunt-7309261.html", + "https://www.heise.de/news/Sonys-Alpha-7R-V-KI-Autofokus-erkennt-Tiere-Fahrzeuge-und-Menschen-in-Bewegung-7321494.html", + "https://www.heise.de/news/Klein-und-wetterfest-Neue-spiegellose-Systemkamera-OM-5-fuer-Outdoor-Fotografen-7320875.html", + "https://www.heise.de/news/Extrem-lichtstark-Drei-neue-Weitwinkel-Objektive-mit-f-0-95-fuer-APS-C-und-MFT-7320164.html", + "https://www.heise.de/select/ix/2022/4/2127106020689717055", + "https://www.heise.de/select/ix/2022/4/2120310153044855711", + "https://www.heise.de/select/ix/2022/4/2127409020654106444", + "https://www.heise.de/hintergrund/Der-Lichtcomputer-Wie-sich-mit-Licht-schnell-rechnen-laesst-6165686.html", + "https://www.heise.de/hintergrund/Kommentar-Das-Problem-mit-Musks-Comeback-Plan-von-Vine-es-gibt-heute-TikTok-7325755.html", + "https://www.heise.de/hintergrund/Wie-smarte-Traktoren-auch-fuer-Kleinbauern-bezahlbar-werden-sollen-7325524.html", + "https://www.heise.de/news/Kurz-informiert-E-Autos-aus-China-Twitter-Dunkelfeld-Cybercrime-Fake-Rabatt-7330477.html", + "https://www.heise.de/news/Kurz-informiert-E-Autos-aus-China-Twitter-Dunkelfeld-Cybercrime-Fake-Rabatt-7330477.html", + "https://www.heise.de/news/Kurz-informiert-Gas-Heizung-Autos-Atomkraft-DSGVO-Urteil-7329039.html", + "https://www.heise.de/news/Kurz-informiert-Gas-Heizung-Autos-Atomkraft-DSGVO-Urteil-7329039.html", + "https://www.heise.de/news/Kurz-informiert-Phishing-Stromproduktion-Street-View-Luftqualitaet-7327655.html", + "https://www.heise.de/news/Kurz-informiert-Phishing-Stromproduktion-Street-View-Luftqualitaet-7327655.html", + "https://www.heise.de/news/Kurz-informiert-Hackerangriff-DMA-Geruchssinn-Asteroid-7325771.html", + "https://www.heise.de/news/Kurz-informiert-Hackerangriff-DMA-Geruchssinn-Asteroid-7325771.html", + "https://www.heise.de/meinung/Podcast-Die-Hupe-Das-Fahrrad-in-den-Niederlanden-6187706.html", + "https://www.heise.de/hintergrund/Batteriezellen-fuer-Elektroautos-Auf-der-Suche-nach-der-Welt-Zelle-6176430.html", + "https://www.heise.de/hintergrund/Zurueck-aus-den-Ewigen-Jagdgruenden-120-Jahre-Indian-Motorcycle-6131255.html", + "https://www.heise.de/tests/Fahrbericht-Kia-EV6-Rasant-in-jeder-Hinsicht-6170432.html", + "https://www.guenstiger.de/Kaufberatung.html?p=363284", + "https://www.guenstiger.de/kaufberatung/elektronik-and-technik/die-besten-smarten-heizkorperthermostate-fur-im-vergleich/220426.html?p=363284", + "https://www.guenstiger.de/kaufberatung/baumarkt-and-werkzeug/kaufen-statt-mieten-beliebte-hacksler-fur-den-garten-im-vergleich/220412.html?p=363284", + "https://www.guenstiger.de/kaufberatung/elektronik-and-technik/fur-jedes-wetter-gerustet-die-besten-wetterstationen-mit-funk-modul/220128.html?p=363284", + "https://www.techstage.de", + "https://www.techstage.de/bestenliste/top-6-solargeneratoren-die-besten-powerstations-mit-photovoltaik/84614vd?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.techstage.de/bestenliste/klapprad-top-10-die-besten-e-bikes-zum-klappen-von-600-bis-1200-euro/3pvcgql?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.techstage.de/ratgeber/usb-ladegerate-mit-mehreren-anschlussen-so-ladt-man-notebook-macbook-kopfhorer/h56tk97?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.techstage.de/ratgeber/ratgeber-die-15-gunstigsten-3d-drucker/54q9r5q?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.heise.de/tp/features/Knappes-Gas-Rollierender-Lockdown-im-kommenden-Winter-7167680.html", + "https://www.heise.de/tp/features/Rettung-bei-Stromausfall-Notstrom-aus-der-Solarbatterie-7162145.html", + "https://www.heise.de/download", + "https://www.heise.de/download/specials/Anonym-surfen-mit-VPN-Die-besten-VPN-Anbieter-im-Vergleich-3798036", + "https://www.heise.de/download/product/WISO_Grundsteuer", + "https://www.heise.de/download/product/opera-1458", + "https://www.heise.de/download/product/adwcleaner-91313", + "https://www.heise.de/download/product/AutoClicker", + "https://www.heise.de/download/product/h2testw-50539", + "https://www.heise.de/download/product/rufus", + "https://www.heise.de/download/search#?page=1&sort=DOWNLOADRANK&wt_mc=intern.newsticker.buehne.download", + "https://www.heise.de/#bottom-up", + "https://www.heise.de/themen/", + "https://www.heise.de/themen/A", + "https://www.heise.de/themen/B", + "https://www.heise.de/themen/C", + "https://www.heise.de/themen/D", + "https://www.heise.de/themen/E", + "https://www.heise.de/themen/F", + "https://www.heise.de/themen/G", + "https://www.heise.de/themen/H", + "https://www.heise.de/themen/I", + "https://www.heise.de/themen/J", + "https://www.heise.de/themen/K", + "https://www.heise.de/themen/L", + "https://www.heise.de/themen/M", + "https://www.heise.de/themen/N", + "https://www.heise.de/themen/O", + "https://www.heise.de/themen/P", + "https://www.heise.de/themen/Q", + "https://www.heise.de/themen/R", + "https://www.heise.de/themen/S", + "https://www.heise.de/themen/T", + "https://www.heise.de/themen/U", + "https://www.heise.de/themen/V", + "https://www.heise.de/themen/W", + "https://www.heise.de/themen/X", + "https://www.heise.de/themen/Y", + "https://www.heise.de/themen/Z", + "https://www.heise.de/themen/Sonderzeichen", + "https://www.heise.de/themen/Ziffer", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000028_22018_3_57&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser&utm_source=ho&utm_medium=stickyfooter&utm_content=gratismonat" + ], + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000028_22018_3_57&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser&utm_source=ho&utm_medium=stickyfooter&utm_content=gratismonat": [ + "https://www.heise.de/api/accountservice/checkout/1?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/10?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/2?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000028_22018_3_57&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser&utm_source=ho&utm_medium=stickyfooter&utm_content=gratismonat#faq", + "https://www.heise.de/plus", + "https://play.google.com/store/apps/details?id=de.heise.android.heiseonlineapp&hl=de", + "https://apps.apple.com/de/app/heise-online-it-news/id333214314", + "https://www.heise.de/select/", + "tel:+4954180009120", + "mailto:leserservice@heise.de", + "https://heise-solutions.de/firmenlizenz/", + "https://www.heise.de/sso/registration/", + "https://www.heise.de/sso/registration/account/userdata", + "https://www.heise.de/sso/registration/add_subscriber_id", + "https://www.heise.de/sso/login/?forward=https://www.heise.de/", + "https://www.heise.de/sso/registration/account/userdata", + "https://www.heise.de/sso/registration/add_subscriber_id", + "https://www.heise.de/sso/registration/forgot_password", + "https://www.heise.de/sso/registration/forgot_password", + "https://www.heise.de/sso/login/?forward=https://www.heise.de/", + "https://www.heise.de/api/accountservice/checkout/1?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/10?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/2?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/" + ], + "https://www.heise.de/kontakt/": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/kontakt/#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/", + "https://www.heise.de/investigativ/", + "https://www.heise.de/Hoeren-Sie-von-uns-unsere-Podcasts-4206659.html", + "https://www.heise.de/tipps-tricks/Was-ist-SWIFT-6533026.html", + "https://spiele.heise.de/", + "https://spiele.heise.de/#!Solitaer", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://tarifrechner.heise.de/dsl", + "https://www.heise.de/kontakt/#bottom-up", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html" + ], + "https://www.heise.de/account/cancellation": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/account/cancellation#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://it-kenner.heise.de/it-mittelstands-lounge/?utm_medium=tt&utm_campaign=IT-Mittelstand", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/account/${url}", + "https://www.heise.de/account/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/sso/registration/add_subscriber_id", + "https://www.heise.de/account/cancellation#bottom-up", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html" + ], + "https://www.heise.de/kontakt/?frage=3212474": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/kontakt/?frage=3212474#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/", + "https://www.heise.de/investigativ/", + "https://www.heise.de/Hoeren-Sie-von-uns-unsere-Podcasts-4206659.html", + "https://www.heise.de/tipps-tricks/Was-ist-SWIFT-6533026.html", + "https://spiele.heise.de/", + "https://spiele.heise.de/#!Solitaer", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://tarifrechner.heise.de/dsl", + "https://www.heise.de/kontakt/?frage=3212474#bottom-up", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html" + ] +} \ No newline at end of file diff --git a/optar/cache/www.heise.de/2022-11-06_15-16-38.json b/optar/cache/www.heise.de/2022-11-06_15-16-38.json new file mode 100644 index 0000000..c68f21d --- /dev/null +++ b/optar/cache/www.heise.de/2022-11-06_15-16-38.json @@ -0,0 +1,799 @@ +{ + "https://www.patricematz.de/": [ + "https://www.patricematz.de/", + "https://www.linkedin.com/in/patrice-matz-b73b6814a/", + "https://github.com/Askill", + "https://www.patricematz.de/images/praktikum.pdf", + "https://www.patricematz.de/images/bachelor.pdf", + "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf", + "https://irs.projects.patricematz.de", + "https://github.com/Askill/Inverse-Rezeptsuche", + "https://irs.projects.patricematz.de/", + "https://github.com/Askill/Video-Synopsis", + "https://github.com/Askill/UI", + "https://github.com/Askill/Photo-Wall", + "https://www.patricematz.de/photowall/demo/", + "https://github.com/Askill/Flask-URL-Checker", + "https://patricematz.de/starmapper.htm" + ], + "https://www.patricematz.de/photowall/demo/": [ + "javascript:void(0)" + ], + "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf": [], + "https://www.patricematz.de/images/bachelor.pdf": [], + "https://www.patricematz.de/images/praktikum.pdf": [], + "https://www.heise.de/": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://it-kenner.heise.de/it-mittelstands-lounge/?utm_medium=tt&utm_campaign=IT-Mittelstand", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/${url}", + "https://www.heise.de/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/hintergrund/Missing-Link-Das-Konzept-der-Schwammstadt-7328446.html", + "https://www.heise.de/hintergrund/Missing-Link-Das-Konzept-der-Schwammstadt-7328446.html", + "https://www.heise.de/news/Tim-Berners-Lee-vs-Blockchain-Web3-hat-nichts-mit-dem-Web-zu-tun-7331409.html", + "https://www.heise.de/news/Tim-Berners-Lee-vs-Blockchain-Web3-hat-nichts-mit-dem-Web-zu-tun-7331409.html", + "https://www.heise.de/meinung/Web3-Im-vollen-Galopp-vor-die-Wand-ein-Kommentar-6537611.html", + "https://www.heise.de/hintergrund/Wie-ein-Pentester-ein-Maschinenbauunternehmen-hackte-7313697.html", + "https://www.heise.de/hintergrund/Wie-ein-Pentester-ein-Maschinenbauunternehmen-hackte-7313697.html", + "https://www.heise.de/hintergrund/Penetrationstests-und-das-BSI-Anforderungen-an-Tests-und-zertifizierte-Tester-7017237.html", + "https://www.heise.de/news/Netzagentur-Fuellstand-der-Gasspeicher-sinkt-erstmals-wieder-leicht-7331509.html", + "https://www.heise.de/ratgeber/Raumluft-verbessern-Schimmel-erkennen-Vier-smarte-Thermometer-im-Test-7325999.html", + "https://www.heise.de/tests/Apple-TV-4K-2022-im-Test-Schneller-guenstiger-besser-7327142.html", + "https://www.heise.de/tests/iPhone-14-Pro-und-iPhone-14-im-Test-7265400.html", + "https://www.heise.de/tests/Apples-iPad-10-und-iPad-Pro-2022-im-Test-7326242.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/tests/iPad-Air-5-im-Test-Ganz-schoen-Pro-6656489.html", + "https://www.heise.de/tests/Flight-Simulator-schoen-wie-nie-Maximale-Details-mit-der-GeForce-RTX-4090-7326749.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/ratgeber/Microsoft-Flight-Simulator-Controller-selbst-bauen-auf-Basis-des-Arduino-Micro-4921281.html", + "https://www.heise.de/ratgeber/Make-Projekt-Filmnegative-mit-dem-ESP32-CAM-anzeigen-7280693.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/ratgeber/Lebend-Mausefalle-mit-ESP32-CAM-basteln-7159932.html", + "https://www.heise.de/tests/Kampf-der-Giganten-Google-Pixel-7-Pro-vs-Apple-iPhone-14-Pro-Max-im-Fotoduell-7321332.html?wt_mc=intern.red.plus.topteaser.startseite.teaser.teaser", + "https://www.heise.de/tests/Apple-iPhone-14-Pro-und-Pro-Max-im-Test-7317660.html", + "https://www.heise.de/tests/Smartphones-Pixel-7-und-Pixel-7-Pro-im-Test-7304601.html", + "https://shop.heise.de/bundle-ct-e-autos-2022-heft-pdf?wt_mc=intern.shop.shop.ct_eautos22.ho_vm1.display.display", + "https://www.heise.de/news/Bilanz-Erste-Woche-im-Besitz-von-Elon-Musk-erschuettert-Twitter-7331316.html", + "https://www.heise.de/news/Bilanz-Erste-Woche-im-Besitz-von-Elon-Musk-erschuettert-Twitter-7331316.html", + "https://www.heise.de/news/Twitter-beginnt-mit-Entlassungen-7331154.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/news/Meta-Quest-Pro-im-Test-Die-Zukunft-des-Zwinkerns-7330886.html", + "https://www.heise.de/news/TGIQF-das-Quiz-zur-Windenergie-Netzausbau-und-Energiewende-7327275.html", + "https://www.heise.de/ratgeber/Private-Cloud-anlegen-Synology-Netzwerkspeicher-um-Cloud-Funktionen-erweitern-7304555.html", + "https://www.heise.de/news/BSI-Affaere-Kaltgestellter-Schoenbohm-zieht-vor-Gericht-7330915.html", + "https://www.heise.de/news/Chinesische-Raketenstufe-unkontrolliert-in-den-Pazifik-gestuerzt-7330418.html", + "https://www.heise.de/hintergrund/Was-Sie-ueber-elektrischen-Strom-wissen-muessen-7326890.html", + "https://www.heise.de/ratgeber/Balkonkraftwerke-Hoymiles-Wechselrichter-ueberwachen-per-Web-MQTT-7327187.html", + "https://www.heise.de/ratgeber/Mit-welchen-Foerderungen-der-Staat-Sie-beim-energetischen-Umbau-unterstuetzt-7306933.html", + "https://www.heise.de/news/Twitter-Update-fuer-8-Dollar-Abo-unterwegs-und-Kritik-am-Verifizierungshaekchen-7331585.html", + "https://www.heise.de/tests/Vier-M-2-SSDs-mit-PCIe-4-0-im-Test-Superflott-ab-1-TByte-7321666.html", + "https://www.heise.de/solutions/a1digital/ot-security-in-vier-schritten-zu-einer-sicheren-betriebsumgebung/?source=nat_teas", + "https://www.heise.de/ratgeber/Makrofotografie-Maximale-Bildqualitaet-wunderschoenes-Bokeh-So-geht-s-7331556.html", + "https://www.heise.de/news/Web-API-Entwicklung-in-der-Praxis-Die-Webinar-Serie-von-Heise-7310622.html", + "https://www.heise.de/news/Netzagentur-Fuellstand-der-Gasspeicher-sinkt-erstmals-wieder-leicht-7331509.html", + "https://www.heise.de/news/Hohe-Spritpreise-Das-Rekordjahr-steht-schon-fest-7331492.html", + "https://www.heise.de/tests/Fuenf-aktuelle-55-Zoll-Fernseher-mit-unterschiedlichen-Display-Techniken-im-Test-7325661.html", + "https://www.heise.de/news/Inflation-Investitionsoffensive-fuer-Klimaschutz-und-Energiesicherheit-gefordert-7331488.html", + "https://www.heise.de/ratgeber/Fritzbox-VPN-Was-WireGuard-ausmacht-und-wie-man-es-konfiguriert-7313143.html?wt_mc=intern.red.plus.plus_buehne.startseite.buehne.buehne", + "https://www.heise.de/tests/2FA-Fuenf-kostenlose-Authenticator-Apps-fuer-Android-im-Vergleich-7322126.html?wt_mc=intern.red.plus.plus_buehne.startseite.buehne.buehne", + "https://www.heise.de/ratgeber/Passwortsicherheit-So-richten-Sie-Zwei-Faktor-Authentifizierungen-ein-6662342.html", + "https://www.heise.de/ratgeber/Private-Cloud-anlegen-Synology-Netzwerkspeicher-um-Cloud-Funktionen-erweitern-7304555.html?wt_mc=intern.red.plus.plus_buehne.startseite.buehne.buehne", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000042_20928_3_57&wt_mc=intern.abo.plus.hp_2022_jahr-nk.ho-advt.ad1.ad1", + "https://www.heise.de/hintergrund/Missing-Link-Das-Konzept-der-Schwammstadt-7328446.html", + "https://www.heise.de/hintergrund/Was-Sie-ueber-elektrischen-Strom-wissen-muessen-7326890.html", + "https://www.heise.de/hintergrund/MangoHud-Overlay-fuer-Spiele-Anwendungen-unter-Linux-7324612.html", + "https://www.heise.de/meinung/Was-war-Was-wird-Von-Generationen-und-ihren-Perspektiven-7331445.html", + "https://www.techstage.de/ratgeber/kaufberatung-smarte-thermostate-fuer-fussbodenheizungen-ab-40-euro-nachruesten/3cbnn7f?wt_mc=intern.red.techstage.newsticker.anrissliste.teaser.teaser", + "https://www.heise.de/news/Baden-Wuerttemberg-Landesdatenschuetzer-wirbt-fuer-Transparenzgesetz-7331431.html", + "https://www.heise.de/news/Skeptische-Stimmen-vor-Beginn-der-Weltklimakonferenz-COP27-7331415.html", + "https://www.heise.de/news/Tim-Berners-Lee-vs-Blockchain-Web3-hat-nichts-mit-dem-Web-zu-tun-7331409.html", + "https://www.heise.de/meinung/Web3-Im-vollen-Galopp-vor-die-Wand-ein-Kommentar-6537611.html", + "https://www.techstage.de/test/die-guenstigste-funk-rueckfahrkamera-im-test-aeg-rv43-mit-solar-fuer-120-euro/2nptbx2?wt_mc=intern.red.techstage.newsticker.anrissliste.teaser.teaser", + "https://www.heise.de/news/FIFA-WM-2022-42-Domains-fuer-illegales-Fussball-Streaming-von-ACE-beschlagnahmt-7331381.html", + "https://www.heise.de/hintergrund/Renaissance-der-Atomkraft-im-Kleinen-Tschechien-setzt-auf-Mini-AKWs-7331352.html", + "https://pubads.g.doubleclick.net/gampad/clk?id=6074262948&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "http://pubads.g.doubleclick.net/gampad/clk?id=6075909777&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6142638189&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6104261467&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6124592849&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6142344238&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6139963199&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6129244232&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6131071347&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://pubads.g.doubleclick.net/gampad/clk?id=6133201360&iu=%2F6514%2Fwww.heise.de%2Fclicktracking%2Ftextlink", + "https://www.heise.de/tests/2FA-Fuenf-kostenlose-Authenticator-Apps-fuer-Android-im-Vergleich-7322126.html", + "https://www.heise.de/ratgeber/Passwortsicherheit-So-richten-Sie-Zwei-Faktor-Authentifizierungen-ein-6662342.html", + "https://www.heise.de/news/Bilanz-Erste-Woche-im-Besitz-von-Elon-Musk-erschuettert-Twitter-7331316.html", + "https://www.heise.de/news/Twitter-beginnt-mit-Entlassungen-7331154.html", + "https://business-services.heise.de/hardware/mobile-devices/beitrag/computer-fuer-jeden-schueler-auch-ohne-foerderung-nicht-teuer-fuer-eltern-4415/?source=hbsad-ersatz", + "https://www.heise.de/news/Nur-fuer-kurze-Zeit-50-Prozent-Rabatt-auf-alle-Videokurse-der-heise-Academy-7330223.html", + "https://www.heise.de/news/Maengel-bei-der-Briefzustellung-Beschwerden-ueber-die-Post-verdoppeln-sich-7331320.html", + "https://www.heise.de/news/E-Government-Wirtschaft-macht-Druck-bei-der-Verwaltungsdigitalisierung-7331306.html", + "https://www.heise.de/tests/Fuenf-Monitore-gegen-Apples-Studio-Display-So-finden-Sie-den-richtigen-Screen-7328212.html", + "https://www.heise.de/ratgeber/Raumluft-verbessern-Schimmel-erkennen-Vier-smarte-Thermometer-im-Test-7325999.html", + "https://www.heise.de/news/Unter-der-Lupe-Ein-analoges-Speicher-Oszilloskop-aus-den-fruehen-1970ern-7330113.html", + "https://www.heise.de/news/Strandgeschichten-Die-Bilder-der-Woche-KW-44-7330357.html", + "https://www.heise.de/meinung/Kommentar-Angriffe-lassen-sich-nicht-vermeiden-uebernehmt-die-Verantwortung-7328918.html", + "https://www.heise.de/tests/Asus-TUF-Gaming-GeForce-RTX-4090-24GB-OC-im-Test-7328336.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/news/Windows-vor-Angriffen-schuetzen-c-t-uplink-45-6-7268565.html", + "https://www.heise.de/heise-online-5128.html?p=2", + "mailto:newstipps@heise.de", + "https://www.heise.de/news/Untersuchungen-an-Nord-Stream-2-Jetzt-schaut-der-Betreiber-in-die-Roehre-7326046.html", + "https://www.heise.de/ratgeber/Private-Fotos-Wann-muss-ich-um-Erlaubnis-bitten-7324852.html", + "https://www.heise.de/news/DSGVO-Urteil-Buerger-duerfen-Falschparker-zum-Anzeigen-fotografieren-7328875.html", + "https://www.heise.de/hintergrund/Wie-ein-Pentester-ein-Maschinenbauunternehmen-hackte-7313697.html", + "https://www.heise.de/tests/Apple-TV-4K-2022-im-Test-Schneller-guenstiger-besser-7327142.html", + "https://www.heise.de/tests/Flight-Simulator-schoen-wie-nie-Maximale-Details-mit-der-GeForce-RTX-4090-7326749.html", + "https://www.heise.de/news/C-Ungeliebt-aber-Entwickler-werden-dringend-gesucht-7329578.html", + "https://www.heise.de/news/Neues-Pantone-Lizenzmodell-Adobe-wirft-mehrere-Farbpaletten-aus-Photoshop-Co-7324477.html", + "https://www.heise.de/news/Twitter-schliesst-Bueros-am-Freitag-und-kuendigt-Entlassungen-per-E-Mail-an-7329864.html", + "https://www.heise.de/forum/startseite/", + "https://twitter.com/heiseonline", + "https://facebook.com/heiseonline", + "https://m.me/heiseonline", + "https://www.xing.com/news/pages/heise-online-195?sc_o=da980_e", + "https://www.heise.de/newsletter/", + "https://www.heise.de/news-extern/news.html", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html#datenschutz-newsletter", + "https://www.heise.de/meinung/Kommentar-Angriffe-lassen-sich-nicht-vermeiden-uebernehmt-die-Verantwortung-7328918.html", + "https://www.heise.de/news/UK-Cyber-Sicherheitsbehoerde-startet-landesweites-Schwachstellen-Scanning-7330532.html", + "https://www.heise.de/news/Matter-Erste-Firmware-Updates-fuer-Smart-Home-Zubehoer-noch-vor-Weihnachten-7329315.html", + "https://www.heise.de/news/Neue-Kameradrohne-von-DJI-Kein-Tele-aber-deutlich-guenstiger-7330572.html", + "https://www.heise.de/news/Matter-Erste-Firmware-Updates-fuer-Smart-Home-Zubehoer-noch-vor-Weihnachten-7329315.html", + "https://www.heise.de/news/Smartphone-mit-echten-Objektiven-Xiaomi-zeigt-Studie-mit-Leica-M-Bajonett-7328173.html", + "https://www.heise.de/preisvergleich/?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.heise.de/preisvergleich/2660252?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=mindfactory&loc=https%3A%2F%2Fwww.mindfactory.de%2Fproduct_info.php%2Finfo%2Fp1447835%2Fpid%2Fgeizhals&ghaID=2660252&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=c22714a23809c92a75482485113a5369", + "https://www.heise.de/preisvergleich/2433313?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=a3m9v4hr0uwn9l-am-de&loc=https%3A%2F%2Fwww.amazon.de%2Fdp%2FB08QVRZH3C%3FlinkCode%3Dxm2%26camp%3D2025%26creative%3D165953%26smid%3DA3M9V4HR0UWN9L%26creativeASIN%3DB08QVRZH3C%26tag%3Dgeizhals-ts-mpde-21&ghaID=2433313&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=33d9f3d29f081e8ee4077ef88adb1f18", + "https://www.heise.de/preisvergleich/2684845?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=conrad-de&loc=https%3A%2F%2Fwww.awin1.com%2Fawclick.php%3Fgid%3D371931%26mid%3D11354%26awinaffid%3D332667%26linkid%3D2470191%26clickref%3DxkyBxEmeTyyKm8Iq%26p%3Dhttps%253A%252F%252Fwww.conrad.de%252Fde%252Fp%252F2575020%253Fhk%253DWW1%2526insert%253DU0%2526utm_source%253Dgeizhals%2526utm_medium%253Dcpo%2526utm_term%253D2575020%2526utm_campaign%253Dgeizhals&ghaID=2684845&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=7500bf461cb5dc2e3a5ef0413958e299", + "https://www.heise.de/preisvergleich/2832426?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=caseking&loc=https%3A%2F%2Fpvn.geizhals.de%2Ftrck%2Feclick%2F%3Fcampaign_alias%3Dcaseking%26project_alias%3Dheisewidgets%26admedia_alias%3Dofferclick%26subid%3Dpv%26url%3Dhttps%253A%252F%252Fwww.caseking.de%252Fbe-quiet-12vhpwr-pcie-5.0-adapter-kabel-nebe-224.html%253FsPartner%253D185%2526utm_source%253Dgeizhals%2526utm_medium%253Dcomparison%2526utm_campaign%253DPC-Komponenten%252B%25253E%252BKabel%252B%252526%252BAdapter%252B%25253E%252BInterne%252BKabel%2526campaign%253Dpsm%252Fgeizhals%2526wt_mc%253Dpreisvergleich.geizhals.feed&ghaID=2832426&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=fa5fc59edf31fdc1f4ca3bb70d6e3c88", + "https://www.heise.de/preisvergleich/2810186?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=mindfactory&loc=https%3A%2F%2Fwww.mindfactory.de%2Fproduct_info.php%2Finfo%2Fp1468381%2Fpid%2Fgeizhals&ghaID=2810186&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=d6c0e67c3d71eb60a52e71ed3c6c6693", + "https://www.heise.de/preisvergleich/2810039?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://www.geizhals.at/redir.cgi?h=caseking&loc=https%3A%2F%2Fpvn.geizhals.de%2Ftrck%2Feclick%2F%3Fcampaign_alias%3Dcaseking%26project_alias%3Dheisewidgets%26admedia_alias%3Dofferclick%26subid%3Dpv%26url%3Dhttps%253A%252F%252Fwww.caseking.de%252Fintel-core-i9-13900k-3-00-ghz-raptor-lake-sockel-1700-boxed-hpit-785.html%253FsPartner%253D185%2526utm_source%253Dgeizhals%2526utm_medium%253Dcomparison%2526utm_campaign%253DPC-Komponenten%252B%25253E%252BCPUs%252B%25252F%252BProzessoren%252B%25253E%252BIntel%2526campaign%253Dpsm%252Fgeizhals%2526wt_mc%253Dpreisvergleich.geizhals.feed&ghaID=2810039&ghxID=515B586B14FD7233F42D7B221E693B396AFF960D&key=165b68f607852b5aec24ff4ae4ad5ad7", + "https://www.heise.de/preisvergleich/?ccpid=hocid-pvgmodul&cs_id=1206858352", + "https://partner.pcloud.com/r/35245", + "https://www.heise.de/news/Strandgeschichten-Die-Bilder-der-Woche-KW-44-7330357.html", + "https://www.heise.de/ratgeber/Private-Fotos-Wann-muss-ich-um-Erlaubnis-bitten-7324852.html", + "https://www.heise.de/news/YouTube-Trennung-zwischen-Videos-Shorts-und-Streams-7323667.html", + "https://www.heise.de/news/Kriminalpolizei-Massives-Dunkelfeld-und-geringe-Aufklaerung-bei-Cybercrime-7329869.html", + "https://www.heise.de/news/Bundestagsstudie-Grundrechtsschutz-stoesst-mit-digitaler-Ueberwachung-an-Grenzen-7326838.html", + "https://www.heise.de/news/EU-Konferenz-zur-Internetzukunft-Desinformation-toetet-taeglich-7328281.html", + "https://jobs.heise.de/Job/Softwareentwickler-Smart-Solutions-m-w-d.1005097965.html?jw_chl_seg=heise-widget", + "https://jobs.heise.de/Job/Web-Data-Visualization-Developer-d-m-w.980417055.html?jw_chl_seg=heise-widget", + "https://jobs.heise.de/Job/IT-Security-Spezialistin-w-d-m.989602565.html?jw_chl_seg=heise-widget", + "https://jobs.heise.de", + "https://www.heise.de/hintergrund/Renaissance-der-Atomkraft-im-Kleinen-Tschechien-setzt-auf-Mini-AKWs-7331352.html", + "https://www.heise.de/hintergrund/E-Auto-EU-Kommissar-Thierry-Breton-fuerchtet-um-die-Autoindustrie-7330961.html", + "https://www.heise.de/news/Job-im-Start-up-Himmelfahrtskommando-oder-Karriere-Beschleuniger-7327199.html", + "https://www.heise.de/meinung/Was-war-Was-wird-Von-Generationen-und-ihren-Perspektiven-7331445.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/news/heiseshow-EU-Zwang-und-neues-Namenswirrwar-wie-es-fuer-USB-C-weitergeht-7327271.html", + "https://www.heise.de/meinung/Ruhiger-Herbst-wenig-Neues-was-ist-faul-bei-Apple-7325734.html", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000042_21959_3_57&wt_mc=intern.abo.plus.hp_2022_jahr-nk.ho.teaser.teaser", + "https://www.heise.de/meinung/Kommentar-Luftgrenzwerte-sind-keine-Anleitungen-fuer-vorausschauende-Politik-7330410.html", + "https://www.heise.de/hintergrund/Bienenschwaerme-erzeugen-staerkere-elektrische-Felder-als-Gewitterwolken-7329614.html", + "https://www.heise.de/news/Chinesische-Raketenstufe-Spanischer-Luftraum-wegen-Absturz-teilweise-gesperrt-7330131.html", + "https://www.heise.de/thema/karriere", + "https://www.heise.de/news/Twitter-beginnt-mit-Entlassungen-7331154.html", + "https://www.heise.de/news/Twitter-schliesst-Bueros-am-Freitag-und-kuendigt-Entlassungen-per-E-Mail-an-7329864.html", + "https://www.heise.de/news/Angst-vor-Rezession-Apple-stoppt-Neueinstellungen-in-weiteren-Bereichen-7330334.html", + "https://www.heise.de/news/Rezession-Musk-Kuendigungswelle-in-IT-Branche-der-USA-7329786.html", + "https://www.heise.de/news/Bundesregierung-Beschaeftigte-mit-Homeoffice-Option-sind-weniger-krank-7328182.html", + "https://www.heise.de/video/", + "https://www.heise.de/multimediadatei/AMD-heizt-mit-Ryzen-7000-Intel-ein-c-t-uplink-45-3-7308764.html", + "https://www.heise.de/multimediadatei/AMD-heizt-mit-Ryzen-7000-Intel-ein-c-t-uplink-45-3-7308764.html", + "https://www.heise.de/multimediadatei/Kurz-informiert-vom-18-10-2022-by-heise-online-7312089.html", + "https://www.heise.de/multimediadatei/Kurz-informiert-vom-18-10-2022-by-heise-online-7312089.html", + "https://t3n.de/", + "https://t3n.de/news/palmoel-mikroplastik-nachhaltiger-einkaufen-apps-1500398/", + "https://t3n.de/news/wie-sich-buchhaendler-thalia-erfolgreich-gegen-amazon-behauptet-1507957/", + "https://t3n.de/news/mercedes-benz-eqe-test-hohe-erwartungen-1507120/", + "https://www.heise.de/meinung/Adobes-Midlife-Crisis-7324564.html", + "https://www.heise.de/news/BSI-Das-Ziel-der-Unabhaengigkeit-wackelt-7324576.html", + "https://www.heise.de/news/Photovoltaikausbau-Das-Potenzial-der-Supermaerkte-7309111.html", + "https://www.heise.de/tests/Dell-Pro-Webcam-WB5023-im-Kurztest-Folgsame-2K-Kamera-7322489.html", + "https://www.heise.de/tests/Logitech-MX-Mechanical-Mini-im-Kurztest-kompakte-Schreibmaschine-7313227.html", + "https://www.heise.de/ratgeber/iOS-16-und-watchOS-9-Tipps-und-Tricks-zu-den-besten-Neuerungen-7307692.html", + "https://www.heise.de/news/Zurueck-zu-den-Wurzeln-3D-Drucker-Snapmaker-J1-mit-zwei-Druckkoepfen-7328574.html", + "https://www.heise.de/ratgeber/Make-Projekt-Filmnegative-mit-dem-ESP32-CAM-anzeigen-7280693.html", + "https://www.heise.de/ratgeber/Lebend-Mausefalle-mit-ESP32-CAM-basteln-7159932.html", + "https://www.heise.de/ratgeber/Familienprojekt-Untersetzer-und-Taschenlampe-fuer-die-UV-Mottoparty-bauen-6522568.html", + "https://www.heise.de/news/c-t-Fotografie-Aus-Schwarz-Weiss-wird-bunt-7309261.html", + "https://www.heise.de/news/Sonys-Alpha-7R-V-KI-Autofokus-erkennt-Tiere-Fahrzeuge-und-Menschen-in-Bewegung-7321494.html", + "https://www.heise.de/news/Klein-und-wetterfest-Neue-spiegellose-Systemkamera-OM-5-fuer-Outdoor-Fotografen-7320875.html", + "https://www.heise.de/news/Extrem-lichtstark-Drei-neue-Weitwinkel-Objektive-mit-f-0-95-fuer-APS-C-und-MFT-7320164.html", + "https://www.heise.de/select/ix/2022/4/2127106020689717055", + "https://www.heise.de/select/ix/2022/4/2120310153044855711", + "https://www.heise.de/select/ix/2022/4/2127409020654106444", + "https://www.heise.de/hintergrund/Der-Lichtcomputer-Wie-sich-mit-Licht-schnell-rechnen-laesst-6165686.html", + "https://www.heise.de/hintergrund/Kommentar-Das-Problem-mit-Musks-Comeback-Plan-von-Vine-es-gibt-heute-TikTok-7325755.html", + "https://www.heise.de/hintergrund/Wie-smarte-Traktoren-auch-fuer-Kleinbauern-bezahlbar-werden-sollen-7325524.html", + "https://www.heise.de/news/Kurz-informiert-E-Autos-aus-China-Twitter-Dunkelfeld-Cybercrime-Fake-Rabatt-7330477.html", + "https://www.heise.de/news/Kurz-informiert-E-Autos-aus-China-Twitter-Dunkelfeld-Cybercrime-Fake-Rabatt-7330477.html", + "https://www.heise.de/news/Kurz-informiert-Gas-Heizung-Autos-Atomkraft-DSGVO-Urteil-7329039.html", + "https://www.heise.de/news/Kurz-informiert-Gas-Heizung-Autos-Atomkraft-DSGVO-Urteil-7329039.html", + "https://www.heise.de/news/Kurz-informiert-Phishing-Stromproduktion-Street-View-Luftqualitaet-7327655.html", + "https://www.heise.de/news/Kurz-informiert-Phishing-Stromproduktion-Street-View-Luftqualitaet-7327655.html", + "https://www.heise.de/news/Kurz-informiert-Hackerangriff-DMA-Geruchssinn-Asteroid-7325771.html", + "https://www.heise.de/news/Kurz-informiert-Hackerangriff-DMA-Geruchssinn-Asteroid-7325771.html", + "https://www.heise.de/meinung/Podcast-Die-Hupe-Das-Fahrrad-in-den-Niederlanden-6187706.html", + "https://www.heise.de/hintergrund/Batteriezellen-fuer-Elektroautos-Auf-der-Suche-nach-der-Welt-Zelle-6176430.html", + "https://www.heise.de/hintergrund/Zurueck-aus-den-Ewigen-Jagdgruenden-120-Jahre-Indian-Motorcycle-6131255.html", + "https://www.heise.de/tests/Fahrbericht-Kia-EV6-Rasant-in-jeder-Hinsicht-6170432.html", + "https://www.guenstiger.de/Kaufberatung.html?p=363284", + "https://www.guenstiger.de/kaufberatung/elektronik-and-technik/die-besten-smarten-heizkorperthermostate-fur-im-vergleich/220426.html?p=363284", + "https://www.guenstiger.de/kaufberatung/baumarkt-and-werkzeug/kaufen-statt-mieten-beliebte-hacksler-fur-den-garten-im-vergleich/220412.html?p=363284", + "https://www.guenstiger.de/kaufberatung/elektronik-and-technik/fur-jedes-wetter-gerustet-die-besten-wetterstationen-mit-funk-modul/220128.html?p=363284", + "https://www.techstage.de", + "https://www.techstage.de/bestenliste/top-6-solargeneratoren-die-besten-powerstations-mit-photovoltaik/84614vd?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.techstage.de/bestenliste/klapprad-top-10-die-besten-e-bikes-zum-klappen-von-600-bis-1200-euro/3pvcgql?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.techstage.de/ratgeber/usb-ladegerate-mit-mehreren-anschlussen-so-ladt-man-notebook-macbook-kopfhorer/h56tk97?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.techstage.de/ratgeber/ratgeber-die-15-gunstigsten-3d-drucker/54q9r5q?wt_mc=intern.red.techstage.techstage_buehne.startseite.buehne.buehne", + "https://www.heise.de/tp/features/Knappes-Gas-Rollierender-Lockdown-im-kommenden-Winter-7167680.html", + "https://www.heise.de/tp/features/Rettung-bei-Stromausfall-Notstrom-aus-der-Solarbatterie-7162145.html", + "https://www.heise.de/download", + "https://www.heise.de/download/specials/Anonym-surfen-mit-VPN-Die-besten-VPN-Anbieter-im-Vergleich-3798036", + "https://www.heise.de/download/product/WISO_Grundsteuer", + "https://www.heise.de/download/product/opera-1458", + "https://www.heise.de/download/product/adwcleaner-91313", + "https://www.heise.de/download/product/AutoClicker", + "https://www.heise.de/download/product/h2testw-50539", + "https://www.heise.de/download/product/rufus", + "https://www.heise.de/download/search#?page=1&sort=DOWNLOADRANK&wt_mc=intern.newsticker.buehne.download", + "https://shop.heise-academy.de/?wt_mc=intern.events.ho.academy_november_sale.ho_teaser.link.link", + "https://www.heise.de/#bottom-up", + "https://www.heise.de/themen/", + "https://www.heise.de/themen/A", + "https://www.heise.de/themen/B", + "https://www.heise.de/themen/C", + "https://www.heise.de/themen/D", + "https://www.heise.de/themen/E", + "https://www.heise.de/themen/F", + "https://www.heise.de/themen/G", + "https://www.heise.de/themen/H", + "https://www.heise.de/themen/I", + "https://www.heise.de/themen/J", + "https://www.heise.de/themen/K", + "https://www.heise.de/themen/L", + "https://www.heise.de/themen/M", + "https://www.heise.de/themen/N", + "https://www.heise.de/themen/O", + "https://www.heise.de/themen/P", + "https://www.heise.de/themen/Q", + "https://www.heise.de/themen/R", + "https://www.heise.de/themen/S", + "https://www.heise.de/themen/T", + "https://www.heise.de/themen/U", + "https://www.heise.de/themen/V", + "https://www.heise.de/themen/W", + "https://www.heise.de/themen/X", + "https://www.heise.de/themen/Y", + "https://www.heise.de/themen/Z", + "https://www.heise.de/themen/Sonderzeichen", + "https://www.heise.de/themen/Ziffer", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000028_22018_3_57&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser&utm_source=ho&utm_medium=stickyfooter&utm_content=gratismonat" + ], + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000028_22018_3_57&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser&utm_source=ho&utm_medium=stickyfooter&utm_content=gratismonat": [ + "https://www.heise.de/api/accountservice/checkout/1?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/10?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/2?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/subscribe/plus?affiliateId=32501_HP000028_22018_3_57&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser&utm_source=ho&utm_medium=stickyfooter&utm_content=gratismonat#faq", + "https://www.heise.de/plus", + "https://play.google.com/store/apps/details?id=de.heise.android.heiseonlineapp&hl=de", + "https://apps.apple.com/de/app/heise-online-it-news/id333214314", + "https://www.heise.de/select/", + "tel:+4954180009120", + "mailto:leserservice@heise.de", + "https://heise-solutions.de/firmenlizenz/", + "https://www.heise.de/sso/registration/", + "https://www.heise.de/sso/registration/account/userdata", + "https://www.heise.de/sso/registration/add_subscriber_id", + "https://www.heise.de/sso/login/?forward=https://www.heise.de/", + "https://www.heise.de/sso/registration/account/userdata", + "https://www.heise.de/sso/registration/add_subscriber_id", + "https://www.heise.de/sso/registration/forgot_password", + "https://www.heise.de/sso/registration/forgot_password", + "https://www.heise.de/sso/login/?forward=https://www.heise.de/", + "https://www.heise.de/api/accountservice/checkout/1?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/10?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/api/accountservice/checkout/2?a=%2Fplus%2F&utm_content=gratismonat&utm_medium=stickyfooter&utm_source=ho&wt_mc=intern.abo.plus.hp_nk.sticky-nat.teaser.teaser", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/" + ], + "https://www.heise.de/kontakt/": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/kontakt/#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/", + "https://www.heise.de/investigativ/", + "https://www.heise.de/Hoeren-Sie-von-uns-unsere-Podcasts-4206659.html", + "https://www.heise.de/tipps-tricks/Was-ist-SWIFT-6533026.html", + "https://spiele.heise.de/", + "https://spiele.heise.de/#!Solitaer", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://tarifrechner.heise.de/dsl", + "https://www.heise.de/kontakt/#bottom-up", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html" + ], + "https://www.heise.de/account/cancellation": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/account/cancellation#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://it-kenner.heise.de/it-mittelstands-lounge/?utm_medium=tt&utm_campaign=IT-Mittelstand", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/account/${url}", + "https://www.heise.de/account/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/brandworlds/go-schule-morgen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/sso/registration/add_subscriber_id", + "https://www.heise.de/account/cancellation#bottom-up", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html" + ], + "https://www.heise.de/kontakt/?frage=3212474": [ + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/sso/login/", + "https://www.heise.de/kontakt/?frage=3212474#topnavigation__sub", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.techstage.de/", + "https://www.heise.de/tipps-tricks/", + "https://jobs.heise.de/", + "https://bildung.heise.de/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://business-services.heise.de/", + "https://tarifrechner.heise.de/dsl/", + "https://www.heise.de/tools/", + "https://spiele.heise.de", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://shop.heise.de", + "https://shop.heise.de/zeitschriften-abo/", + "https://www.heise-events.de/", + "https://www.heise-gruppe.de/artikel/Heise-als-Arbeitgeber-1812545.html", + "https://mediadaten.heise.de/", + "https://www.heise-gruppe.de/presse/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/kontakt/${url}", + "https://www.heise.de/plus/", + "https://www.heise.de/", + "https://www.heise.de/", + "https://www.heise.de/plus/", + "https://www.heise.de/ct/", + "https://www.heise.de/ix/", + "https://www.heise.de/tr/", + "https://www.heise.de/foto/", + "https://www.heise.de/mac-and-i/", + "https://www.heise.de/make/", + "https://www.heise.de/select/", + "https://www.heise.de/newsticker/it/", + "https://www.heise.de/newsticker/wissen/", + "https://www.heise.de/newsticker/mobiles/", + "https://www.heise.de/security/", + "https://www.heise.de/developer/", + "https://www.heise.de/newsticker/entertainment/", + "https://www.heise.de/newsticker/netzpolitik/", + "https://www.heise.de/newsticker/wirtschaft/", + "https://www.heise.de/newsticker/journal/", + "https://www.heise.de/newsticker/", + "https://www.heise.de/forum/", + "https://www.heise.de/thema/Energie", + "https://www.heise.de/thema/Ukraine_Krieg", + "https://www.heise.de/thema/Elektromobilit%C3%A4t", + "https://www.heise.de/thema/Windows", + "https://www.heise.de/thema/Linux-und-Open-Source", + "https://www.heise.de/thema/Digital-Health", + "https://www.heise.de/thema/Kryptow%C3%A4hrung", + "https://www.heise.de/podcasts", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/", + "https://www.heise.de/investigativ/", + "https://www.heise.de/Hoeren-Sie-von-uns-unsere-Podcasts-4206659.html", + "https://www.heise.de/tipps-tricks/Was-ist-SWIFT-6533026.html", + "https://spiele.heise.de/", + "https://spiele.heise.de/#!Solitaer", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://www.heise.de/newsletter/anmeldung.html?id=heise-shop", + "https://tarifrechner.heise.de/dsl", + "https://www.heise.de/kontakt/?frage=3212474#bottom-up", + "https://www.heise.de/newsticker/", + "https://www.heise.de/developer/", + "https://www.heise.de/thema/Netze", + "https://www.heise.de/thema/Linux-und-Open-Source/", + "https://www.heise.de/security/", + "https://www.heise.de/plus/", + "https://www.heise.de/tp/", + "https://www.heise.de/autos/", + "https://www.heise.de/tipps-tricks/", + "https://www.heise.de/download/", + "https://www.heise.de/preisvergleich/", + "https://www.heise.de/tools/", + "https://www.heise.de/loseblattwerke/", + "https://www.heise.de/netze/netzwerk-tools/imonitor-internet-stoerungen/", + "https://www.heise.de/newsletter/", + "https://www.heise.de/benachrichtigungen/heise-bot/", + "https://www.heise.de/benachrichtigungen", + "https://www.heise.de/Datenschutzerklaerung-der-Heise-Medien-GmbH-Co-KG-4860.html", + "javascript:window._sp_.gdpr.loadPrivacyManagerModal(556922);", + "https://www.heise.de/impressum.html", + "https://www.heise.de/kontakt/", + "https://www.heise.de/kontakt/?frage=3212474", + "https://www.heise.de/account/cancellation", + "http://www.interred.de/", + "https://www.plusline.net/", + "https://www.heise-gruppe.de/heise-medien.html" + ] +} \ No newline at end of file diff --git a/optar/cache/www.patricematz.de/2022-11-06_15-14-34.json b/optar/cache/www.patricematz.de/2022-11-06_15-14-34.json new file mode 100644 index 0000000..3cf2ba4 --- /dev/null +++ b/optar/cache/www.patricematz.de/2022-11-06_15-14-34.json @@ -0,0 +1 @@ +{"https://www.patricematz.de/": ["https://www.patricematz.de/", "https://www.linkedin.com/in/patrice-matz-b73b6814a/", "https://github.com/Askill", "https://www.patricematz.de/images/praktikum.pdf", "https://www.patricematz.de/images/bachelor.pdf", "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf", "https://irs.projects.patricematz.de", "https://github.com/Askill/Inverse-Rezeptsuche", "https://irs.projects.patricematz.de/", "https://github.com/Askill/Video-Synopsis", "https://github.com/Askill/UI", "https://github.com/Askill/Photo-Wall", "https://www.patricematz.de/photowall/demo/", "https://github.com/Askill/Flask-URL-Checker", "https://patricematz.de/starmapper.htm"], "https://www.patricematz.de/photowall/demo/": ["javascript:void(0)"], "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf": [], "https://www.patricematz.de/images/bachelor.pdf": [], "https://www.patricematz.de/images/praktikum.pdf": []} \ No newline at end of file diff --git a/optar/cache/www.patricematz.de/2022-11-06_15-16-36.json b/optar/cache/www.patricematz.de/2022-11-06_15-16-36.json new file mode 100644 index 0000000..b5f4212 --- /dev/null +++ b/optar/cache/www.patricematz.de/2022-11-06_15-16-36.json @@ -0,0 +1,25 @@ +{ + "https://www.patricematz.de/": [ + "https://www.patricematz.de/", + "https://www.linkedin.com/in/patrice-matz-b73b6814a/", + "https://github.com/Askill", + "https://www.patricematz.de/images/praktikum.pdf", + "https://www.patricematz.de/images/bachelor.pdf", + "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf", + "https://irs.projects.patricematz.de", + "https://github.com/Askill/Inverse-Rezeptsuche", + "https://irs.projects.patricematz.de/", + "https://github.com/Askill/Video-Synopsis", + "https://github.com/Askill/UI", + "https://github.com/Askill/Photo-Wall", + "https://www.patricematz.de/photowall/demo/", + "https://github.com/Askill/Flask-URL-Checker", + "https://patricematz.de/starmapper.htm" + ], + "https://www.patricematz.de/photowall/demo/": [ + "javascript:void(0)" + ], + "https://www.patricematz.de/images/21-Master-Thesis-Matz.pdf": [], + "https://www.patricematz.de/images/bachelor.pdf": [], + "https://www.patricematz.de/images/praktikum.pdf": [] +} \ No newline at end of file diff --git a/optar/deployment.yaml b/optar/deployment.yaml new file mode 100644 index 0000000..58c48b9 --- /dev/null +++ b/optar/deployment.yaml @@ -0,0 +1,16 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: optar-job +spec: + template: + metadata: + labels: + app: optar-job + spec: + serviceAccountName: optar-s3-cache-service-account + containers: + - name: optar + image: 705632797485.dkr.ecr.eu-central-1.amazonaws.com/optar:latest + restartPolicy: Never + backoffLimit: 3 \ No newline at end of file diff --git a/optar/dev.py b/optar/dev.py new file mode 100644 index 0000000..101c559 --- /dev/null +++ b/optar/dev.py @@ -0,0 +1,7 @@ +from src.Crawler import Crawler +from src.SiteReader import SiteReader +from src.SiteStoreS3 import SiteStoreS3 +from src.Watcher import Watcher + +if __name__ == "__main__": + Watcher(SiteStoreS3("optar-dev-cache"), SiteReader(),"./optar/sites.txt", "./optar/keywords.txt").watch(crawler=Crawler(1)) \ No newline at end of file diff --git a/optar/keywords.txt b/optar/keywords.txt new file mode 100644 index 0000000..f00bdb9 --- /dev/null +++ b/optar/keywords.txt @@ -0,0 +1 @@ +Engineer \ No newline at end of file diff --git a/optar/license.txt b/optar/license.txt new file mode 100644 index 0000000..1a3001c --- /dev/null +++ b/optar/license.txt @@ -0,0 +1,89 @@ +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + a. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + + b. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License. + + c. "Licensor" means the individual or entity that offers the Work under the terms of this License. + + d. "Original Author" means the individual or entity who created the Work. + + e. "Work" means the copyrightable work of authorship offered under the terms of this License. + + f. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + + g. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + a. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + + b. to create and reproduce Derivative Works; + + c. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + + d. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works; + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Sections 4(e) and 4(f). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + a. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any reference to such Licensor or the Original Author, as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any reference to such Licensor or the Original Author, as requested. + + b. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-NonCommercial-ShareAlike 2.0 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License. + + c. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works. + + d. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give the Original Author credit reasonable to the medium or means You are utilizing by conveying the name (or pseudonym if applicable) of the Original Author if supplied; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. + + e. For the avoidance of doubt, where the Work is a musical composition: + + i. Performance Royalties Under Blanket Licenses. Licensor reserves the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work if that performance is primarily intended for or directed toward commercial advantage or private monetary compensation. + + ii. Mechanical Rights and Statutory Royalties. Licensor reserves the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions), if Your distribution of such cover version is primarily intended for or directed toward commercial advantage or private monetary compensation. + + f. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor reserves the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions), if Your public digital performance is primarily intended for or directed toward commercial advantage or private monetary compensation. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + + b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + a. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + + b. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + + c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + + d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + + e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. + +9. Also: +Don't use it commercially. +All projects using source code from this project have to credit the autor. +The software is provided as is, the autor is not liable for damages. +Using this software or software based on it means you agreed to these conditions. \ No newline at end of file diff --git a/optar/main.py b/optar/main.py new file mode 100644 index 0000000..1f174a1 --- /dev/null +++ b/optar/main.py @@ -0,0 +1,7 @@ +from src.Crawler import Crawler +from src.SiteReader import SiteReader +from src.SiteStoreS3 import SiteStoreS3 +from src.Watcher import Watcher + +if __name__ == "__main__": + Watcher(SiteStoreS3("optar-dev-cache"), SiteReader(),"./sites.txt", "./keywords.txt").watch(crawler=Crawler(1), sleep=3600) \ No newline at end of file diff --git a/optar/prod.py b/optar/prod.py new file mode 100644 index 0000000..44e5068 --- /dev/null +++ b/optar/prod.py @@ -0,0 +1,7 @@ +from src.Crawler import Crawler +from src.SiteReader import SiteReader +from src.SiteStoreS3 import SiteStoreS3 +from src.Watcher import Watcher + +if __name__ == "__main__": + Watcher(SiteStoreS3("optar-dev-cache"), SiteReader(), "./sites.txt", "./keywords.txt").watch(crawler=Crawler(1)) \ No newline at end of file diff --git a/optar/readme.md b/optar/readme.md new file mode 100644 index 0000000..1bdd247 --- /dev/null +++ b/optar/readme.md @@ -0,0 +1,6 @@ +# Optar [![Pytest](https://github.com/Askill/optar/actions/workflows/pytest.yml/badge.svg)](https://github.com/Askill/optar/actions/workflows/pytest.yml) + +This tool crawles all pages on a given website to the provided deapth and finds new pages by comparing the new site tree to the cached one. All new pages are then checked for containing any of the provided keywords. If there is a match the page will be higlighted for the reader. +Default timeout 1h, list of keywords and sites can be changed while the software is running. + +Only retrieves static content, client side rendered content crawling is not implemented. diff --git a/optar/requirements.txt b/optar/requirements.txt new file mode 100644 index 0000000..047a1c2 --- /dev/null +++ b/optar/requirements.txt @@ -0,0 +1,6 @@ +deepdiff==7.0.1 +lxml==5.2.2 +requests==2.32.3 +trafilatura==1.11.0 +beautifulsoup4==4.12.3 +boto3==1.34.144 diff --git a/optar/sites.txt b/optar/sites.txt new file mode 100644 index 0000000..ad85345 --- /dev/null +++ b/optar/sites.txt @@ -0,0 +1 @@ +https://www.patricematz.de/CV \ No newline at end of file diff --git a/optar/src/Crawler.py b/optar/src/Crawler.py new file mode 100644 index 0000000..63a7ff9 --- /dev/null +++ b/optar/src/Crawler.py @@ -0,0 +1,101 @@ +import json +from time import sleep +from urllib.parse import urljoin +from lxml import html +import requests +import logging +from pathlib import Path + +class Crawler: + url = "" # the url of the website to be checked + _links = dict() # dict with all sites and urls on those sites + header_values = { + 'Connection:': 'Keep-alive', + 'name': 'Michael Foord', + 'location': 'Northampton', + 'language': 'English', + 'User-Agent': 'Mozilla 4/0'} + + exclude = [ + ] + + def __init__(self, depth=1, logger=None, exclude=None): + if exclude: + self.exclude += exclude + if logger: + self.logger = logger + else: + self.logger = logging.Logger( + name="optar", level=logging.INFO) + self._links = dict() + self._depth = depth + + def get_nodes(self): + return self._links + + def persist(self, path): + Path("/".join(path.split("/")[:-1])).mkdir(parents=True, exist_ok=True) + with open(path, 'w+') as fp: + json.dump(self._links, fp) + + def load_site(self, path): + with open(path, 'r') as fp: + self._links = json.load(fp) + + def run(self, root, sleep_time=0): + self.url = root + unchecked = [(0, root)] + + while unchecked: + level, root = unchecked.pop() + if root in self._links or self.url.rsplit('/')[2] not in root: + continue + if "https" not in root: + continue + + clean = True + for element in self.exclude: + if element in root: + clean = False + break + else: + clean = True + if not clean: + continue + + self.logger.info(f"{len(self._links)} {root}") + try: + site = requests.get(root) + tree = html.fromstring(site.content) + _links = tree.xpath('//a/@href') + except: + continue + + n_links = [] + for link in _links: + if link not in n_links and level < self._depth: + if link.startswith("http"): + n_links.append((level+1, link)) + else: + n_links.append((level+1, urljoin(site.url, link))) + + unchecked += n_links + self._links[root] = n_links + sleep(sleep_time) + + def getNodesEdges(self): + nodes = [] + edges = [] + for key, value in self._links.items(): + nodes.append(key) + for edge in value: + edges.append([key, edge]) + + return nodes, edges + + def makeGraph(self, g): + nodes, edges = self.getNodesEdges() + for node in nodes: + g.add_node(node) + for f, t in edges: + g.add_edge(f, t) diff --git a/optar/src/SiteReader.py b/optar/src/SiteReader.py new file mode 100644 index 0000000..b95696e --- /dev/null +++ b/optar/src/SiteReader.py @@ -0,0 +1,78 @@ +import json +from typing import List, Dict +import requests +import trafilatura +from requests.exceptions import MissingSchema +from bs4 import BeautifulSoup + +# Pretty sure most of this code is not from me, but from a demo on trafilatura +class SiteReader: + def __init__(self): + pass + + def beautifulsoup_extract_text_fallback(self, response_content): + + ''' + This is a fallback function, so that we can always return a value for text content. + Even for when both Trafilatura and BeautifulSoup are unable to extract the text from a + single URL. + ''' + + # Create the beautifulsoup object: + soup = BeautifulSoup(response_content, 'html.parser') + + # Finding the text: + text = soup.find_all(text=True) + + # Remove unwanted tag elements: + cleaned_text = '' + blacklist = [ + '[document]', + 'noscript', + 'header', + 'html', + 'meta', + 'head', + 'input', + 'script', + 'style', ] + + # Then we will loop over every item in the extracted text and make sure that the beautifulsoup4 tag + # is NOT in the blacklist + for item in text: + if item.parent.name not in blacklist: + cleaned_text += '{} '.format(item) + + # Remove any tab separation and strip the text: + cleaned_text = cleaned_text.replace('\t', '') + return cleaned_text.strip() + + def extract_text_from_single_web_page(self, url): + + downloaded_url = trafilatura.fetch_url(url) + try: + a = trafilatura.extract(downloaded_url, output_format="json", with_metadata=True, include_comments=False) + except AttributeError: + a = trafilatura.extract(downloaded_url, output_format="json", with_metadata=True) + if a: + json_output = json.loads(a) + return json_output['text'] + else: + try: + resp = requests.get(url) + # We will only extract the text from successful requests: + if resp.status_code == 200: + return self.beautifulsoup_extract_text_fallback(resp.content) + else: + # This line will handle for any failures in both the Trafilature and BeautifulSoup4 functions: + return None + # Handling for any URLs that don't have the correct protocol + except MissingSchema: + return None + + def get_sites_content_dynamic(self, urls: List[str]): + '''not implemented''' + pass + + def get_sites_content_static(self, urls: List[str]) -> Dict[str, str]: + return {url: self.extract_text_from_single_web_page(url) for url in urls} diff --git a/optar/src/SiteStoreS3.py b/optar/src/SiteStoreS3.py new file mode 100644 index 0000000..74317c1 --- /dev/null +++ b/optar/src/SiteStoreS3.py @@ -0,0 +1,36 @@ +import json +import os +from pathlib import Path +from typing import List, Optional +import boto3 + + +class SiteStoreS3: + def __init__(self, bucket): + self.bucket = bucket + + def get_site_history(self, cache_path) -> Optional[list[str]]: + # Make sure you provide / in the end + prefix = cache_path + if cache_path[-1] != "/": + prefix += "/" + + s3 = boto3.client("s3") + result = s3.list_objects_v2(Bucket=self.bucket, Prefix=cache_path, MaxKeys=21) + if "Contents"not in result: + return None + # return a sorted list of file names (key), which are the creation dates, ignore the prefix (len(cache_path)), ignore the first element, as this is only the prefix + return sorted([x["Key"][len(cache_path) :] for x in result["Contents"]], reverse=True) + + def get_site_links(self, path): + s3 = boto3.resource('s3') + obj = s3.Object(self.bucket,path) + data=obj.get()['Body'] + return json.load(data) + + def persist(self, path, data): + s3 = boto3.resource('s3') + s3object = s3.Object(self.bucket, path) + s3object.put( + Body=(bytes(json.dumps(data).encode('UTF-8'))) + ) \ No newline at end of file diff --git a/optar/src/Watcher.py b/optar/src/Watcher.py new file mode 100644 index 0000000..4a40b22 --- /dev/null +++ b/optar/src/Watcher.py @@ -0,0 +1,85 @@ +import time +from datetime import datetime +from typing import List, Dict +from deepdiff import DeepDiff + +class Watcher: + # there should be a type hint for site_store and site_reader, referencing interfaces, which these implement, for better auto complete and DX + def __init__(self, site_store, site_reader, sites_source_path, keywords_source_path) -> None: + self.site_store = site_store + self.site_reader = site_reader + self.keywords_source_path = keywords_source_path + self.sites_source_path = sites_source_path + + def read_txt_file(self, path): + with open(path) as f: + return f.read().splitlines() + + def watch(self, crawler, sleep=-1): + """start the watcher with the given interval + + :param arg: seconds between runs, -1 for single run + :type arg: int + :return: None + :rtype: None + """ + while True: + keywords = self.read_txt_file(self.keywords_source_path) + sites = self.read_txt_file(self.sites_source_path) + + + for site in sites: + crawler.run(site) + self.site_store.persist(f"{self.remove_protocol(site)}/{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.json", crawler.get_nodes()) + # do NOT overload the target + time.sleep(1) + + contents = [self.get_new_content(site) for site in sites] + # TODO: improve handleing of None + contents = [x for x in contents if x is not None and x is not {}] + matches = [] + for content in contents: + for url, c in content.items(): + matches.append(self.search_sites(url, c, keywords)) + print(matches) + + if sleep == -1: + return matches + time.sleep(sleep) + + @staticmethod + def remove_protocol(site): + # every protocol should have // + if "//" not in site: + return site + return site.split('/')[2] + + def get_new_content(self, url) -> Dict[str, str]: + """ get all past iterations of a site by the fully qualified domain name """ + list_of_files = self.site_store.get_site_history(f"{self.remove_protocol(url)}/") + + if len(list_of_files) >= 2: + prev_version = self.site_store.get_site_links(f"{self.remove_protocol(url)}/{list_of_files[-2]}") + else: + prev_version = {url: []} + current_version = self.site_store.get_site_links(f"{self.remove_protocol(url)}/{list_of_files[-1]}") + news = DeepDiff(prev_version, current_version, ignore_order=True) + + if news: + sites_contents = self.site_reader.get_sites_content_static(self.get_added_urls(news)) + return sites_contents + return {} + + @staticmethod + def get_added_urls( news): + return [z.split("'")[1] for z in list(news["iterable_item_added"])] + + @staticmethod + def search_sites(url, content, keywords: List[str]): + if content is None: + return [] + results = [] + for keyword in keywords: + if keyword in content: + results.append((url, keyword)) + return results diff --git a/optar/src/__init__.py b/optar/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/optar/tests/MockSiteStore.py b/optar/tests/MockSiteStore.py new file mode 100644 index 0000000..712988f --- /dev/null +++ b/optar/tests/MockSiteStore.py @@ -0,0 +1,26 @@ +import json +import os +from pathlib import Path +from typing import List, Optional + + +class SiteStore: + def __init__(self): + pass + + @staticmethod + def get_site_history(in_path) -> Optional[list[str]]: + cache_path = "./cache/" + in_path + if not os.path.isdir(cache_path): + return [] + return sorted(os.listdir(cache_path)) + + @staticmethod + def get_site_links(in_path): + cache_path = "./cache/" + in_path + with open(cache_path, 'r') as fp: + return json.load(fp) + + @staticmethod + def persist(self, data): + return \ No newline at end of file diff --git a/optar/tests/__init__.py b/optar/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/optar/tests/cache/www.patricematz.de/2024-07-15_16-30-47.json b/optar/tests/cache/www.patricematz.de/2024-07-15_16-30-47.json new file mode 100644 index 0000000..596bd0e --- /dev/null +++ b/optar/tests/cache/www.patricematz.de/2024-07-15_16-30-47.json @@ -0,0 +1 @@ +{"https://www.patricematz.de/": [[1, "https://www.patricematz.de/Projects"], [1, "https://www.patricematz.de/Links"]], "https://www.patricematz.de/Links": [], "https://www.patricematz.de/Projects": [], "https://www.patricematz.de/CV": []} \ No newline at end of file diff --git a/optar/tests/cache/www.patricematz.de/2024-07-16_16-30-47.json b/optar/tests/cache/www.patricematz.de/2024-07-16_16-30-47.json new file mode 100644 index 0000000..37f41bc --- /dev/null +++ b/optar/tests/cache/www.patricematz.de/2024-07-16_16-30-47.json @@ -0,0 +1 @@ +{"https://www.patricematz.de/": [[1, "https://www.patricematz.de/"], [1, "https://www.patricematz.de/CV"], [1, "https://www.patricematz.de/Projects"], [1, "https://www.patricematz.de/Links"]], "https://www.patricematz.de/Links": [], "https://www.patricematz.de/Projects": [], "https://www.patricematz.de/CV": []} \ No newline at end of file diff --git a/optar/tests/keywords.txt b/optar/tests/keywords.txt new file mode 100644 index 0000000..553b856 --- /dev/null +++ b/optar/tests/keywords.txt @@ -0,0 +1 @@ +Consultant \ No newline at end of file diff --git a/optar/tests/sites.txt b/optar/tests/sites.txt new file mode 100644 index 0000000..6b14489 --- /dev/null +++ b/optar/tests/sites.txt @@ -0,0 +1 @@ +https://www.patricematz.de/ \ No newline at end of file diff --git a/optar/tests/watcher_test.py b/optar/tests/watcher_test.py new file mode 100644 index 0000000..ae0d79e --- /dev/null +++ b/optar/tests/watcher_test.py @@ -0,0 +1,41 @@ +import os +from optar.src.SiteReader import SiteReader +from optar.src.Watcher import Watcher +from optar.tests.MockSiteStore import SiteStore + +def test_search_sites__found(): + + x = Watcher.search_sites("test.com", "dfjgbnsdigubsdofgliusdbgsdiugbTESTfjgnsdgosd\n\nsdfboiuasdgf!0980", ["TEST"]) + assert x == [("test.com", "TEST")] + +def test_search_sites__not_found(): + + x = Watcher.search_sites("test.com", "dfjgbnsdigubsdofgliusdbgsdiugbfjgnsdgosd\n\nsdfboiuasdgf!0980", ["TEST", "testing"]) + assert x == [] + +def test_remove_protocol__https(): + res = Watcher.remove_protocol("https://www.google.com") + assert res == "www.google.com" + +def test_remove_protocol__http(): + res = Watcher.remove_protocol("http://www.google.com") + assert res == "www.google.com" + +def test_remove_protocol__none(): + res = Watcher.remove_protocol("www.google.com") + assert res == "www.google.com" + +def test_compare_sites(): + class MockCrawler: + _links = {} + def run(self, url): + self._links[url] = [url] + def get_nodes(self): + return self._links + assert os.path.isdir("./cache/www.patricematz.de") + assert len(SiteStore.get_site_history("www.patricematz.de")) >= 2 + # the links given in this sites.txt should be to either local files, or a local mock server + # this is not implemented, as it would be trivial but time consuming + watcher = Watcher(SiteStore(), SiteReader(), "./sites.txt", "keywords.txt") + assert [] == watcher.watch(MockCrawler()) + diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl new file mode 100644 index 0000000..94ac683 --- /dev/null +++ b/terraform/.terraform.lock.hcl @@ -0,0 +1,144 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.47.0" + constraints = ">= 4.0.0, >= 4.33.0, >= 5.30.0, >= 5.40.0, ~> 5.47.0" + hashes = [ + "h1:bCETSNoRRe780zsdTWW86HvDl2ZU/YSAcI1Aazk5sI8=", + "zh:06037a14e47e8f82d0b3b326cd188566272b808b7970a9249a11db26d475b83d", + "zh:116b7dd58ca964a1056249d2b6550f399b0a6bc9a7920b7ee134242114432c9f", + "zh:1aa089c81459071c1d65ba7454f1122159e1fa1b5384e6e9ef85c8264f8a9ecb", + "zh:2c1471acba40c4944aa88dda761093c0c969db6408bdc1a4fb62417788cd6bb6", + "zh:3b950bea06ea4bf1ec359a97a4f1745b7efca7fc2da368843666020dd0ebc5d4", + "zh:7191c5c2fce834d584153dcd5269ed3042437f224d341ad85df06b2247bd09b2", + "zh:76d841b3f247f9bb3899dec3b4d871613a4ae8a83a581a827655d34b1bbee0ee", + "zh:7c656ce252fafc2c915dad43a0a7da17dba975207d75841a02f3f2b92d51ec25", + "zh:8ec97118cbdef64139c52b719e4e22443e67a1f37ea1597cd45b2e9b97332a35", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a369deca7938236a7da59f7ad1fe18137f736764c9015ed10e88edb6e8505980", + "zh:a743882fb099401eae0c86d9388a6faadbbc27b2ac9477aeef643e5de4eec3f9", + "zh:d5f960f58aff06fc58e244fea6e665800384cacb8cd64a556f8e145b98650372", + "zh:e31ffcfd560132ffbff2f574928ba392e663202a750750ed39a8950031b75623", + "zh:ebd9061b92a772144564f35a63d5a08cb45e14a9d39294fda185f2e0de9c8e28", + ] +} + +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.3.4" + constraints = ">= 2.0.0, ~> 2.3.4" + hashes = [ + "h1:iDq03pOzp/UsXya2h+32VOOrvGdJgI9L2/EZJoN9t4A=", + "zh:09f1f1e1d232da96fbf9513b0fb5263bc2fe9bee85697aa15d40bb93835efbeb", + "zh:381e74b90d7a038c3a8dcdcc2ce8c72d6b86da9f208a27f4b98cabe1a1032773", + "zh:398eb321949e28c4c5f7c52e9b1f922a10d0b2b073b7db04cb69318d24ffc5a9", + "zh:4a425679614a8f0fe440845828794e609b35af17db59134c4f9e56d61e979813", + "zh:4d955d8608ece4984c9f1dacda2a59fdb4ea6b0243872f049b388181aab8c80a", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:a48fbee1d58d55a1f4c92c2f38c83a37c8b2f2701ed1a3c926cefb0801fa446a", + "zh:b748fe6631b16a1dafd35a09377c3bffa89552af584cf95f47568b6cd31fc241", + "zh:d4b931f7a54603fa4692a2ec6e498b95464babd2be072bed5c7c2e140a280d99", + "zh:f1c9337fcfe3a7be39d179eb7986c22a979cfb2c587c05f1b3b83064f41785c5", + "zh:f58fc57edd1ee3250a28943cd84de3e4b744cdb52df0356a53403fc240240636", + "zh:f5f50de0923ff530b03e1bca0ac697534d61bb3e5fc7f60e13becb62229097a9", + ] +} + +provider "registry.terraform.io/hashicorp/kubernetes" { + version = "2.31.0" + hashes = [ + "h1:o1lFYziqjK6h7ayIgDV+qGKbc7O4xWtLE2t3LwHsv84=", + "zh:0d16b861edb2c021b3e9d759b8911ce4cf6d531320e5dc9457e2ea64d8c54ecd", + "zh:1bad69ed535a5f32dec70561eb481c432273b81045d788eb8b37f2e4a322cc40", + "zh:43c58e3912fcd5bb346b5cb89f31061508a9be3ca7dd4cd8169c066203bcdfb3", + "zh:4778123da9206918a92dfa73cc711475d2b9a8275ff25c13a30513c523ac9660", + "zh:8bfa67d2db03b3bfae62beebe6fb961aee8d91b7a766efdfe4d337b33dfd23dd", + "zh:9020bb5729db59a520ade5e24984b737e65f8b81751fbbd343926f6d44d22176", + "zh:90431dbfc5b92498bfbce38f0b989978c84421a6c33245b97788a46b563fbd6e", + "zh:b71a061dda1244f6a52500e703a9524b851e7b11bbf238c17bbd282f27d51cb2", + "zh:d6232a7651b834b89591b94bf4446050119dcde740247e6083a4d55a2cefd28a", + "zh:d89fba43e699e28e2b5e92fff2f75fc03dbc8de0df9dacefe1a8836f8f430753", + "zh:ef85c0b744f5ba1b10dadc3c11e331ba4225c45bb733e024d7218c24b02b0512", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/null" { + version = "3.2.2" + constraints = ">= 3.0.0" + hashes = [ + "h1:JViWrgF7Ks2GqB6UfcLDUbusXeSfhfhFymo4c0N5e+I=", + "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", + "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", + "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", + "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", + "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", + "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", + "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", + "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", + "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", + "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.6.2" + constraints = "~> 3.6.1" + hashes = [ + "h1:Gd3WitYIzSYo/Suo+PMxpZpIGpRPrwl0JU0+DhxycFM=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.11.2" + constraints = ">= 0.9.0" + hashes = [ + "h1:t/CKZz4ElkBqy8Pvu02rw+ma04dHsRu+oLssx4kMON0=", + "zh:02588b5b8ba5d31e86d93edc93b306bcbf47c789f576769245968cc157a9e8c5", + "zh:088a30c23796133678d1d6614da5cf5544430570408a17062288b58c0bd67ac8", + "zh:0df5faa072d67616154d38021934d8a8a316533429a3f582df3b4b48c836cf89", + "zh:12edeeaef96c47f694bd1ba7ead6ccdb96028b25df352eea4bc5e40de7a59177", + "zh:1e859504a656a6e988f07b908e6ffe946b28bfb56889417c0a07ea9605a3b7b0", + "zh:64a6ae0320d4956c4fdb05629cfcebd03bcbd2206e2d733f2f18e4a97f4d5c7c", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:924d137959193bf7aee6ebf241fbb9aec46d6eef828c5cf8d3c588770acae7b2", + "zh:b3cc76281a4faa9c2293a2460fc6962f6539e900994053f85185304887dddab8", + "zh:cbb40c791d4a1cdba56cffa43a9c0ed8e69930d49aa6bd931546b18c36e3b720", + "zh:d227d43594f8cb3d24f1fdd71382f14502cbe2a6deaddbc74242656bb5b38daf", + "zh:d4840641c46176bb9d70ba3aff09de749282136c779996b546c81e5ff701bbf6", + ] +} + +provider "registry.terraform.io/hashicorp/tls" { + version = "4.0.5" + constraints = ">= 3.0.0, ~> 4.0.5" + hashes = [ + "h1:gthwVUwv0WLGMwx7GR/N6XyIONzrSJJaXD6dDJB4FlY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/terraform/README.md b/terraform/README.md new file mode 100644 index 0000000..397c1a5 --- /dev/null +++ b/terraform/README.md @@ -0,0 +1,6 @@ +# Infrastructure + +using workspace: dev + +add eks context to kubectl config +aws eks --region eu-central-1 update-kubeconfig --name optar-dev-eks-gRI4vwi5 diff --git a/terraform/backend.tf b/terraform/backend.tf new file mode 100644 index 0000000..4558154 --- /dev/null +++ b/terraform/backend.tf @@ -0,0 +1,8 @@ +terraform { + backend "s3" { + bucket = "web-crawler-on-eks-tf-state" + key = "terraform.tfstate" + workspace_key_prefix = "template" + region = "eu-central-1" + } +} \ No newline at end of file diff --git a/terraform/dev.tfvars b/terraform/dev.tfvars new file mode 100644 index 0000000..ab3799d --- /dev/null +++ b/terraform/dev.tfvars @@ -0,0 +1,4 @@ + +stage = "dev" +project_name = "optar" +account_id = "705632797485" \ No newline at end of file diff --git a/terraform/main.tf b/terraform/main.tf new file mode 100644 index 0000000..96777fd --- /dev/null +++ b/terraform/main.tf @@ -0,0 +1,35 @@ + +module "optar" { + source = "./modules/eks" + + stage = var.stage + project_name = var.project_name + account_id = var.account_id + + app_cache_arn = module.s3.app_cache_arn + vpc_id = module.network.vpc_id + subnet_ids = module.network.vpc_subnet_ids +} + +module "network" { + source = "./modules/network" + + stage = var.stage + project_name = var.project_name + account_id = var.account_id +} + +module "s3" { + source = "./modules/s3" + stage = var.stage + project_name = var.project_name + account_id = var.account_id +} + +module "ecr" { + source = "./modules/ecr" + + stage = var.stage + project_name = var.project_name + account_id = var.account_id +} \ No newline at end of file diff --git a/terraform/modules/ecr/.terraform.lock.hcl b/terraform/modules/ecr/.terraform.lock.hcl new file mode 100644 index 0000000..94ac683 --- /dev/null +++ b/terraform/modules/ecr/.terraform.lock.hcl @@ -0,0 +1,144 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.47.0" + constraints = ">= 4.0.0, >= 4.33.0, >= 5.30.0, >= 5.40.0, ~> 5.47.0" + hashes = [ + "h1:bCETSNoRRe780zsdTWW86HvDl2ZU/YSAcI1Aazk5sI8=", + "zh:06037a14e47e8f82d0b3b326cd188566272b808b7970a9249a11db26d475b83d", + "zh:116b7dd58ca964a1056249d2b6550f399b0a6bc9a7920b7ee134242114432c9f", + "zh:1aa089c81459071c1d65ba7454f1122159e1fa1b5384e6e9ef85c8264f8a9ecb", + "zh:2c1471acba40c4944aa88dda761093c0c969db6408bdc1a4fb62417788cd6bb6", + "zh:3b950bea06ea4bf1ec359a97a4f1745b7efca7fc2da368843666020dd0ebc5d4", + "zh:7191c5c2fce834d584153dcd5269ed3042437f224d341ad85df06b2247bd09b2", + "zh:76d841b3f247f9bb3899dec3b4d871613a4ae8a83a581a827655d34b1bbee0ee", + "zh:7c656ce252fafc2c915dad43a0a7da17dba975207d75841a02f3f2b92d51ec25", + "zh:8ec97118cbdef64139c52b719e4e22443e67a1f37ea1597cd45b2e9b97332a35", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a369deca7938236a7da59f7ad1fe18137f736764c9015ed10e88edb6e8505980", + "zh:a743882fb099401eae0c86d9388a6faadbbc27b2ac9477aeef643e5de4eec3f9", + "zh:d5f960f58aff06fc58e244fea6e665800384cacb8cd64a556f8e145b98650372", + "zh:e31ffcfd560132ffbff2f574928ba392e663202a750750ed39a8950031b75623", + "zh:ebd9061b92a772144564f35a63d5a08cb45e14a9d39294fda185f2e0de9c8e28", + ] +} + +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.3.4" + constraints = ">= 2.0.0, ~> 2.3.4" + hashes = [ + "h1:iDq03pOzp/UsXya2h+32VOOrvGdJgI9L2/EZJoN9t4A=", + "zh:09f1f1e1d232da96fbf9513b0fb5263bc2fe9bee85697aa15d40bb93835efbeb", + "zh:381e74b90d7a038c3a8dcdcc2ce8c72d6b86da9f208a27f4b98cabe1a1032773", + "zh:398eb321949e28c4c5f7c52e9b1f922a10d0b2b073b7db04cb69318d24ffc5a9", + "zh:4a425679614a8f0fe440845828794e609b35af17db59134c4f9e56d61e979813", + "zh:4d955d8608ece4984c9f1dacda2a59fdb4ea6b0243872f049b388181aab8c80a", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:a48fbee1d58d55a1f4c92c2f38c83a37c8b2f2701ed1a3c926cefb0801fa446a", + "zh:b748fe6631b16a1dafd35a09377c3bffa89552af584cf95f47568b6cd31fc241", + "zh:d4b931f7a54603fa4692a2ec6e498b95464babd2be072bed5c7c2e140a280d99", + "zh:f1c9337fcfe3a7be39d179eb7986c22a979cfb2c587c05f1b3b83064f41785c5", + "zh:f58fc57edd1ee3250a28943cd84de3e4b744cdb52df0356a53403fc240240636", + "zh:f5f50de0923ff530b03e1bca0ac697534d61bb3e5fc7f60e13becb62229097a9", + ] +} + +provider "registry.terraform.io/hashicorp/kubernetes" { + version = "2.31.0" + hashes = [ + "h1:o1lFYziqjK6h7ayIgDV+qGKbc7O4xWtLE2t3LwHsv84=", + "zh:0d16b861edb2c021b3e9d759b8911ce4cf6d531320e5dc9457e2ea64d8c54ecd", + "zh:1bad69ed535a5f32dec70561eb481c432273b81045d788eb8b37f2e4a322cc40", + "zh:43c58e3912fcd5bb346b5cb89f31061508a9be3ca7dd4cd8169c066203bcdfb3", + "zh:4778123da9206918a92dfa73cc711475d2b9a8275ff25c13a30513c523ac9660", + "zh:8bfa67d2db03b3bfae62beebe6fb961aee8d91b7a766efdfe4d337b33dfd23dd", + "zh:9020bb5729db59a520ade5e24984b737e65f8b81751fbbd343926f6d44d22176", + "zh:90431dbfc5b92498bfbce38f0b989978c84421a6c33245b97788a46b563fbd6e", + "zh:b71a061dda1244f6a52500e703a9524b851e7b11bbf238c17bbd282f27d51cb2", + "zh:d6232a7651b834b89591b94bf4446050119dcde740247e6083a4d55a2cefd28a", + "zh:d89fba43e699e28e2b5e92fff2f75fc03dbc8de0df9dacefe1a8836f8f430753", + "zh:ef85c0b744f5ba1b10dadc3c11e331ba4225c45bb733e024d7218c24b02b0512", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/null" { + version = "3.2.2" + constraints = ">= 3.0.0" + hashes = [ + "h1:JViWrgF7Ks2GqB6UfcLDUbusXeSfhfhFymo4c0N5e+I=", + "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", + "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", + "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", + "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", + "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", + "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", + "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", + "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", + "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", + "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.6.2" + constraints = "~> 3.6.1" + hashes = [ + "h1:Gd3WitYIzSYo/Suo+PMxpZpIGpRPrwl0JU0+DhxycFM=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.11.2" + constraints = ">= 0.9.0" + hashes = [ + "h1:t/CKZz4ElkBqy8Pvu02rw+ma04dHsRu+oLssx4kMON0=", + "zh:02588b5b8ba5d31e86d93edc93b306bcbf47c789f576769245968cc157a9e8c5", + "zh:088a30c23796133678d1d6614da5cf5544430570408a17062288b58c0bd67ac8", + "zh:0df5faa072d67616154d38021934d8a8a316533429a3f582df3b4b48c836cf89", + "zh:12edeeaef96c47f694bd1ba7ead6ccdb96028b25df352eea4bc5e40de7a59177", + "zh:1e859504a656a6e988f07b908e6ffe946b28bfb56889417c0a07ea9605a3b7b0", + "zh:64a6ae0320d4956c4fdb05629cfcebd03bcbd2206e2d733f2f18e4a97f4d5c7c", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:924d137959193bf7aee6ebf241fbb9aec46d6eef828c5cf8d3c588770acae7b2", + "zh:b3cc76281a4faa9c2293a2460fc6962f6539e900994053f85185304887dddab8", + "zh:cbb40c791d4a1cdba56cffa43a9c0ed8e69930d49aa6bd931546b18c36e3b720", + "zh:d227d43594f8cb3d24f1fdd71382f14502cbe2a6deaddbc74242656bb5b38daf", + "zh:d4840641c46176bb9d70ba3aff09de749282136c779996b546c81e5ff701bbf6", + ] +} + +provider "registry.terraform.io/hashicorp/tls" { + version = "4.0.5" + constraints = ">= 3.0.0, ~> 4.0.5" + hashes = [ + "h1:gthwVUwv0WLGMwx7GR/N6XyIONzrSJJaXD6dDJB4FlY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/terraform/modules/ecr/main.tf b/terraform/modules/ecr/main.tf new file mode 100644 index 0000000..e08e61a --- /dev/null +++ b/terraform/modules/ecr/main.tf @@ -0,0 +1,82 @@ + +############################# +# Providers +############################# + +provider "aws" { + region = var.region + + default_tags { + tags = { + Environment = var.stage + Project = "web-crawler-on-eks" + } + } +} + +resource "aws_ecr_repository" "optar" { + name = "optar" + image_tag_mutability = "MUTABLE" + + image_scanning_configuration { + scan_on_push = true + } +} + +data "aws_iam_policy_document" "optar" { + statement { + sid = "allow eks" + effect = "Allow" + + principals { + type = "AWS" + identifiers = [var.account_id] + } + + actions = [ + "ecr:GetDownloadUrlForLayer", + "ecr:BatchGetImage", + "ecr:BatchCheckLayerAvailability", + "ecr:PutImage", + "ecr:InitiateLayerUpload", + "ecr:UploadLayerPart", + "ecr:CompleteLayerUpload", + "ecr:DescribeRepositories", + "ecr:GetRepositoryPolicy", + "ecr:ListImages", + "ecr:DeleteRepository", + "ecr:BatchDeleteImage", + "ecr:SetRepositoryPolicy", + "ecr:DeleteRepositoryPolicy", + ] + } +} + +resource "aws_ecr_repository_policy" "optar" { + repository = aws_ecr_repository.optar.name + policy = data.aws_iam_policy_document.optar.json +} + +resource "aws_ecr_lifecycle_policy" "optar_lifecycle" { + repository = aws_ecr_repository.optar.name + + policy = < \ No newline at end of file diff --git a/terraform/modules/ecr/terraform.tf b/terraform/modules/ecr/terraform.tf new file mode 100644 index 0000000..b3fbd70 --- /dev/null +++ b/terraform/modules/ecr/terraform.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.47.0" + } + + random = { + source = "hashicorp/random" + version = "~> 3.6.1" + } + + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + + cloudinit = { + source = "hashicorp/cloudinit" + version = "~> 2.3.4" + } + } + + required_version = "~> 1.3" +} + diff --git a/terraform/modules/ecr/variables.tf b/terraform/modules/ecr/variables.tf new file mode 100644 index 0000000..444d1e7 --- /dev/null +++ b/terraform/modules/ecr/variables.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +variable "region" { + description = "AWS region" + type = string + default = "eu-central-1" +} + +variable "project_name" { + description = "Name of this project" + type = string + default = "" +} + +variable "stage" { + description = "deployment stage: [dev, int, prod, ...]" + type = string + default = "" +} + +variable "account_id" { + description = "account id" + type = string + default = "" +} \ No newline at end of file diff --git a/terraform/modules/eks/.terraform.lock.hcl b/terraform/modules/eks/.terraform.lock.hcl new file mode 100644 index 0000000..94ac683 --- /dev/null +++ b/terraform/modules/eks/.terraform.lock.hcl @@ -0,0 +1,144 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.47.0" + constraints = ">= 4.0.0, >= 4.33.0, >= 5.30.0, >= 5.40.0, ~> 5.47.0" + hashes = [ + "h1:bCETSNoRRe780zsdTWW86HvDl2ZU/YSAcI1Aazk5sI8=", + "zh:06037a14e47e8f82d0b3b326cd188566272b808b7970a9249a11db26d475b83d", + "zh:116b7dd58ca964a1056249d2b6550f399b0a6bc9a7920b7ee134242114432c9f", + "zh:1aa089c81459071c1d65ba7454f1122159e1fa1b5384e6e9ef85c8264f8a9ecb", + "zh:2c1471acba40c4944aa88dda761093c0c969db6408bdc1a4fb62417788cd6bb6", + "zh:3b950bea06ea4bf1ec359a97a4f1745b7efca7fc2da368843666020dd0ebc5d4", + "zh:7191c5c2fce834d584153dcd5269ed3042437f224d341ad85df06b2247bd09b2", + "zh:76d841b3f247f9bb3899dec3b4d871613a4ae8a83a581a827655d34b1bbee0ee", + "zh:7c656ce252fafc2c915dad43a0a7da17dba975207d75841a02f3f2b92d51ec25", + "zh:8ec97118cbdef64139c52b719e4e22443e67a1f37ea1597cd45b2e9b97332a35", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a369deca7938236a7da59f7ad1fe18137f736764c9015ed10e88edb6e8505980", + "zh:a743882fb099401eae0c86d9388a6faadbbc27b2ac9477aeef643e5de4eec3f9", + "zh:d5f960f58aff06fc58e244fea6e665800384cacb8cd64a556f8e145b98650372", + "zh:e31ffcfd560132ffbff2f574928ba392e663202a750750ed39a8950031b75623", + "zh:ebd9061b92a772144564f35a63d5a08cb45e14a9d39294fda185f2e0de9c8e28", + ] +} + +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.3.4" + constraints = ">= 2.0.0, ~> 2.3.4" + hashes = [ + "h1:iDq03pOzp/UsXya2h+32VOOrvGdJgI9L2/EZJoN9t4A=", + "zh:09f1f1e1d232da96fbf9513b0fb5263bc2fe9bee85697aa15d40bb93835efbeb", + "zh:381e74b90d7a038c3a8dcdcc2ce8c72d6b86da9f208a27f4b98cabe1a1032773", + "zh:398eb321949e28c4c5f7c52e9b1f922a10d0b2b073b7db04cb69318d24ffc5a9", + "zh:4a425679614a8f0fe440845828794e609b35af17db59134c4f9e56d61e979813", + "zh:4d955d8608ece4984c9f1dacda2a59fdb4ea6b0243872f049b388181aab8c80a", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:a48fbee1d58d55a1f4c92c2f38c83a37c8b2f2701ed1a3c926cefb0801fa446a", + "zh:b748fe6631b16a1dafd35a09377c3bffa89552af584cf95f47568b6cd31fc241", + "zh:d4b931f7a54603fa4692a2ec6e498b95464babd2be072bed5c7c2e140a280d99", + "zh:f1c9337fcfe3a7be39d179eb7986c22a979cfb2c587c05f1b3b83064f41785c5", + "zh:f58fc57edd1ee3250a28943cd84de3e4b744cdb52df0356a53403fc240240636", + "zh:f5f50de0923ff530b03e1bca0ac697534d61bb3e5fc7f60e13becb62229097a9", + ] +} + +provider "registry.terraform.io/hashicorp/kubernetes" { + version = "2.31.0" + hashes = [ + "h1:o1lFYziqjK6h7ayIgDV+qGKbc7O4xWtLE2t3LwHsv84=", + "zh:0d16b861edb2c021b3e9d759b8911ce4cf6d531320e5dc9457e2ea64d8c54ecd", + "zh:1bad69ed535a5f32dec70561eb481c432273b81045d788eb8b37f2e4a322cc40", + "zh:43c58e3912fcd5bb346b5cb89f31061508a9be3ca7dd4cd8169c066203bcdfb3", + "zh:4778123da9206918a92dfa73cc711475d2b9a8275ff25c13a30513c523ac9660", + "zh:8bfa67d2db03b3bfae62beebe6fb961aee8d91b7a766efdfe4d337b33dfd23dd", + "zh:9020bb5729db59a520ade5e24984b737e65f8b81751fbbd343926f6d44d22176", + "zh:90431dbfc5b92498bfbce38f0b989978c84421a6c33245b97788a46b563fbd6e", + "zh:b71a061dda1244f6a52500e703a9524b851e7b11bbf238c17bbd282f27d51cb2", + "zh:d6232a7651b834b89591b94bf4446050119dcde740247e6083a4d55a2cefd28a", + "zh:d89fba43e699e28e2b5e92fff2f75fc03dbc8de0df9dacefe1a8836f8f430753", + "zh:ef85c0b744f5ba1b10dadc3c11e331ba4225c45bb733e024d7218c24b02b0512", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/null" { + version = "3.2.2" + constraints = ">= 3.0.0" + hashes = [ + "h1:JViWrgF7Ks2GqB6UfcLDUbusXeSfhfhFymo4c0N5e+I=", + "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", + "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", + "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", + "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", + "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", + "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", + "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", + "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", + "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", + "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.6.2" + constraints = "~> 3.6.1" + hashes = [ + "h1:Gd3WitYIzSYo/Suo+PMxpZpIGpRPrwl0JU0+DhxycFM=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.11.2" + constraints = ">= 0.9.0" + hashes = [ + "h1:t/CKZz4ElkBqy8Pvu02rw+ma04dHsRu+oLssx4kMON0=", + "zh:02588b5b8ba5d31e86d93edc93b306bcbf47c789f576769245968cc157a9e8c5", + "zh:088a30c23796133678d1d6614da5cf5544430570408a17062288b58c0bd67ac8", + "zh:0df5faa072d67616154d38021934d8a8a316533429a3f582df3b4b48c836cf89", + "zh:12edeeaef96c47f694bd1ba7ead6ccdb96028b25df352eea4bc5e40de7a59177", + "zh:1e859504a656a6e988f07b908e6ffe946b28bfb56889417c0a07ea9605a3b7b0", + "zh:64a6ae0320d4956c4fdb05629cfcebd03bcbd2206e2d733f2f18e4a97f4d5c7c", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:924d137959193bf7aee6ebf241fbb9aec46d6eef828c5cf8d3c588770acae7b2", + "zh:b3cc76281a4faa9c2293a2460fc6962f6539e900994053f85185304887dddab8", + "zh:cbb40c791d4a1cdba56cffa43a9c0ed8e69930d49aa6bd931546b18c36e3b720", + "zh:d227d43594f8cb3d24f1fdd71382f14502cbe2a6deaddbc74242656bb5b38daf", + "zh:d4840641c46176bb9d70ba3aff09de749282136c779996b546c81e5ff701bbf6", + ] +} + +provider "registry.terraform.io/hashicorp/tls" { + version = "4.0.5" + constraints = ">= 3.0.0, ~> 4.0.5" + hashes = [ + "h1:gthwVUwv0WLGMwx7GR/N6XyIONzrSJJaXD6dDJB4FlY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/terraform/modules/eks/main.tf b/terraform/modules/eks/main.tf new file mode 100644 index 0000000..42cb9af --- /dev/null +++ b/terraform/modules/eks/main.tf @@ -0,0 +1,286 @@ +############################# +# VARs +############################# + +locals { + cluster_name = "${var.project_name}-${var.stage}-eks" + vpc_name = "${var.project_name}-${var.stage}-vpc" +} + +############################# +# Providers +############################# + +provider "aws" { + region = var.region + + default_tags { + tags = { + Environment = var.stage + Project = "web-crawler-on-eks" + } + } +} +provider "kubernetes" { + host = module.eks.cluster_endpoint + cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data) + token = data.aws_eks_cluster_auth.cluster_auth.token +} +data "aws_eks_cluster_auth" "cluster_auth" { + name = local.cluster_name +} + +############################# +# EKS +############################# + +module "eks" { + source = "terraform-aws-modules/eks/aws" + version = "20.8.5" + + cluster_name = local.cluster_name + cluster_version = "1.30" + authentication_mode = "API_AND_CONFIG_MAP" + + # for higher security requirements: use false and add a bastion host that is in a public subnet of this VPC, + # and add this bastion host to the NACL of the private subnets + cluster_endpoint_public_access = true + enable_cluster_creator_admin_permissions = true + + cluster_addons = { + aws-ebs-csi-driver = { + service_account_role_arn = module.irsa-ebs-csi.iam_role_arn + } + } + vpc_id = var.vpc_id + subnet_ids = var.subnet_ids + + eks_managed_node_group_defaults = { + ami_type = "AL2_x86_64" + + } + + eks_managed_node_groups = { + one = { + name = "node-group-1" + + instance_types = ["t3.small"] + + min_size = 1 + max_size = 3 + desired_size = 2 + } + } + +} + + +data "aws_iam_policy" "ebs_csi_policy" { + arn = "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy" +} + +module "irsa-ebs-csi" { + source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc" + version = "5.39.0" + + create_role = true + role_name = "AmazonEKSTFEBSCSIRole-${module.eks.cluster_name}" + provider_url = module.eks.oidc_provider + role_policy_arns = [data.aws_iam_policy.ebs_csi_policy.arn] + oidc_fully_qualified_subjects = ["system:serviceaccount:kube-system:ebs-csi-controller-sa"] +} + +resource "kubernetes_config_map" "aws_auth_configmap_custom" { + + metadata { + name = "aws-auth-custom" + namespace = "kube-system" + } + + data = { + mapRoles = < \ No newline at end of file diff --git a/terraform/modules/eks/terraform.tf b/terraform/modules/eks/terraform.tf new file mode 100644 index 0000000..b3fbd70 --- /dev/null +++ b/terraform/modules/eks/terraform.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.47.0" + } + + random = { + source = "hashicorp/random" + version = "~> 3.6.1" + } + + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + + cloudinit = { + source = "hashicorp/cloudinit" + version = "~> 2.3.4" + } + } + + required_version = "~> 1.3" +} + diff --git a/terraform/modules/eks/variables.tf b/terraform/modules/eks/variables.tf new file mode 100644 index 0000000..677017d --- /dev/null +++ b/terraform/modules/eks/variables.tf @@ -0,0 +1,44 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +variable "region" { + description = "AWS region" + type = string + default = "eu-central-1" +} + +variable "project_name" { + description = "Name of this project" + type = string + default = "" +} + +variable "stage" { + description = "deployment stage: [dev, int, prod, ...]" + type = string + default = "" +} + +variable "account_id" { + description = "account id" + type = string + default = "" +} + +variable "app_cache_arn" { + description = "arn of the bucket to be used as a cache for optar" + type = string + default = "" +} + +variable "vpc_id" { + description = "id of the vpc to be used by eks" + type = string + default = "" +} + +variable "subnet_ids" { + description = "list of subnet ids to be used by eks" + type = list(string) + default = [] +} \ No newline at end of file diff --git a/terraform/modules/network/.terraform.lock.hcl b/terraform/modules/network/.terraform.lock.hcl new file mode 100644 index 0000000..94ac683 --- /dev/null +++ b/terraform/modules/network/.terraform.lock.hcl @@ -0,0 +1,144 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.47.0" + constraints = ">= 4.0.0, >= 4.33.0, >= 5.30.0, >= 5.40.0, ~> 5.47.0" + hashes = [ + "h1:bCETSNoRRe780zsdTWW86HvDl2ZU/YSAcI1Aazk5sI8=", + "zh:06037a14e47e8f82d0b3b326cd188566272b808b7970a9249a11db26d475b83d", + "zh:116b7dd58ca964a1056249d2b6550f399b0a6bc9a7920b7ee134242114432c9f", + "zh:1aa089c81459071c1d65ba7454f1122159e1fa1b5384e6e9ef85c8264f8a9ecb", + "zh:2c1471acba40c4944aa88dda761093c0c969db6408bdc1a4fb62417788cd6bb6", + "zh:3b950bea06ea4bf1ec359a97a4f1745b7efca7fc2da368843666020dd0ebc5d4", + "zh:7191c5c2fce834d584153dcd5269ed3042437f224d341ad85df06b2247bd09b2", + "zh:76d841b3f247f9bb3899dec3b4d871613a4ae8a83a581a827655d34b1bbee0ee", + "zh:7c656ce252fafc2c915dad43a0a7da17dba975207d75841a02f3f2b92d51ec25", + "zh:8ec97118cbdef64139c52b719e4e22443e67a1f37ea1597cd45b2e9b97332a35", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a369deca7938236a7da59f7ad1fe18137f736764c9015ed10e88edb6e8505980", + "zh:a743882fb099401eae0c86d9388a6faadbbc27b2ac9477aeef643e5de4eec3f9", + "zh:d5f960f58aff06fc58e244fea6e665800384cacb8cd64a556f8e145b98650372", + "zh:e31ffcfd560132ffbff2f574928ba392e663202a750750ed39a8950031b75623", + "zh:ebd9061b92a772144564f35a63d5a08cb45e14a9d39294fda185f2e0de9c8e28", + ] +} + +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.3.4" + constraints = ">= 2.0.0, ~> 2.3.4" + hashes = [ + "h1:iDq03pOzp/UsXya2h+32VOOrvGdJgI9L2/EZJoN9t4A=", + "zh:09f1f1e1d232da96fbf9513b0fb5263bc2fe9bee85697aa15d40bb93835efbeb", + "zh:381e74b90d7a038c3a8dcdcc2ce8c72d6b86da9f208a27f4b98cabe1a1032773", + "zh:398eb321949e28c4c5f7c52e9b1f922a10d0b2b073b7db04cb69318d24ffc5a9", + "zh:4a425679614a8f0fe440845828794e609b35af17db59134c4f9e56d61e979813", + "zh:4d955d8608ece4984c9f1dacda2a59fdb4ea6b0243872f049b388181aab8c80a", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:a48fbee1d58d55a1f4c92c2f38c83a37c8b2f2701ed1a3c926cefb0801fa446a", + "zh:b748fe6631b16a1dafd35a09377c3bffa89552af584cf95f47568b6cd31fc241", + "zh:d4b931f7a54603fa4692a2ec6e498b95464babd2be072bed5c7c2e140a280d99", + "zh:f1c9337fcfe3a7be39d179eb7986c22a979cfb2c587c05f1b3b83064f41785c5", + "zh:f58fc57edd1ee3250a28943cd84de3e4b744cdb52df0356a53403fc240240636", + "zh:f5f50de0923ff530b03e1bca0ac697534d61bb3e5fc7f60e13becb62229097a9", + ] +} + +provider "registry.terraform.io/hashicorp/kubernetes" { + version = "2.31.0" + hashes = [ + "h1:o1lFYziqjK6h7ayIgDV+qGKbc7O4xWtLE2t3LwHsv84=", + "zh:0d16b861edb2c021b3e9d759b8911ce4cf6d531320e5dc9457e2ea64d8c54ecd", + "zh:1bad69ed535a5f32dec70561eb481c432273b81045d788eb8b37f2e4a322cc40", + "zh:43c58e3912fcd5bb346b5cb89f31061508a9be3ca7dd4cd8169c066203bcdfb3", + "zh:4778123da9206918a92dfa73cc711475d2b9a8275ff25c13a30513c523ac9660", + "zh:8bfa67d2db03b3bfae62beebe6fb961aee8d91b7a766efdfe4d337b33dfd23dd", + "zh:9020bb5729db59a520ade5e24984b737e65f8b81751fbbd343926f6d44d22176", + "zh:90431dbfc5b92498bfbce38f0b989978c84421a6c33245b97788a46b563fbd6e", + "zh:b71a061dda1244f6a52500e703a9524b851e7b11bbf238c17bbd282f27d51cb2", + "zh:d6232a7651b834b89591b94bf4446050119dcde740247e6083a4d55a2cefd28a", + "zh:d89fba43e699e28e2b5e92fff2f75fc03dbc8de0df9dacefe1a8836f8f430753", + "zh:ef85c0b744f5ba1b10dadc3c11e331ba4225c45bb733e024d7218c24b02b0512", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/null" { + version = "3.2.2" + constraints = ">= 3.0.0" + hashes = [ + "h1:JViWrgF7Ks2GqB6UfcLDUbusXeSfhfhFymo4c0N5e+I=", + "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", + "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", + "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", + "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", + "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", + "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", + "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", + "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", + "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", + "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.6.2" + constraints = "~> 3.6.1" + hashes = [ + "h1:Gd3WitYIzSYo/Suo+PMxpZpIGpRPrwl0JU0+DhxycFM=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.11.2" + constraints = ">= 0.9.0" + hashes = [ + "h1:t/CKZz4ElkBqy8Pvu02rw+ma04dHsRu+oLssx4kMON0=", + "zh:02588b5b8ba5d31e86d93edc93b306bcbf47c789f576769245968cc157a9e8c5", + "zh:088a30c23796133678d1d6614da5cf5544430570408a17062288b58c0bd67ac8", + "zh:0df5faa072d67616154d38021934d8a8a316533429a3f582df3b4b48c836cf89", + "zh:12edeeaef96c47f694bd1ba7ead6ccdb96028b25df352eea4bc5e40de7a59177", + "zh:1e859504a656a6e988f07b908e6ffe946b28bfb56889417c0a07ea9605a3b7b0", + "zh:64a6ae0320d4956c4fdb05629cfcebd03bcbd2206e2d733f2f18e4a97f4d5c7c", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:924d137959193bf7aee6ebf241fbb9aec46d6eef828c5cf8d3c588770acae7b2", + "zh:b3cc76281a4faa9c2293a2460fc6962f6539e900994053f85185304887dddab8", + "zh:cbb40c791d4a1cdba56cffa43a9c0ed8e69930d49aa6bd931546b18c36e3b720", + "zh:d227d43594f8cb3d24f1fdd71382f14502cbe2a6deaddbc74242656bb5b38daf", + "zh:d4840641c46176bb9d70ba3aff09de749282136c779996b546c81e5ff701bbf6", + ] +} + +provider "registry.terraform.io/hashicorp/tls" { + version = "4.0.5" + constraints = ">= 3.0.0, ~> 4.0.5" + hashes = [ + "h1:gthwVUwv0WLGMwx7GR/N6XyIONzrSJJaXD6dDJB4FlY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/terraform/modules/network/main.tf b/terraform/modules/network/main.tf new file mode 100644 index 0000000..ac26fe0 --- /dev/null +++ b/terraform/modules/network/main.tf @@ -0,0 +1,62 @@ +############################# +# VARs +############################# + +locals { + cluster_name = "${var.project_name}-${var.stage}-eks" + vpc_name = "${var.project_name}-${var.stage}-vpc" +} + +# Filter out local zones, which are not currently supported +# with managed node groups +data "aws_availability_zones" "available" { + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + + +############################# +# Providers +############################# + +provider "aws" { + region = var.region + + default_tags { + tags = { + Environment = var.stage + Project = "web-crawler-on-eks" + } + } +} + +############################# +# VPC +############################# + +module "vpc" { + source = "terraform-aws-modules/vpc/aws" + version = "5.8.1" + + name = local.vpc_name + + cidr = "10.0.0.0/16" + azs = slice(data.aws_availability_zones.available.names, 0, 3) + + private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"] + public_subnets = ["10.0.4.0/24", "10.0.5.0/24", "10.0.6.0/24"] + + enable_nat_gateway = true + single_nat_gateway = true + enable_dns_hostnames = true + + public_subnet_tags = { + "kubernetes.io/role/elb" = 1 + } + + private_subnet_tags = { + "kubernetes.io/role/internal-elb" = 1 + } +} diff --git a/terraform/modules/network/outputs.tf b/terraform/modules/network/outputs.tf new file mode 100644 index 0000000..9d2c98b --- /dev/null +++ b/terraform/modules/network/outputs.tf @@ -0,0 +1,11 @@ + + +output "vpc_id" { + description = "ID of the created vpcto be used in eks module" + value = module.vpc.vpc_id +} + +output "vpc_subnet_ids" { + description = "IDs of the subnets to be used by kuernetes" + value = module.vpc.private_subnets +} \ No newline at end of file diff --git a/terraform/modules/network/readme.md b/terraform/modules/network/readme.md new file mode 100644 index 0000000..b252580 --- /dev/null +++ b/terraform/modules/network/readme.md @@ -0,0 +1,5 @@ +# EKS + +based on this: + + \ No newline at end of file diff --git a/terraform/modules/network/terraform.tf b/terraform/modules/network/terraform.tf new file mode 100644 index 0000000..b3fbd70 --- /dev/null +++ b/terraform/modules/network/terraform.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.47.0" + } + + random = { + source = "hashicorp/random" + version = "~> 3.6.1" + } + + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + + cloudinit = { + source = "hashicorp/cloudinit" + version = "~> 2.3.4" + } + } + + required_version = "~> 1.3" +} + diff --git a/terraform/modules/network/variables.tf b/terraform/modules/network/variables.tf new file mode 100644 index 0000000..444d1e7 --- /dev/null +++ b/terraform/modules/network/variables.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +variable "region" { + description = "AWS region" + type = string + default = "eu-central-1" +} + +variable "project_name" { + description = "Name of this project" + type = string + default = "" +} + +variable "stage" { + description = "deployment stage: [dev, int, prod, ...]" + type = string + default = "" +} + +variable "account_id" { + description = "account id" + type = string + default = "" +} \ No newline at end of file diff --git a/terraform/modules/s3/.terraform.lock.hcl b/terraform/modules/s3/.terraform.lock.hcl new file mode 100644 index 0000000..94ac683 --- /dev/null +++ b/terraform/modules/s3/.terraform.lock.hcl @@ -0,0 +1,144 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.47.0" + constraints = ">= 4.0.0, >= 4.33.0, >= 5.30.0, >= 5.40.0, ~> 5.47.0" + hashes = [ + "h1:bCETSNoRRe780zsdTWW86HvDl2ZU/YSAcI1Aazk5sI8=", + "zh:06037a14e47e8f82d0b3b326cd188566272b808b7970a9249a11db26d475b83d", + "zh:116b7dd58ca964a1056249d2b6550f399b0a6bc9a7920b7ee134242114432c9f", + "zh:1aa089c81459071c1d65ba7454f1122159e1fa1b5384e6e9ef85c8264f8a9ecb", + "zh:2c1471acba40c4944aa88dda761093c0c969db6408bdc1a4fb62417788cd6bb6", + "zh:3b950bea06ea4bf1ec359a97a4f1745b7efca7fc2da368843666020dd0ebc5d4", + "zh:7191c5c2fce834d584153dcd5269ed3042437f224d341ad85df06b2247bd09b2", + "zh:76d841b3f247f9bb3899dec3b4d871613a4ae8a83a581a827655d34b1bbee0ee", + "zh:7c656ce252fafc2c915dad43a0a7da17dba975207d75841a02f3f2b92d51ec25", + "zh:8ec97118cbdef64139c52b719e4e22443e67a1f37ea1597cd45b2e9b97332a35", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a369deca7938236a7da59f7ad1fe18137f736764c9015ed10e88edb6e8505980", + "zh:a743882fb099401eae0c86d9388a6faadbbc27b2ac9477aeef643e5de4eec3f9", + "zh:d5f960f58aff06fc58e244fea6e665800384cacb8cd64a556f8e145b98650372", + "zh:e31ffcfd560132ffbff2f574928ba392e663202a750750ed39a8950031b75623", + "zh:ebd9061b92a772144564f35a63d5a08cb45e14a9d39294fda185f2e0de9c8e28", + ] +} + +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.3.4" + constraints = ">= 2.0.0, ~> 2.3.4" + hashes = [ + "h1:iDq03pOzp/UsXya2h+32VOOrvGdJgI9L2/EZJoN9t4A=", + "zh:09f1f1e1d232da96fbf9513b0fb5263bc2fe9bee85697aa15d40bb93835efbeb", + "zh:381e74b90d7a038c3a8dcdcc2ce8c72d6b86da9f208a27f4b98cabe1a1032773", + "zh:398eb321949e28c4c5f7c52e9b1f922a10d0b2b073b7db04cb69318d24ffc5a9", + "zh:4a425679614a8f0fe440845828794e609b35af17db59134c4f9e56d61e979813", + "zh:4d955d8608ece4984c9f1dacda2a59fdb4ea6b0243872f049b388181aab8c80a", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:a48fbee1d58d55a1f4c92c2f38c83a37c8b2f2701ed1a3c926cefb0801fa446a", + "zh:b748fe6631b16a1dafd35a09377c3bffa89552af584cf95f47568b6cd31fc241", + "zh:d4b931f7a54603fa4692a2ec6e498b95464babd2be072bed5c7c2e140a280d99", + "zh:f1c9337fcfe3a7be39d179eb7986c22a979cfb2c587c05f1b3b83064f41785c5", + "zh:f58fc57edd1ee3250a28943cd84de3e4b744cdb52df0356a53403fc240240636", + "zh:f5f50de0923ff530b03e1bca0ac697534d61bb3e5fc7f60e13becb62229097a9", + ] +} + +provider "registry.terraform.io/hashicorp/kubernetes" { + version = "2.31.0" + hashes = [ + "h1:o1lFYziqjK6h7ayIgDV+qGKbc7O4xWtLE2t3LwHsv84=", + "zh:0d16b861edb2c021b3e9d759b8911ce4cf6d531320e5dc9457e2ea64d8c54ecd", + "zh:1bad69ed535a5f32dec70561eb481c432273b81045d788eb8b37f2e4a322cc40", + "zh:43c58e3912fcd5bb346b5cb89f31061508a9be3ca7dd4cd8169c066203bcdfb3", + "zh:4778123da9206918a92dfa73cc711475d2b9a8275ff25c13a30513c523ac9660", + "zh:8bfa67d2db03b3bfae62beebe6fb961aee8d91b7a766efdfe4d337b33dfd23dd", + "zh:9020bb5729db59a520ade5e24984b737e65f8b81751fbbd343926f6d44d22176", + "zh:90431dbfc5b92498bfbce38f0b989978c84421a6c33245b97788a46b563fbd6e", + "zh:b71a061dda1244f6a52500e703a9524b851e7b11bbf238c17bbd282f27d51cb2", + "zh:d6232a7651b834b89591b94bf4446050119dcde740247e6083a4d55a2cefd28a", + "zh:d89fba43e699e28e2b5e92fff2f75fc03dbc8de0df9dacefe1a8836f8f430753", + "zh:ef85c0b744f5ba1b10dadc3c11e331ba4225c45bb733e024d7218c24b02b0512", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/null" { + version = "3.2.2" + constraints = ">= 3.0.0" + hashes = [ + "h1:JViWrgF7Ks2GqB6UfcLDUbusXeSfhfhFymo4c0N5e+I=", + "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", + "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", + "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", + "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", + "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", + "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", + "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", + "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", + "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", + "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", + ] +} + +provider "registry.terraform.io/hashicorp/random" { + version = "3.6.2" + constraints = "~> 3.6.1" + hashes = [ + "h1:Gd3WitYIzSYo/Suo+PMxpZpIGpRPrwl0JU0+DhxycFM=", + "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", + "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", + "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", + "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", + "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", + "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", + "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", + "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", + "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", + "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + ] +} + +provider "registry.terraform.io/hashicorp/time" { + version = "0.11.2" + constraints = ">= 0.9.0" + hashes = [ + "h1:t/CKZz4ElkBqy8Pvu02rw+ma04dHsRu+oLssx4kMON0=", + "zh:02588b5b8ba5d31e86d93edc93b306bcbf47c789f576769245968cc157a9e8c5", + "zh:088a30c23796133678d1d6614da5cf5544430570408a17062288b58c0bd67ac8", + "zh:0df5faa072d67616154d38021934d8a8a316533429a3f582df3b4b48c836cf89", + "zh:12edeeaef96c47f694bd1ba7ead6ccdb96028b25df352eea4bc5e40de7a59177", + "zh:1e859504a656a6e988f07b908e6ffe946b28bfb56889417c0a07ea9605a3b7b0", + "zh:64a6ae0320d4956c4fdb05629cfcebd03bcbd2206e2d733f2f18e4a97f4d5c7c", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:924d137959193bf7aee6ebf241fbb9aec46d6eef828c5cf8d3c588770acae7b2", + "zh:b3cc76281a4faa9c2293a2460fc6962f6539e900994053f85185304887dddab8", + "zh:cbb40c791d4a1cdba56cffa43a9c0ed8e69930d49aa6bd931546b18c36e3b720", + "zh:d227d43594f8cb3d24f1fdd71382f14502cbe2a6deaddbc74242656bb5b38daf", + "zh:d4840641c46176bb9d70ba3aff09de749282136c779996b546c81e5ff701bbf6", + ] +} + +provider "registry.terraform.io/hashicorp/tls" { + version = "4.0.5" + constraints = ">= 3.0.0, ~> 4.0.5" + hashes = [ + "h1:gthwVUwv0WLGMwx7GR/N6XyIONzrSJJaXD6dDJB4FlY=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} diff --git a/terraform/modules/s3/main.tf b/terraform/modules/s3/main.tf new file mode 100644 index 0000000..0cdd56f --- /dev/null +++ b/terraform/modules/s3/main.tf @@ -0,0 +1,46 @@ +############################# +# VARs +############################# + +locals { + cluster_name = "${var.project_name}-${var.stage}-eks" + vpc_name = "${var.project_name}-${var.stage}-vpc" +} + +############################# +# Providers +############################# + +provider "aws" { + region = var.region + + default_tags { + tags = { + Environment = var.stage + Project = "web-crawler-on-eks" + } + } +} + + +resource "aws_s3_bucket_lifecycle_configuration" "delete_after_3_days" { + bucket = aws_s3_bucket.app_cache.id + + # this rule assumes the crawler runs at least once a day, + # allowing for one missed day or time zone related issues, + # the expiration is set to 3 days + rule { + id = "delete-after-3-days" + status = "Enabled" + expiration { + days = 3 + } + } +} +resource "aws_s3_bucket" "app_cache" { + bucket = "${var.project_name}-${var.stage}-cache" + + # I would not enable this in a client setting, + # this is purely for convinience for this specific hiring task + force_destroy = true +} \ No newline at end of file diff --git a/terraform/modules/s3/outputs.tf b/terraform/modules/s3/outputs.tf new file mode 100644 index 0000000..c569cf3 --- /dev/null +++ b/terraform/modules/s3/outputs.tf @@ -0,0 +1,4 @@ +output "app_cache_arn" { + description = "ARN of the bucket used as a cache" + value = aws_s3_bucket.app_cache.arn +} \ No newline at end of file diff --git a/terraform/modules/s3/readme.md b/terraform/modules/s3/readme.md new file mode 100644 index 0000000..b252580 --- /dev/null +++ b/terraform/modules/s3/readme.md @@ -0,0 +1,5 @@ +# EKS + +based on this: + + \ No newline at end of file diff --git a/terraform/modules/s3/terraform.tf b/terraform/modules/s3/terraform.tf new file mode 100644 index 0000000..b3fbd70 --- /dev/null +++ b/terraform/modules/s3/terraform.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.47.0" + } + + random = { + source = "hashicorp/random" + version = "~> 3.6.1" + } + + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + + cloudinit = { + source = "hashicorp/cloudinit" + version = "~> 2.3.4" + } + } + + required_version = "~> 1.3" +} + diff --git a/terraform/modules/s3/variables.tf b/terraform/modules/s3/variables.tf new file mode 100644 index 0000000..444d1e7 --- /dev/null +++ b/terraform/modules/s3/variables.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +variable "region" { + description = "AWS region" + type = string + default = "eu-central-1" +} + +variable "project_name" { + description = "Name of this project" + type = string + default = "" +} + +variable "stage" { + description = "deployment stage: [dev, int, prod, ...]" + type = string + default = "" +} + +variable "account_id" { + description = "account id" + type = string + default = "" +} \ No newline at end of file diff --git a/terraform/outputs.tf b/terraform/outputs.tf new file mode 100644 index 0000000..e69de29 diff --git a/terraform/provider.tf b/terraform/provider.tf new file mode 100644 index 0000000..e69de29 diff --git a/terraform/variables.tf b/terraform/variables.tf new file mode 100644 index 0000000..444d1e7 --- /dev/null +++ b/terraform/variables.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +variable "region" { + description = "AWS region" + type = string + default = "eu-central-1" +} + +variable "project_name" { + description = "Name of this project" + type = string + default = "" +} + +variable "stage" { + description = "deployment stage: [dev, int, prod, ...]" + type = string + default = "" +} + +variable "account_id" { + description = "account id" + type = string + default = "" +} \ No newline at end of file diff --git a/terraform/versions.tf b/terraform/versions.tf new file mode 100644 index 0000000..b3fbd70 --- /dev/null +++ b/terraform/versions.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.47.0" + } + + random = { + source = "hashicorp/random" + version = "~> 3.6.1" + } + + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + + cloudinit = { + source = "hashicorp/cloudinit" + version = "~> 2.3.4" + } + } + + required_version = "~> 1.3" +} +