From a32ffa7ea27e4047606e15a00d597aa3e4f39ec7 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 25 Aug 2021 11:28:38 +0200 Subject: [PATCH] SMARCH-39: chore: cleanup --- host_vars/dev-mail-01.yml | 6 +-- roles/postfix/.ansible-lint | 6 --- roles/postfix/.gitignore | 30 -------------- roles/postfix/.yamllint | 15 ------- roles/postfix/Dockerfile | 20 ---------- roles/postfix/Vagrantfile | 70 --------------------------------- roles/postfix/tests/inventory | 1 - roles/postfix/tests/test.yml | 7 ---- roles/postfix/tests/vagrant.yml | 7 ---- 9 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 roles/postfix/.ansible-lint delete mode 100644 roles/postfix/.gitignore delete mode 100644 roles/postfix/.yamllint delete mode 100644 roles/postfix/Dockerfile delete mode 100644 roles/postfix/Vagrantfile delete mode 100644 roles/postfix/tests/inventory delete mode 100644 roles/postfix/tests/test.yml delete mode 100644 roles/postfix/tests/vagrant.yml diff --git a/host_vars/dev-mail-01.yml b/host_vars/dev-mail-01.yml index 1aeb652..a5436ca 100644 --- a/host_vars/dev-mail-01.yml +++ b/host_vars/dev-mail-01.yml @@ -6,9 +6,9 @@ postfix_mynetworks: - '127.0.0.0/8' # default - '[::ffff:127.0.0.0]/104' # default - '[::1]/128' # default - - '10.0.0.0/24' # private cloud subnet -postfix_hostname: 'dev-mail-01.smardigo.digital' -postfix_mailname: 'dev-mail-01.smardigo.digital' + - '{{ shared_service_network }}' # private cloud subnet +postfix_hostname: '{{ inventory_hostname }}.{{ domain }}' +postfix_mailname: '{{ inventory_hostname }}.{{ domain }}' postfix_smtpd_banner: '$myhostname ESMTP $mail_name' postfix_smtpd_recipient_restrictions: - permit_mynetworks diff --git a/roles/postfix/.ansible-lint b/roles/postfix/.ansible-lint deleted file mode 100644 index 6b21768..0000000 --- a/roles/postfix/.ansible-lint +++ /dev/null @@ -1,6 +0,0 @@ ---- -warn_list: - - '106' - - '204' - - '405' - - '601' diff --git a/roles/postfix/.gitignore b/roles/postfix/.gitignore deleted file mode 100644 index f74c83a..0000000 --- a/roles/postfix/.gitignore +++ /dev/null @@ -1,30 +0,0 @@ -# OS generated files # -###################### -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -Icon? -ehthumbs.db -Thumbs.db - -# IDE files # -################# -/.settings -/.buildpath -/.project -/nbproject -*.komodoproject -*.kpf -/.idea - -# Vagrant files # -.virtualbox/ -.vagrant/ -vagrant_ansible_inventory_* -ansible.cfg - -# Other files # -############### -!empty diff --git a/roles/postfix/.yamllint b/roles/postfix/.yamllint deleted file mode 100644 index 894450c..0000000 --- a/roles/postfix/.yamllint +++ /dev/null @@ -1,15 +0,0 @@ ---- -extends: default - -rules: - braces: - max-spaces-inside: 1 - level: error - brackets: - max-spaces-inside: 1 - level: error - line-length: disable - truthy: disable - -ignore: | - .tox/ diff --git a/roles/postfix/Dockerfile b/roles/postfix/Dockerfile deleted file mode 100644 index b179278..0000000 --- a/roles/postfix/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Mischa ter Smitten - -# python -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \ - apt-get clean -RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python - -RUN rm -rf $HOME/.cache - -# ansible -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \ - apt-get clean -RUN pip install ansible==2.9.15 -RUN rm -rf $HOME/.cache - -# provision -COPY . /etc/ansible/roles/ansible-role -WORKDIR /etc/ansible/roles/ansible-role -RUN ansible-playbook -i tests/inventory tests/test.yml --connection=local diff --git a/roles/postfix/Vagrantfile b/roles/postfix/Vagrantfile deleted file mode 100644 index a0182a0..0000000 --- a/roles/postfix/Vagrantfile +++ /dev/null @@ -1,70 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby ts=2 sw=2 tw=0 et : - -role = File.basename(File.expand_path(File.dirname(__FILE__))) - -boxes = [ - { - :name => "ubuntu-1604", - :box => "bento/ubuntu-16.04", - :ip => '10.0.0.12', - :cpu => "50", - :ram => "256" - }, - { - :name => "ubuntu-1804", - :box => "bento/ubuntu-18.04", - :ip => '10.0.0.13', - :cpu => "50", - :ram => "384" - }, - { - :name => "ubuntu-2004", - :box => "bento/ubuntu-20.04", - :ip => '10.0.0.14', - :cpu => "50", - :ram => "384" - }, - { - :name => "debian-8", - :box => "bento/debian-8", - :ip => '10.0.0.16', - :cpu => "50", - :ram => "256" - }, - { - :name => "debian-9", - :box => "bento/debian-9", - :ip => '10.0.0.17', - :cpu => "50", - :ram => "256" - }, - { - :name => "debian-10", - :box => "bento/debian-10", - :ip => '10.0.0.18', - :cpu => "50", - :ram => "256" - }, -] - -Vagrant.configure("2") do |config| - boxes.each do |box| - config.vm.define box[:name] do |vms| - vms.vm.box = box[:box] - vms.vm.hostname = "ansible-#{role}-#{box[:name]}" - - vms.vm.provider "virtualbox" do |v| - v.customize ["modifyvm", :id, "--cpuexecutioncap", box[:cpu]] - v.customize ["modifyvm", :id, "--memory", box[:ram]] - end - - vms.vm.network :private_network, ip: box[:ip] - - vms.vm.provision :ansible do |ansible| - ansible.playbook = "tests/vagrant.yml" - ansible.verbose = "vv" - end - end - end -end diff --git a/roles/postfix/tests/inventory b/roles/postfix/tests/inventory deleted file mode 100644 index 2fbb50c..0000000 --- a/roles/postfix/tests/inventory +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/roles/postfix/tests/test.yml b/roles/postfix/tests/test.yml deleted file mode 100644 index be2b897..0000000 --- a/roles/postfix/tests/test.yml +++ /dev/null @@ -1,7 +0,0 @@ -# test file ---- -- hosts: localhost - connection: local - become: true - roles: - - ../../ diff --git a/roles/postfix/tests/vagrant.yml b/roles/postfix/tests/vagrant.yml deleted file mode 100644 index afdaebc..0000000 --- a/roles/postfix/tests/vagrant.yml +++ /dev/null @@ -1,7 +0,0 @@ -# test file ---- -- hosts: all - remote_user: vagrant - become: true - roles: - - ../../