diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 280627f..1ae21ab 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,4 +1,7 @@ --- +- name: Import OS-specific variables + include_vars: "vars/{{ ansible_distribution }}.yml" + tags: always - name: Configure network time import_tasks: ntp.yml diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml new file mode 100644 index 0000000..a6921c1 --- /dev/null +++ b/vars/Ubuntu.yml @@ -0,0 +1,10 @@ +--- + +# sshd service name is `ssh` on Debian/Ubuntu, but it's +# `sshd` on CentOS +sshd_service_name: ssh + +# provisioning user vars +provisioning_user: { name: 'provisioning', home: '/home/provisioning' } + +# vim: set ts=2 sw=2: diff --git a/web.yml b/web.yml index f7c5455..45d7c58 100644 --- a/web.yml +++ b/web.yml @@ -13,6 +13,5 @@ - munin vars_files: - vars/ipsets.yml - - vars/Debian.yml # vim: set sw=2 ts=2: