talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to an explicit install_graphics variable rather than using graphics_driver to control all graphics install.

Browse Source
This commit is contained in:
Tom Alexander
2022-11-25 15:29:29 -05:00
parent 11ef6647f1
commit 2222c9d033
9 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/alacritty/tasks/main.yaml
View File

@@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

2
ansible/roles/firefox/tasks/main.yaml
View File

@@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

2
ansible/roles/fonts/tasks/main.yaml
View File

@@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

2
ansible/roles/gpg/tasks/freebsd.yaml
View File

@@ -9,7 +9,7 @@
state: present
- name: Install packages
when: graphics_driver is defined
when: install_graphics is defined and install_graphics
package:
name:
- pinentry-qt5

4
ansible/roles/gpg/templates/gpg-agent.conf.j2
View File

@@ -4,8 +4,8 @@ use-standard-socket
default-cache-ttl 600
max-cache-ttl 7200
display :0
{% if graphics_driver is defined and os_flavor == "linux" %}
{% if install_graphics is defined and install_graphics and os_flavor == "linux" %}
pinentry-program /usr/bin/pinentry-qt
{% elif graphics_driver is defined and os_flavor == "freebsd" %}
{% elif install_graphics is defined and install_graphics and os_flavor == "freebsd" %}
pinentry-program /usr/local/bin/pinentry-qt5
{% endif %}

2
ansible/roles/graphics/tasks/main.yaml
View File

@@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

2
ansible/roles/sway/tasks/main.yaml
View File

@@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics