diff --git a/ffmwu-servers.yml b/ffmwu-servers.yml index d47b613..157eb00 100755 --- a/ffmwu-servers.yml +++ b/ffmwu-servers.yml @@ -1,8 +1,7 @@ #!/usr/bin/ansible-playbook --- -#- hosts: ff-servers -- hosts: wasserfloh.freifunk-mwu.de +- hosts: ff-servers remote_user: admin strategy: linear diff --git a/inventory/hosts b/inventory/hosts index e35a9da..d9ffb4f 100644 --- a/inventory/hosts +++ b/inventory/hosts @@ -2,7 +2,7 @@ spinat.freifunk-mwu.de lotuswurzel.freifunk-mwu.de wasserfloh.freifunk-mwu.de -kaschu.freifunk-mwu.de +# kaschu.freifunk-mwu.de # außer Dienst ingwer.freifunk-mwu.de #mettigel.freifunk-mwu.de #parmesan.freifunk-mwu.de @@ -26,3 +26,6 @@ simple-ff-servers [simple-ff-servers] # not meshing linse.freifunk-mwu.de # ext. DNS-master #pudding.freifunk-mwu.de # + +[test-vms] +local-test-vm.ffmwu.local vm_path=~/tmp/ffmwu-loctevm diff --git a/roles/ffmwu-prereqs/tasks/main.yml b/roles/ffmwu-prereqs/tasks/main.yml index 0a1ca40..1e89436 100755 --- a/roles/ffmwu-prereqs/tasks/main.yml +++ b/roles/ffmwu-prereqs/tasks/main.yml @@ -20,4 +20,4 @@ - name: fail on wrong OS type and version # TODO: include debian fail: msg="unsupported OS type or version - {{ ansible_distribution }} {{ ansible_distribution_major_version }}" - when: not ( ansible_distribution=="Ubuntu" and ansible_distribution_major_version|int==14 ) + when: not ( ( ansible_distribution=="Ubuntu" and ansible_distribution_major_version|int==14 ) or ( ansible_distribution=="Debian" and ansible_distribution_major_version|int==8 ) ) diff --git a/roles/ffmwu-server/vars/main.yml b/roles/ffmwu-server/vars/main.yml index caedbb9..cec9383 100644 --- a/roles/ffmwu-server/vars/main.yml +++ b/roles/ffmwu-server/vars/main.yml @@ -8,4 +8,3 @@ mwu_s_admin_keys: | ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD4s/bIf+tU8/3ClsC3D6Rw7+9lr6Jmt0E1e6S+UVlKGJU9cvYNSQGSKpm7lCaIVUe+j4I4BES/Bkj+ZXvKIpUGTx7R/YnwO+95pS/oiu73QyBORnTeuBfCtz5eQJurD/9Z9OV5VtkleKVGSVwTeiBV+aKD1CrKYLiu5PGxyZsv981TZ6G2uxO3VG+M2OXd0ARV6/Lb5Aw8Xw9bHA4WqVKE6RFVb8va/E+O0hZO0q0ww57P3pfrReSozkZAv7tk/o4wTl+4sPMWhvi/X+KBvHkeiz5lo6eFSZfXzmCTvO8Xb6T8fgMf6fYWUr9+DpmYvjZ5/bBPojbhkQ09JyEirocueYxBqZM7riOeVYG7I941TIWiBpeACv+eGZMFYYNhb8zLW4/Oozk1CKs0Axb3B227+HXWkuB3lh2GKPQBS6lgRWsoCrHGzH1HGLDlt1ucAOwQgI5gJFY+SEjAe7pW+namiR33QaWqoksozwqJCK/1sRB2YUkW5wQ8+YW1hBoudly8sYXxBnwhXygduCmzGAhlTyUN2oLr8X+5UW2jo6jdON1WH8mENfPJc4OSEU1ZHOzeg0d5/48GzrIWWDE9wJzjagLYLA9vK763gM16Y0tG7ZXA5x2UfS1FGM5Yv+jcn0qagBS/bAI27Sa4ZuXXrrBpzzUrEcf/34w63X003PQi3Q== ungenannter@niki ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAEo1sehLaRTeibVbUVuwRQyw7Zi58AzfqGwwRVUKejBWVDqZrFdxP6BpK9BqeVSo46n+Z5RJtOFU+F7wTsMPdRnbwHO/ZOljWV/RoKrNU3ZMRZnI3WWGT4u6zrmkO3rdLshLk8Z5lGIKJQg/vaqUbsHHgPI5BmDxfVyXM70M3922lx41w== juventas ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTwobxZo1wyRFUDZ32jM9AvCDUMTghSDAQMdffOrOaD8AAvVuaFzR6/yNvPHUhMOIb4CQPnaXGiTYumXRXRJrA9X2AgMSRuubySrpwkqRIje9HvQ1WfDdo4OWPYj/ArAlgxUqmLAyEjolmM8TY2aRvCPCrtE39oFfx5eCfLGkh0hn6wOGN7Gz8bh8P9n10ihYLrHhQsjEplXOX28b+9UojjjZX0Sfwk82u+/8f1y3ebT6kcPQx5OKqWU2GGbLgOOptkrguSu+vmF4KyxR9ayEqY2OpNdr7G+xp+4DC1pJhnIWq+GbcsH8xQVMDZPYaUjJQOiduRB0U5CqclSc22d39 belzebub - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/aWNpOlttng5NKzYCnSAIYacPxTB9n9DeUNBmJVC6qd8OTSgAQxYAy4xezgGoNZVDHzIo7ptZgo15XUf4kNQ/p7Qcc4zR5N6ZixY38ZVMMOcxy8bZxVZ7FJBfkLQ3N7Kk1CSXYcxfa0uW9PXkODyatXjeNRNPSxmdNeNdvCMhWmxZDBTM5qwO75SgxmoY3PfCji0Q7hy8guUVVkK0LajPGfKNZ4hyCh0fvi9cSkfzsCbWhcA+eflpgpbQMNXpSVWXcMNViKkIAOjxLQgIgT8tVvM36Rphgit8fF6xt1r8z+KaGzS2M8BVn9vsN7eHulv9vtENsm9pO3eo+5io/DPDgp/ThaRj7BohRlm7a18Mg3Gbe0Tq1LWHI3uTiHSL9sstwUpjND9AeB2NAtq0qHyECIGrnjXwULa7gwcgodE0TA2lLgWaZeUKrsQ//SWgZmOzEQjDVKMiOTSxzkQ2b37XUuYyQXXDuAzE3ksBNeySLWotEBUHuryePEfouV/l7+fbeFDxidZbT9OXB1JnLWyrCLD9V2oRZmE+wKYOagvlj8FY+q+xlL84QUKof0Ati80YoBkfgveEbQPgR7jhOh/V3fqz2DdceAhRHXTwf7SWTYSHyntXKD0o/2ZOHZHKgu0NuUmpaOnf/jyltrlRTqk9IO/vGxsfVub1sBSBPP7IwQ== stonie