SMARCH-39: chore: cleanup

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

roles/postfix/.ansible-lint

@@ -1,6 +0,0 @@
----
-warn_list:
-  - '106'
-  - '204'
-  - '405'
-  - '601'

roles/postfix/.gitignore

@@ -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

roles/postfix/.yamllint

@@ -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/

roles/postfix/Dockerfile

@@ -1,20 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Mischa ter Smitten <mtersmitten@oefenweb.nl>
-
-# 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

roles/postfix/Vagrantfile

@@ -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

roles/postfix/tests/inventory

@@ -1 +0,0 @@
-localhost

roles/postfix/tests/test.yml

@@ -1,7 +0,0 @@
-# test file
----
-- hosts: localhost
-  connection: local
-  become: true
-  roles:
-    - ../../

roles/postfix/tests/vagrant.yml

@@ -1,7 +0,0 @@
-# test file
----
-- hosts: all
-  remote_user: vagrant
-  become: true
-  roles:
-    - ../../