From e5750a13f7e836475373b1898a4e120771cd4b53 Mon Sep 17 00:00:00 2001 From: Bruvv Date: Wed, 1 May 2024 12:17:19 +0200 Subject: [PATCH] update --- .github/renovate.json | 9 ------- .github/workflows/ci.yml | 44 ----------------------------------- .gitignore | 3 ++- molecule/default/converge.yml | 32 ------------------------- molecule/default/molecule.yml | 13 ----------- vars/firewall.yml | 1 - 6 files changed, 2 insertions(+), 100 deletions(-) delete mode 100644 .github/renovate.json delete mode 100644 .github/workflows/ci.yml delete mode 100644 molecule/default/converge.yml delete mode 100644 molecule/default/molecule.yml diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index f8362b5..0000000 --- a/.github/renovate.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "automerge": true, - "extends": ["config:base"], - "assigneesFromCodeOwners": true, - "ignoreDeps": [], - "timezone": "Europe/Amsterdam", - "includeForks": true - } \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 647bfb2..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: CI -"on": - pull_request: - push: - branches: - - main - -# defaults: -# run: -# working-directory: "adguard" - -jobs: - molecule: - name: Molecule - runs-on: ubuntu-latest - strategy: - matrix: - distro: - - rockylinux9 - - rockylinux8 - - ubuntu2204 - - debian11 - steps: - - name: Check out the codebase. - uses: actions/checkout@v3 - # with: - # path: "adguard" - - - name: Set up Python 3. - uses: actions/setup-python@v4 - with: - python-version: "3.x" - - - name: Install test dependencies. - run: | - python3 -m pip install --upgrade pip - pip3 install ansible docker 'molecule[docker]' ansible-lint yamllint flake8 - - - name: Install Galaxy dependencies. - run: ansible-galaxy collection install community.docker - - - name: Run molecule - run: "cd molecule/default && molecule test" diff --git a/.gitignore b/.gitignore index ef2e89c..f298d25 100644 --- a/.gitignore +++ b/.gitignore @@ -352,4 +352,5 @@ MigrationBackup/ *.retry .vagrant/ terraform.tfstate -.DS_Store \ No newline at end of file +.DS_Store +.vscode/settings.json diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml deleted file mode 100644 index a23ecaf..0000000 --- a/molecule/default/converge.yml +++ /dev/null @@ -1,32 +0,0 @@ -# --- -# - name: Converge -# hosts: all -# become: true - -# pre_tasks: -# - name: Update apt cache. -# ansible.builtin.apt: -# update_cache: true -# cache_valid_time: 600 -# upgrade: true -# when: ansible_os_family == 'Debian' - -# - name: Update apt cache. -# ansible.builtin.dnf: -# update_cache: true -# when: ansible_os_family == 'RedHat' - -# - name: Wait for systemd to complete initialization. # noqa 303 -# ansible.builtin.command: systemctl is-system-running -# register: systemctl_status -# until: > -# 'running' in systemctl_status.stdout or -# 'degraded' in systemctl_status.stdout -# retries: 30 -# delay: 5 -# when: ansible_service_mgr == 'systemd' -# changed_when: false -# failed_when: systemctl_status.rc > 1 - -# roles: -# - role: docker diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml deleted file mode 100644 index b5710a8..0000000 --- a/molecule/default/molecule.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -platforms: - - name: instance - image: docker.io/pycontribs/centos:8 - pre_build_image: true -provisioner: - name: ansible -verifier: - name: ansible diff --git a/vars/firewall.yml b/vars/firewall.yml index 776b28c..841a06c 100755 --- a/vars/firewall.yml +++ b/vars/firewall.yml @@ -29,4 +29,3 @@ firewall_enable_ipv6: false # Allow only the IP 167.89.89.18 to access port 22 (ssh). # firewall_ip6_additional_rules: [] # firewall_log_dropped_packets: true -