gregandev/rpi-ansible
1
0
Fork 0
mirror of https://github.com/ruanbekker/rpi-ansible.git synced 2026-09-05 05:50:41 +02:00
Code Issues Projects Releases Wiki Activity

straighten out configuration nomenclature

Browse Source
This commit is contained in:
Glenn K. Lockwood
2018-10-28 13:03:30 -07:00
parent 429829f28f
commit da6a1d4aa6
3 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/common/tasks/raspi-config.yml
+22
View File
@@ -0,0 +1,22 @@
---
# Handle boot and autologin settings
- name: enable cli only
command: "raspi-config nonint do_boot_behaviour B1"
when: not macaddrs[my_macaddr].enable_gui and not macaddrs[my_macaddr].enable_autologin and (raspi_gui_enabled or raspi_autologin_enabled)
- name: enable cli with autologin
command: "raspi-config nonint do_boot_behaviour B2"
when: not macaddrs[my_macaddr].enable_gui and macaddrs[my_macaddr].enable_autologin and (raspi_gui_enabled or not raspi_autologin_enabled)
- name: enable desktop gui
command: "raspi-config nonint do_boot_behaviour B3"
when: macaddrs[my_macaddr].enable_gui and not macaddrs[my_macaddr].enable_autologin and (not raspi_gui_enabled or raspi_autologin_enabled)
- name: enable desktop gui with autologin
command: "raspi-config nonint do_boot_behaviour B4"
when: macaddrs[my_macaddr].enable_gui and macaddrs[my_macaddr].enable_autologin and (not raspi_gui_enabled or raspi_autologin_enabled)
#- name: set bootwait option
# command: "raspi-config nonint do_boot_wait {{ not macaddrs[my_macaddr].raspi_bootwait }}"
#when: macaddrs[my_macaddr].raspi_boot_nowait
roles/common/tasks/raspi-facts.yml
+12 -12
View File
@@ -113,19 +113,19 @@
set_fact:
raspi_type: "{{ raspi_type.stdout }}"
raspi_hostname: "{{ raspi_hostname.stdout }}"
raspi_boot_gui: "{{ raspi_boot_gui.stdout }}"
raspi_noautologin: "{{ raspi_noautologin.stdout }}"
raspi_boot_nowait: "{{ raspi_boot_nowait.stdout }}"
raspi_wifi_country: "{{ raspi_wifi_country.stdout }}"
raspi_camera_disabled: "{{ raspi_camera_disabled.stdout }}"
raspi_ssh_disabled: "{{ raspi_ssh_disabled.stdout }}"
raspi_vnc_disabled: "{{ raspi_vnc_disabled.stdout }}"
raspi_spi_disabled: "{{ raspi_spi_disabled.stdout }}"
raspi_i2c_disabled: "{{ raspi_i2c_disabled.stdout }}"
raspi_serial_disabled: "{{ raspi_serial_disabled.stdout }}"
raspi_serial_hw_disabled: "{{ raspi_serial_hw_disabled.stdout }}"
raspi_onewire_disabled: "{{ raspi_onewire_disabled.stdout }}"
raspi_rgpio_disabled: "{{ raspi_rgpio_disabled.stdout }}"
raspi_gui_enabled: "{{ raspi_boot_gui.stdout != '0' }}"
raspi_autologin_enabled: "{{ raspi_noautologin.stdout == '0' }}"
raspi_bootwait_enabled: "{{ raspi_boot_nowait.stdout == '0' }}"
raspi_camera_enabled: "{{ raspi_camera_disabled.stdout == '0' }}"
raspi_ssh_enabled: "{{ raspi_ssh_disabled.stdout == '0' }}"
raspi_vnc_enabled: "{{ raspi_vnc_disabled.stdout == '0' }}"
raspi_spi_enabled: "{{ raspi_spi_disabled.stdout == '0' }}"
raspi_i2c_enabled: "{{ raspi_i2c_disabled.stdout == '0' }}"
raspi_serial_enabled: "{{ raspi_serial_disabled.stdout == '0' }}"
raspi_serial_hw_enabled: "{{ raspi_serial_hw_disabled.stdout == '0' }}"
raspi_onewire_enabled: "{{ raspi_onewire_disabled.stdout == '0' }}"
raspi_rgpio_enabled: "{{ raspi_rgpio_disabled.stdout == '0' }}"
raspi_overclock: "{{ raspi_overclock.stdout }}"
raspi_fs_unexpandable: "{{ raspi_fs_unexpandable.stdout }}"
raspi_overscan: "{{ raspi_overscan.stdout }}"