From 76ca4b977df51b19f97731d2533681d406d9615d Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sat, 31 Oct 2020 16:05:37 -0700 Subject: [PATCH 1/5] chromium-browse autostart for server console --- roles/www_options/tasks/main.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index 70295837a..77dc2cc72 100644 --- a/roles/www_options/tasks/main.yml +++ b/roles/www_options/tasks/main.yml @@ -23,6 +23,19 @@ when: nginx_installed is defined #when: nginx_install +- name: Make home page autostart on localhost (the server's console) if session manager is LXDE (rpi) + stat: + path: /etc/lxsession/LXDE-pi/autostart + register: lxde_present + +- name: Add a chromium-browser to autostart if session manager is LXDE + lineinfile: + path: /etc/lxsession/LXDE-pi/autostart + rexexp: '^/usr/bin/chromium-browser' + line: '/usr/bin/chromium-browser --ignore-certificate-errors --disable-restore-session-state http://box/home' + when: + lxde_present.stat.exists + - debug: msg: 'THE 3 ANSIBLE STANZAS BELOW ONLY RUN... when: (nginx_high_php_limits or moodle_install or nextcloud_install or pbx_install or wordpress_install) and nginx_enabled' From ffef8b8ecf9908abeed3e99a65496359e9b3c38b Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sat, 31 Oct 2020 17:33:21 -0700 Subject: [PATCH 2/5] fixes to path --- roles/www_options/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index 77dc2cc72..c4596071a 100644 --- a/roles/www_options/tasks/main.yml +++ b/roles/www_options/tasks/main.yml @@ -25,13 +25,13 @@ - name: Make home page autostart on localhost (the server's console) if session manager is LXDE (rpi) stat: - path: /etc/lxsession/LXDE-pi/autostart + path: /etc/xdg/lxsession/LXDE-pi/autostart register: lxde_present - name: Add a chromium-browser to autostart if session manager is LXDE lineinfile: - path: /etc/lxsession/LXDE-pi/autostart - rexexp: '^/usr/bin/chromium-browser' + path: /etc/xdg/lxsession/LXDE-pi/autostart + regexp: '^/usr/bin/chromium-browser' line: '/usr/bin/chromium-browser --ignore-certificate-errors --disable-restore-session-state http://box/home' when: lxde_present.stat.exists From 8ca435c473ef2d99d343598ecca88f4f214e651e Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 2 Nov 2020 20:14:18 -0800 Subject: [PATCH 3/5] accomodate chromium name change in 64 bit image --- roles/www_options/tasks/main.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index c4596071a..8a7c97e37 100644 --- a/roles/www_options/tasks/main.yml +++ b/roles/www_options/tasks/main.yml @@ -28,13 +28,26 @@ path: /etc/xdg/lxsession/LXDE-pi/autostart register: lxde_present +- name: Check for Chromium name change + stat: + path: /usr/bin/chromium + register: chromium_present + - name: Add a chromium-browser to autostart if session manager is LXDE lineinfile: path: /etc/xdg/lxsession/LXDE-pi/autostart regexp: '^/usr/bin/chromium-browser' line: '/usr/bin/chromium-browser --ignore-certificate-errors --disable-restore-session-state http://box/home' when: - lxde_present.stat.exists + lxde_present.stat.exists and not chromium_present.stat.exists + +- name: Add a chromium-browser to autostart if session manager is LXDE + lineinfile: + path: /etc/xdg/lxsession/LXDE-pi/autostart + regexp: '^/usr/bin/chromium-browser' + line: '/usr/bin/chromium --ignore-certificate-errors --disable-restore-session-state http://box/home' + when: + lxde_present.stat.exists and chromium_present.stat.exists - debug: msg: 'THE 3 ANSIBLE STANZAS BELOW ONLY RUN... when: (nginx_high_php_limits or moodle_install or nextcloud_install or pbx_install or wordpress_install) and nginx_enabled' From dfd6cc8baafb371b11f8d9caa597e2aacaea3c2a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 3 Nov 2020 07:03:10 -0500 Subject: [PATCH 4/5] Lint / Explanations for release For final review by @georgejhunt if he can look this over. --- roles/www_options/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index 8a7c97e37..d3ef29153 100644 --- a/roles/www_options/tasks/main.yml +++ b/roles/www_options/tasks/main.yml @@ -33,19 +33,19 @@ path: /usr/bin/chromium register: chromium_present -- name: Add a chromium-browser to autostart if session manager is LXDE +- name: Add chromium-browser to /etc/xdg/lxsession/LXDE-pi/autostart if session manager is LXDE lineinfile: path: /etc/xdg/lxsession/LXDE-pi/autostart regexp: '^/usr/bin/chromium-browser' - line: '/usr/bin/chromium-browser --ignore-certificate-errors --disable-restore-session-state http://box/home' + line: '/usr/bin/chromium-browser --ignore-certificate-errors --disable-restore-session-state http://box/home' when: lxde_present.stat.exists and not chromium_present.stat.exists -- name: Add a chromium-browser to autostart if session manager is LXDE +- name: Add chromium to /etc/xdg/lxsession/LXDE-pi/autostart if session manager is LXDE lineinfile: path: /etc/xdg/lxsession/LXDE-pi/autostart - regexp: '^/usr/bin/chromium-browser' - line: '/usr/bin/chromium --ignore-certificate-errors --disable-restore-session-state http://box/home' + regexp: '^/usr/bin/chromium' + line: '/usr/bin/chromium --ignore-certificate-errors --disable-restore-session-state http://box/home' when: lxde_present.stat.exists and chromium_present.stat.exists From cfff47651e065aad04952573c3f20a344677f34d Mon Sep 17 00:00:00 2001 From: George Hunt Date: Tue, 3 Nov 2020 09:34:06 -0800 Subject: [PATCH 5/5] remove ignore-certificate-errors --- roles/www_options/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml index d3ef29153..fc2c8815f 100644 --- a/roles/www_options/tasks/main.yml +++ b/roles/www_options/tasks/main.yml @@ -37,7 +37,7 @@ lineinfile: path: /etc/xdg/lxsession/LXDE-pi/autostart regexp: '^/usr/bin/chromium-browser' - line: '/usr/bin/chromium-browser --ignore-certificate-errors --disable-restore-session-state http://box/home' + line: '/usr/bin/chromium-browser --disable-restore-session-state http://box/home' when: lxde_present.stat.exists and not chromium_present.stat.exists @@ -45,7 +45,7 @@ lineinfile: path: /etc/xdg/lxsession/LXDE-pi/autostart regexp: '^/usr/bin/chromium' - line: '/usr/bin/chromium --ignore-certificate-errors --disable-restore-session-state http://box/home' + line: '/usr/bin/chromium --disable-restore-session-state http://box/home' when: lxde_present.stat.exists and chromium_present.stat.exists