Skip to content

Commit

Permalink
Fix Ansible warnings
Browse files Browse the repository at this point in the history
And add support for Ubuntu 18.04
  • Loading branch information
tersmitten committed Nov 23, 2018
1 parent 44bda5b commit 14371cc
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ python: "2.7"

env:
- ANSIBLE_VERSION=latest
- ANSIBLE_VERSION=2.7.2
- ANSIBLE_VERSION=2.7.1
- ANSIBLE_VERSION=2.7.0
- ANSIBLE_VERSION=2.6.8
- ANSIBLE_VERSION=2.6.7
- ANSIBLE_VERSION=2.6.6
- ANSIBLE_VERSION=2.6.5
Expand Down Expand Up @@ -59,7 +61,7 @@ script:
&& (echo 'Idempotence test: pass' && exit 0)
|| (echo 'Idempotence test: fail' && exit 1)
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi

notifications:
email: false
Expand Down
14 changes: 11 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

role = File.basename(File.expand_path(File.dirname(__FILE__)))


boxes = [
{
:name => "ubuntu-1204",
Expand All @@ -25,24 +26,31 @@ boxes = [
:cpu => "50",
:ram => "256"
},
{
:name => "ubuntu-1804",
:box => "bento/ubuntu-18.04",
:ip => '10.0.0.14',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-7",
:box => "bento/debian-7",
:ip => '10.0.0.14',
:ip => '10.0.0.15',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-8",
:box => "bento/debian-8",
:ip => '10.0.0.15',
:ip => '10.0.0.16',
:cpu => "50",
:ram => "256"
},
{
:name => "debian-9",
:box => "bento/debian-9",
:ip => '10.0.0.16',
:ip => '10.0.0.17',
:cpu => "50",
:ram => "256"
},
Expand Down
6 changes: 3 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ ssh_server_host_keys:
- /etc/ssh/ssh_host_rsa_key
- /etc/ssh/ssh_host_dsa_key
- /etc/ssh/ssh_host_ecdsa_key
- "{{ '/etc/ssh/ssh_host_ed25519_key' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('14.04', '>=') or ansible_distribution == 'Debian' and ansible_distribution_version | version_compare('8.0', '>=')) else '' }}"
ssh_server_server_key_bits: "{{ 1024 if (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('14.04', '>=') or ansible_distribution == 'Debian' and ansible_distribution_version | version_compare('8.0', '>=')) else 768 }}"
- "{{ '/etc/ssh/ssh_host_ed25519_key' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('14.04', '>=') or ansible_distribution == 'Debian' and ansible_distribution_version is version('8.0', '>=')) else '' }}"
ssh_server_server_key_bits: "{{ 1024 if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('14.04', '>=') or ansible_distribution == 'Debian' and ansible_distribution_version is version('8.0', '>=')) else 768 }}"
ssh_server_use_privilege_separation: true
ssh_server_key_regeneration_interval: 3600
ssh_server_syslog_facility: AUTH
ssh_server_log_level: INFO
ssh_server_login_grace_time: 120
ssh_server_permit_root_login: "{{ 'without-password' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('14.04', '>=') or ansible_distribution == 'Debian' and ansible_distribution_version | version_compare('8.0', '>=')) else 'yes' }}"
ssh_server_permit_root_login: "{{ 'without-password' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('14.04', '>=') or ansible_distribution == 'Debian' and ansible_distribution_version is version('8.0', '>=')) else 'yes' }}"
ssh_server_strict_modes: true
ssh_server_rsa_authentication: true
ssh_server_pubkey_authentication: true
Expand Down
2 changes: 2 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# meta file for ssh-server
---
galaxy_info:
role_name: ssh-server
author: Mischa ter Smitten
company: Oefenweb.nl B.V.
description: Set up an OpenSSH server in Debian-like systems
Expand All @@ -12,6 +13,7 @@ galaxy_info:
- precise
- trusty
- xenial
- bionic
- name: Debian
versions:
- wheezy
Expand Down
13 changes: 6 additions & 7 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,31 @@
---
- name: install dependencies
apt:
name: "{{ item }}"
name: "{{ ssh_server_dependencies }}"
state: "{{ apt_install_state | default('latest') }}"
update_cache: true
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
with_items: "{{ ssh_server_dependencies }}"
tags:
- configuration
- ssh-server
- ssh-server-dependencies

- name: install
apt:
name: "{{ item }}"
name: "{{ ssh_server_install }}"
state: "{{ apt_install_state | default('latest') }}"
with_items: "{{ ssh_server_install }}"
tags:
- configuration
- ssh-server
- ssh-server-install

- name: check host keys
command: ssh-keygen -A
command: >
ssh-keygen -A
args:
creates: "{{ item }}"
register: check_host_keys
changed_when: "'generating new host keys' in check_host_keys.stdout"
register: _check_host_keys
changed_when: "'generating new host keys' in _check_host_keys.stdout"
with_items: "{{ ssh_server_host_keys }}"
when: item != ''
tags:
Expand Down

0 comments on commit 14371cc

Please sign in to comment.