diff --git a/test/Vagrantfile b/test/Vagrantfile index 7c86f2c..be09b19 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -4,8 +4,8 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "debian/stretch64" # config.vm.box = "debian/jessie64" + config.vm.box = "debian/stretch64" config.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: true @@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Master config.vm.define :default do |default| default.vm.hostname = "default" - default.vm.network :private_network, ip: "192.168.33.33" + # default.vm.network :private_network, ip: "192.168.33.33" default.vm.provision :ansible, run: "always" do |ansible| ansible.limit = "default" ansible.playbook = "vagrant.yml" @@ -27,6 +27,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ansible.raw_arguments = [ "-b", "--ask-vault-pass", + "--diff", # "--syntax", # "-vvv", ] diff --git a/test/vagrant.yml b/test/vagrant.yml index b14e9c6..f563a81 100644 --- a/test/vagrant.yml +++ b/test/vagrant.yml @@ -4,35 +4,25 @@ become: yes vars_files: - - ~/evolix/private/vars/evolinux-secrets.yml + - '~/code/evolix/evolix-private/vars/evolinux-secrets.yml' vars: evolinux_apt_upgrade: False - evolinux_apt_public_sources: True - # minifirewall_trusted_ips: [192.168.4.0/16] - fail2ban_ignoreip: ["192.168.0.0/16"] - minifirewall_privilegied_ips: [] - minifirewall_protected_ports_tcp: [22] - minifirewall_protected_ports_udp: [1234] - minifirewall_public_ports_tcp: [25, 53, 443, 995, 2222] - minifirewall_public_ports_udp: [53] - minifirewall_semipublic_ports_tcp: [20, 21, 22, 80, 143] - minifirewall_semipublic_ports_udp: [] - minifirewall_private_ports_tcp: [] - minifirewall_private_ports_udp: [6547] + evolinux_root_disable_ssh: False + evolinux_ssh_allow_current_user: True + + minifirewall_privilegied_ips: ["192.168.0.0/16", "10.0.0.0/8"] + + packweb_enable_evoadmin_vhost: True + packweb_phpmyadmin_suffix: "uE34swx9" + + evolinux_postfix_include: False evolinux_hostname: "vagrant" evolinux_domain: "evolix.local" evolinux_fqdn: "vagrant.evolix.local" roles: - - etc-git - evolinux-base - - admin-users - - post_tasks: - - include_role: - name: etc-git - tasks_from: commit.yml - vars: - commit_message: "Ansible post-run my splendid playbook" + - packweb-apache + - ~/code/evolix/evolix-private/roles/generateldif