Merge branch 'release/0.3.0'

Author: davidderus

README.md

@@ -1,4 +1,4 @@
-# ansible-rpi 0.2.0
+# ansible-rpi 0.3.0
 
 ## Purpose
 
@@ -30,6 +30,7 @@ Make Raspberry Pi up and running in a few command
   - Kodi basic installation
   - Dynamic sources creation (*may be linked to previously configured network folders*)
   - Buffer handling
+  - Optionnal minimal Openbox setup (*when using a lite image for eg.*)
 
 ### Incoming
 
@@ -55,6 +56,12 @@ cp variables.yml.inc host_vars/my-host.yml
 
 First update the `hosts` file to target your Rpis.
 
+I recommend using an up-to-date Raspbian Lite image.
+
+Make sure that the Rpi is SSHable (**latest raspbian lite images come with SSH
+disabled by default, creating a file with name "ssh" in boot partition is
+required to enable it.**).
+
 Then the first time run:
 
 ```

playbook.yml

@@ -15,3 +15,11 @@
     - download_server
 
   become: yes
+
+- name: Setup a media center
+
+  hosts: media_centers
+  roles:
+    - media_center
+
+  become: yes

roles/common/tasks/base.yml

@@ -7,25 +7,17 @@
   apt: upgrade=yes
   register: upgrade_distribution
 
-# See https://www.raspberrypi.org/documentation/configuration/config-txt.md
-- name: Update boot config for HDMI
-  lineinfile: line='hdmi_safe=1'
-    dest=/boot/config.txt
-    regexp="^hdmi_safe="
-    state=present
-  register: update_config
-
 - name: Rebooting Rpi
   shell: sleep 2 && shutdown -r now "Ansible updates triggered"
   async: 1
   poll: 0
   ignore_errors: true
-  when: (upgrade_distribution|changed) or (update_config|changed)
+  when: upgrade_distribution|changed
 
 - name: Waiting for server to come back
   local_action: wait_for host={{ inventory_hostname }} state=started delay=30 timeout=300
   become: false
-  when: (upgrade_distribution|changed) or (update_config|changed)
+  when: upgrade_distribution|changed
 
 - name: Setup locale
   lineinfile: dest=/etc/locale.gen regexp="^#{{item}}" line="{{item}}"
@@ -45,9 +37,9 @@
 
 - name: Create new Rpi owner
   user: name={{ rpi_user_name }}
-        groups={{ rpi_shared_group }},pi,adm,dialout,cdrom,sudo,audio,video,plugdev,games,users,input,netdev,gpio,i2c,spi
+        groups={{ rpi_shared_group }},pi,adm,dialout,cdrom,sudo,audio,video,plugdev,games,users,input,netdev,gpio,i2c,spi,tty
         password={{ rpi_user_password_hash }}
-        shell={{ '/bin/zsh' if with_zsh else '/bin/bash' }}
+        shell=/bin/bash
         append=yes
         state=present
 

roles/common/tasks/hostname.yml

@@ -26,7 +26,7 @@
 
 - name: Avahi Zeroconf Daemon ports
   ufw: rule=allow port=5353 proto=udp
-  notify: Enable firewall
+  notify: Reload firewall
 
 - name: Reload facts
   setup:

roles/common/tasks/zsh.yml

@@ -17,3 +17,8 @@
   lineinfile: dest=~/.zshrc regexp="^ZSH_THEME" line="ZSH_THEME=\"{{ rpi_zsh_theme|default('junkfood') }}\"" state=present
   become: yes
   become_user: "{{ rpi_user_name }}"
+
+- name: Update user default shell
+  user: name={{ rpi_user_name }}
+        shell=/bin/zsh
+        state=present

roles/media_center/defaults/main.yml

@@ -1,5 +1,6 @@
-kodi_apt_repo: "deb http://http.debian.net/debian jessie-backports main"
+kodi_apt_repo: "deb http://pipplware.pplware.pt/pipplware/dists/jessie/main/binary /"
 kodi_user_dir: /home/{{ rpi_user_name }}/.kodi
+openbox_config_dir: /home/{{ rpi_user_name }}/.config/openbox
 
 # Arrays of filepaths
 # Inspired by https://github.com/cmprescott/ansible-role-kodi
@@ -12,3 +13,5 @@ kodi_source_videos: []
 with_kodi_buffering: False
 kodi_read_buffer_factor: 20
 kodi_buffer_size: 139460608
+
+with_kodi_desktop: False

roles/media_center/tasks/desktop.yml

@@ -0,0 +1,35 @@
+---
+
+# https://www.prahladyeri.com/blog/2016/02/minimal-debian-desktop-setup.html
+- name: Install packages for a minimal desktop
+  apt: name={{ item }} state=latest
+  with_items:
+    - network-manager
+    - xorg
+    - openbox
+    - xdm
+    - xbacklight
+    - pcmanfm
+    - lxappearance
+    - lxpanel
+    - gmrun
+    - gnome-terminal
+
+- name: Create openbox config directory
+  file: path="{{ openbox_config_dir }}" owner="{{ rpi_user_name }}" group="{{ rpi_user_name }}" state=directory
+  register: create_openbox_config
+
+- name: Setting up default Openbox config
+  shell: cp /etc/xdg/openbox/* "{{ openbox_config_dir }}"
+  become: yes
+  become_user: "{{ rpi_user_name }}"
+  when: create_openbox_config|changed
+
+- name: Enforce lxpanel opening
+  lineinfile: dest="{{ openbox_config_dir }}/autostart"
+              regexp="^lxpanel"
+              line="lxpanel &"
+              create=yes
+              state=present
+  become: yes
+  become_user: "{{ rpi_user_name }}"

roles/media_center/tasks/main.yml

@@ -1,24 +1,54 @@
 ---
 
-- name: Add Kodi Repo if not present
+# See https://www.raspberrypi.org/documentation/configuration/config-txt.md
+- name: Setup custom config.txt
+  template: src=system/config.txt.j2 dest=/boot/config.txt owner=root group=root mode=0755
+  register: update_config
+
+- name: Create 99-input.rules
+  template: src=system/input-rules dest=/etc/udev/rules.d/99-input.rules owner=root group=root mode=0644
+
+- name: Create 10-permissions.rules
+  template: src=system/permissions-rules dest=/etc/udev/rules.d/10-permissions.rules owner=root group=root mode=0644
+
+- name: Rebooting Rpi
+  shell: sleep 2 && shutdown -r now "Ansible updates triggered"
+  async: 1
+  poll: 0
+  ignore_errors: true
+  when: update_config|changed
+
+- name: Waiting for server to come back
+  local_action: wait_for host={{ inventory_hostname }} state=started delay=30 timeout=300
+  become: false
+  when: update_config|changed
+
+- name: Add Kodi 16 Custom Repo
   apt_repository: repo={{ kodi_apt_repo }}
-  when: ansible_os_family == 'Debian' and ansible_distribution_version|int == 8
+
+- name: Add Kodi Repo Key
+  apt_key:
+    url: "http://pipplware.pplware.pt/pipplware/key.asc"
+    state: present
 
 - name: Update APT package cache
   apt: update_cache=yes cache_valid_time=3600
 
 - name: Install Kodi
-  apt: state=installed pkg=kodi
+  apt: state=installed pkg=kodi force=yes
 
 - name: Create current user configuration directories
-  file: path={{ item }} state=directory owner={{ rpi_user_name }} mode=0755
+  file: path={{ item }} state=directory owner={{ rpi_user_name }} group={{ rpi_user_name }} mode=0755
   with_items:
     - "{{ kodi_user_dir }}"
     - "{{ kodi_user_dir }}/userdata"
 
 - name: Build sources file
-  template: src=kodi/sources.xml.j2 dest="{{ kodi_user_dir }}/userdata/sources.xml" owner={{ rpi_user_name }} mode=0600
+  template: src=kodi/sources.xml.j2 dest="{{ kodi_user_dir }}/userdata/sources.xml" owner={{ rpi_user_name }} group={{ rpi_user_name }} mode=0600
 
 - name: Enable buffering
-  template: src=kodi/advancedsettings.xml.j2 dest="{{ kodi_user_dir }}/userdata/advancedsettings.xml" owner={{ rpi_user_name }} mode=0600
+  template: src=kodi/advancedsettings.xml.j2 dest="{{ kodi_user_dir }}/userdata/advancedsettings.xml" owner={{ rpi_user_name }} group={{ rpi_user_name }} mode=0600
   when: with_kodi_buffering
+
+- include: desktop.yml
+  when: with_kodi_desktop

roles/media_center/templates/system/config.txt.j2

@@ -0,0 +1,69 @@
+# {{ ansible_managed }}
+#
+# For more options and information see
+# http://www.raspberrypi.org/documentation/configuration/config-txt.md
+# Some settings may impact device functionality. See link above for details
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+#disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Uncomment this to enable the lirc-rpi module
+#dtoverlay=lirc-rpi
+
+# Additional overlays and parameters are documented /boot/overlays/README
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+##################
+# Customizations #
+##################
+
+# Allocating 256M of RAM as GPU Memory
+gpu_mem=192
+
+# Avoids bringing CEC (enabled TV) out of standby and channel switch when
+# rebooting.
+hdmi_ignore_cec_init=1

roles/media_center/templates/system/input-rules

@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+
+SUBSYSTEM==input, GROUP=input, MODE=0660
+KERNEL==tty[0-9]*, GROUP=tty, MODE=0660

roles/media_center/templates/system/permissions-rules

@@ -0,0 +1,10 @@
+# {{ ansible_managed }}
+
+# input
+KERNEL=="mouse*|mice|event*",   MODE="0660", GROUP="input"
+KERNEL=="ts[0-9]*|uinput",     MODE="0660", GROUP="input"
+KERNEL==js[0-9]*,             MODE=0660, GROUP=input
+# tty
+KERNEL==tty[0-9]*,            MODE=0666
+# vchiq
+SUBSYSTEM==vchiq,  GROUP=video, MODE=0660

variables.yml.inc

@@ -37,6 +37,8 @@ logwatch_email: youremail@example.com
 
 # SSH
 
+# Changing this implies updating `allowed_ports` by adding the new port
+# AND leaving port 22 for the first setup (otherwise ansible may stop)
 ssh_port: 22
 ssh_public_keys:
   - ~/.ssh/id_rsa.pub
@@ -49,6 +51,7 @@ ssh_custom_banner: True
 allowed_ports:
   - 22
   - 6800 # Aria2 Daemon port
+# - 8070 # Kodi Remote Connection
 
 # Wifi handling (disabled by default)
 
@@ -104,9 +107,12 @@ with_vim: True
 # kodi_source_videos: []
 
 # Enable buffering for slow networks
+# with_kodi_buffering: True
 
-with_kodi_buffering: True
-
-# Default values for a Rpi 3 (1 Gb of RAM):
+# Using 418M of RAM maximum (may crash if not available):
 # kodi_read_buffer_factor: 20
 # kodi_buffer_size: 139460608
+
+# with_kodi_desktop installs a minimal OpenBox desktop based on
+# https://www.prahladyeri.com/blog/2016/02/minimal-debian-desktop-setup.html
+# with_kodi_desktop: True