From 8c3029d838e95e708c27c93bb90b8b507885a9b2 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Thu, 20 Sep 2018 12:35:48 +0200 Subject: [PATCH] Fix SSH key and set server name --- host_vars/fetlab | 2 +- roles/common | 2 +- roles/fetlab/files/motioneye.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/host_vars/fetlab b/host_vars/fetlab index c914b8a..2539f53 100644 --- a/host_vars/fetlab +++ b/host_vars/fetlab @@ -7,6 +7,6 @@ common_iptables_v6: "iptables_fetlab_v6.j2" common_resolvconf_nameservers: ["128.130.4.3", "128.131.4.3"] common_openssh_keys_root: - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzkK6ENya4mKcoG9iuMaodMpifeCgZK56zVF1zxyZhLtUyBx//qsLCXEdBNiGJY57Yp4l0PJKk9B4hpCFKuz6H622l84SOHzXhmFQUXWe/L6x4kRfQJvhBCNMi9brfR0n6AwX59RNRsbUeUjb7RuhCrzpbW0iWYjv/H9rjeyfY5Ne9dUUeBQDcsM1O7XfZJWwA5nxEGjbDB7l4/K43DoqaqzHOEOoETmHGfugO7A5QwhRmblu90pLD4+DOPv/4LGBRNpS8FyRzYrEJm7yUyF7nDzR+0xlLCapU4pKhmIFfSv4afsuBFvLb6Rgln5wUt2KIPh/qnqSP9jZGovYOadC0yb70dec7nnfwXTmqwzdwXtBlo3UzbPwt0iJG9fhYCw83Bkt/GpOsIW2fcxZhJ8CUeBw3Ox71lkeozb49oRMeHzUpYckrFt1FGxUWuHHykCrOXcxso0MRfKjl9RPUc+O5oQDG1KAoTd9doB3jygVr68wYVc/4kTTsXUlMIBMOUiek8XygQ7sV6Et6FpzvLvdf/iL1FMXAluRgUWJvKqe4IBPyWu2KyDF+2ZDMse3WhQYlYgNRqGCwfxOJGWtkvVO0L4YGJrLXKhY4yw2H+pQOHaugfGO8IYPV/vbPi+dB9OV89Zonu2iVjjDFFXI0xE7WSXCV3RQyed26Bq9BBO9DDQ== damadmai@fet.at" + - key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzkK6ENya4mKcoG9iuMaodMpifeCgZK56zVF1zxyZhLtUyBx//qsLCXEdBNiGJY57Yp4l0PJKk9B4hpCFKuz6H622l84SOHzXhmFQUXWe/L6x4kRfQJvhBCNMi9brfR0n6AwX59RNRsbUeUjb7RuhCrzpbW0iWYjv/H9rjeyfY5Ne9dUUeBQDcsM1O7XfZJWwA5nxEGjbDB7l4/K43DoqaqzHOEOoETmHGfugO7A5QwhRmblu90pLD4+DOPv/4LGBRNpS8FyRzYrEJm7yUyF7nDzR+0xlLCapU4pKhmIFfSv4afsuBFvLb6Rgln5wUt2KIPh/qnqSP9jZGovYOadC0yb70dec7nnfwXTmqwzdwXtBlo3UzbPwt0iJG9fhYCw83Bkt/GpOsIW2fcxZhJ8CUeBw3Ox71lkeozb49oRMeHzUpYckrFt1FGxUWuHHykCrOXcxso0MRfKjl9RPUc+O5oQDG1KAoTd9doB3jygVr68wYVc/4kTTsXUlMIBMOUiek8XygQ7sV6Et6FpzvLvdf/iL1FMXAluRgUWJvKqe4IBPyWu2KyDF+2ZDMse3WhQYlYgNRqGCwfxOJGWtkvVO0L4YGJrLXKhY4yw2H+pQOHaugfGO8IYPV/vbPi+dB9OV89Zonu2iVjjDFFXI0xE7WSXCV3RQyed26Bq9BBO9DDQ== damadmai@fet.at" common_zfs: True diff --git a/roles/common b/roles/common index 32cb76a..cff8ce0 160000 --- a/roles/common +++ b/roles/common @@ -1 +1 @@ -Subproject commit 32cb76a1d5eed1ec5a983325f7193298913ff333 +Subproject commit cff8ce009877ca7710e8f8214f7aad470f3bceb7 diff --git a/roles/fetlab/files/motioneye.conf b/roles/fetlab/files/motioneye.conf index 3d04076..dbc134d 100755 --- a/roles/fetlab/files/motioneye.conf +++ b/roles/fetlab/files/motioneye.conf @@ -94,4 +94,4 @@ add_remove_cameras true http_basic_auth false # overrides the hostname (useful if motionEye runs behind a reverse proxy) -# server_name motionEye +server_name lab.fet.at