From a02e756446b9b23beba6dcaa60845d1fa70488cb Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 9 Dec 2018 14:03:05 +0100
Subject: renamed sshserver role to sshd

---
 roles/sshd/handlers/main.yml      |  5 +++++
 roles/sshd/tasks/main.yml         | 40 +++++++++++++++++++++++++++++++++++++++
 roles/sshserver/handlers/main.yml |  5 -----
 roles/sshserver/tasks/main.yml    | 40 ---------------------------------------
 4 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 roles/sshd/handlers/main.yml
 create mode 100644 roles/sshd/tasks/main.yml
 delete mode 100644 roles/sshserver/handlers/main.yml
 delete mode 100644 roles/sshserver/tasks/main.yml

(limited to 'roles')

diff --git a/roles/sshd/handlers/main.yml b/roles/sshd/handlers/main.yml
new file mode 100644
index 00000000..822887e3
--- /dev/null
+++ b/roles/sshd/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: restart ssh
+  service:
+    name: ssh
+    state: restarted
diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml
new file mode 100644
index 00000000..e638905b
--- /dev/null
+++ b/roles/sshd/tasks/main.yml
@@ -0,0 +1,40 @@
+---
+- name: install ssh-server
+  apt:
+    name: openssh-server
+    state: present
+
+- name: hardening ssh-server config
+  lineinfile:
+    regexp: "^#?\\s*{{ item.key }}"
+    line: "{{ item.key }} {{ item.value }}"
+    dest: /etc/ssh/sshd_config
+    mode: 0644
+  with_dict:
+    IgnoreRhosts: "yes"
+    PermitRootLogin: "without-password"
+    PubkeyAuthentication: "yes"
+    HostbasedAuthentication: "no"
+    PermitEmptyPasswords: "no"
+    UseDNS: "no"
+  loop_control:
+    label: "{{ item.key }}"
+  notify: restart ssh
+
+- name: limit allowed users
+  lineinfile:
+    dest: /etc/ssh/sshd_config
+    regexp: "^AllowUsers"
+    line: "AllowUsers {{ ' '.join([ 'root' ] | union(ssh_allowusers_group | default([])) | union(ssh_allowusers_host | default([]))) }}"
+  notify: restart ssh
+
+- name: install ssh keys for root
+  authorized_key:
+    user: root
+    key: "{{ ssh_keys_root | join('\n') }}"
+    exclusive: yes
+
+- name: delete root password
+  user:
+    name: root
+    password: "!"
diff --git a/roles/sshserver/handlers/main.yml b/roles/sshserver/handlers/main.yml
deleted file mode 100644
index 822887e3..00000000
--- a/roles/sshserver/handlers/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: restart ssh
-  service:
-    name: ssh
-    state: restarted
diff --git a/roles/sshserver/tasks/main.yml b/roles/sshserver/tasks/main.yml
deleted file mode 100644
index e638905b..00000000
--- a/roles/sshserver/tasks/main.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- name: install ssh-server
-  apt:
-    name: openssh-server
-    state: present
-
-- name: hardening ssh-server config
-  lineinfile:
-    regexp: "^#?\\s*{{ item.key }}"
-    line: "{{ item.key }} {{ item.value }}"
-    dest: /etc/ssh/sshd_config
-    mode: 0644
-  with_dict:
-    IgnoreRhosts: "yes"
-    PermitRootLogin: "without-password"
-    PubkeyAuthentication: "yes"
-    HostbasedAuthentication: "no"
-    PermitEmptyPasswords: "no"
-    UseDNS: "no"
-  loop_control:
-    label: "{{ item.key }}"
-  notify: restart ssh
-
-- name: limit allowed users
-  lineinfile:
-    dest: /etc/ssh/sshd_config
-    regexp: "^AllowUsers"
-    line: "AllowUsers {{ ' '.join([ 'root' ] | union(ssh_allowusers_group | default([])) | union(ssh_allowusers_host | default([]))) }}"
-  notify: restart ssh
-
-- name: install ssh keys for root
-  authorized_key:
-    user: root
-    key: "{{ ssh_keys_root | join('\n') }}"
-    exclusive: yes
-
-- name: delete root password
-  user:
-    name: root
-    password: "!"
-- 
cgit v1.2.3