From 67c52df2d59805a09819fa03bfb4be68bd65f40f Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 14 Dec 2015 12:25:04 +0200
Subject: [PATCH] Adjustments to OpenBSD bootstrap to run on both platforms.
---
handlers/main.yml | 2 +-
tasks/lock_root.yml | 2 +-
tasks/openbsd_bootstrap.yml | 9 ++++-----
vars/main.yml | 4 +++-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/handlers/main.yml b/handlers/main.yml
index 304fe01..b745bf9 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -16,7 +16,7 @@
- name: Restart ssh
service:
- name: ssh
+ name: '{{ ssh_daemon[ansible_os_family] }}'
state: restarted
- name: Restart Collectd
diff --git a/tasks/lock_root.yml b/tasks/lock_root.yml
index 11d939d..9ac64cc 100644
--- a/tasks/lock_root.yml
+++ b/tasks/lock_root.yml
@@ -3,7 +3,7 @@
- name: Disable root account
user:
name: root
- password: ''
+ password: '*************'
register: lock_root
changed_when: not (lock_root.stderr is defined and 'no changes' in lock_root.stderr)
diff --git a/tasks/openbsd_bootstrap.yml b/tasks/openbsd_bootstrap.yml
index 7d0ca7b..677bf12 100644
--- a/tasks/openbsd_bootstrap.yml
+++ b/tasks/openbsd_bootstrap.yml
@@ -7,11 +7,10 @@
changed_when: "'python' in openbsd_pkg_add_python.stdout"
- name: Symlink python
- file:
- path: /usr/bin/python
- src: /usr/local/bin/python2.7
- state: link
- force: yes
+ raw: ln -s /usr/local/bin/python2.7 /usr/bin/python
+ register: symlink_python
+ changed_when: not 'File exists' in symlink_python.stderr
+ failed_when: symlink_python|failed and not 'File exists' in symlink_python.stdout_lines[0]
- name: Gather facts
setup:
diff --git a/vars/main.yml b/vars/main.yml
index a89cf1a..a4b91f6 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -32,10 +32,12 @@ openbsd_collectd_version:
'5.8': 'collectd-5.5.0p1'
openbsd_pkg_mirror: http://www.mirrorservice.org/pub
-ansible_python_interpreter: '{{ "/usr/local/bin/python2.7" if openbsd_bootstrap is defined else omit }}'
update_ca_certificates:
OpenBSD: /usr/local/sbin/update-ca-certificates
Debian: /usr/sbin/update-ca-certificates
ca_store:
OpenBSD: /etc/ssl/cert.pem
Debian: /etc/ssl/certs/ca-certificates.crt
+ssh_daemon:
+ OpenBSD: sshd
+ Debian: ssh
--
GitLab