diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-09-06 17:11:26 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-09-06 17:11:26 +0200 |
| commit | 82737ffb24ade9ba04fc55a216ce0f7a194cfc43 (patch) | |
| tree | c98911bef7baffc85ef520b7ff9c11b835ab2eb0 | |
| parent | ch-equinox-ws: increase size of home to 400GB (diff) | |
ubuntu installer: cleanup sshd config tainted by stupid installer
| -rw-r--r-- | roles/apt-repo/base/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml index 12b94301..e08029ea 100644 --- a/roles/apt-repo/base/tasks/main.yml +++ b/roles/apt-repo/base/tasks/main.yml @@ -17,9 +17,7 @@ state: directory ## aptitude is needed for package upgrade roles -- name: install aptitude and https transport +- name: install aptitude apt: - name: - - aptitude - - apt-transport-https + name: aptitude state: present diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index e166a78f..763a03cb 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -215,8 +215,11 @@ autoinstall: - [ rm, -rf, /etc/cloud, /var/lib/cloud ] - [ apt-get, -y, -q, auto-remove ] - [ bash, -c, 'dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs dpkg -P' ] + - [ sed, '/^PasswordAuthentication /d', -i, '/etc/ssh/sshd_config' ] {% if ubuntu_autoinstall_virtual_machine %} - [ poweroff ] +{% else %} + - [ reboot ] {% endif %} ssh: |