From 20494fa997559a95424f6941ea87d17a9fe04bb4 Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Mon, 29 Jan 2018 20:31:46 -0600 Subject: Renamed base role to rpi-base. --- roles/base/defaults/main.yaml | 6 ------ roles/base/tasks/main.yml | 21 --------------------- roles/base/templates/wpa_supplicant.conf.j2 | 12 ------------ roles/rpi-base/defaults/main.yaml | 7 +++++++ roles/rpi-base/tasks/main.yml | 21 +++++++++++++++++++++ roles/rpi-base/templates/wpa_supplicant.conf.j2 | 12 ++++++++++++ 6 files changed, 40 insertions(+), 39 deletions(-) delete mode 100644 roles/base/defaults/main.yaml delete mode 100644 roles/base/tasks/main.yml delete mode 100644 roles/base/templates/wpa_supplicant.conf.j2 create mode 100644 roles/rpi-base/defaults/main.yaml create mode 100644 roles/rpi-base/tasks/main.yml create mode 100644 roles/rpi-base/templates/wpa_supplicant.conf.j2 (limited to 'roles') diff --git a/roles/base/defaults/main.yaml b/roles/base/defaults/main.yaml deleted file mode 100644 index 0a496ce..0000000 --- a/roles/base/defaults/main.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -ubuntu_base_apt_packages: - - emacs-nox - - python3 - - htop diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml deleted file mode 100644 index 4c5e76f..0000000 --- a/roles/base/tasks/main.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: setup wifi - become: yes - template: - src: "wpa_supplicant.conf.j2" - dest: "/etc/wpa_supplicant/wpa_supplicant.conf" - mode: 0644 - -- name: update apt package cache - become: yes - apt: upgrade="dist" update_cache="yes" cache_valid_time="3600" - -- name: install extra apt packages - become: yes - apt: name="{{item}}" - with_items: "{{ubuntu_base_apt_packages}}" - -- name: authorize admin ssh keys - become: yes - authorized_key: "user=pi key=https://github.com/{{github_user}}.keys" diff --git a/roles/base/templates/wpa_supplicant.conf.j2 b/roles/base/templates/wpa_supplicant.conf.j2 deleted file mode 100644 index c0d6354..0000000 --- a/roles/base/templates/wpa_supplicant.conf.j2 +++ /dev/null @@ -1,12 +0,0 @@ -# {{ansible_managed}} - -country=US -ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev -update_config=1 -{% for network in wpa_networks %} - -network={ - ssid="{{network.ssid}}" - psk="{{network.psk}}" -} -{% endfor %} diff --git a/roles/rpi-base/defaults/main.yaml b/roles/rpi-base/defaults/main.yaml new file mode 100644 index 0000000..40aef5a --- /dev/null +++ b/roles/rpi-base/defaults/main.yaml @@ -0,0 +1,7 @@ +--- + +ubuntu_base_apt_packages: + - emacs-nox + - python3 + - htop + - jq diff --git a/roles/rpi-base/tasks/main.yml b/roles/rpi-base/tasks/main.yml new file mode 100644 index 0000000..4c5e76f --- /dev/null +++ b/roles/rpi-base/tasks/main.yml @@ -0,0 +1,21 @@ +--- + +- name: setup wifi + become: yes + template: + src: "wpa_supplicant.conf.j2" + dest: "/etc/wpa_supplicant/wpa_supplicant.conf" + mode: 0644 + +- name: update apt package cache + become: yes + apt: upgrade="dist" update_cache="yes" cache_valid_time="3600" + +- name: install extra apt packages + become: yes + apt: name="{{item}}" + with_items: "{{ubuntu_base_apt_packages}}" + +- name: authorize admin ssh keys + become: yes + authorized_key: "user=pi key=https://github.com/{{github_user}}.keys" diff --git a/roles/rpi-base/templates/wpa_supplicant.conf.j2 b/roles/rpi-base/templates/wpa_supplicant.conf.j2 new file mode 100644 index 0000000..c0d6354 --- /dev/null +++ b/roles/rpi-base/templates/wpa_supplicant.conf.j2 @@ -0,0 +1,12 @@ +# {{ansible_managed}} + +country=US +ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev +update_config=1 +{% for network in wpa_networks %} + +network={ + ssid="{{network.ssid}}" + psk="{{network.psk}}" +} +{% endfor %} -- cgit v1.2.3