salt/ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: salt:2f788a1a6eb7be77440cf6d4efe2194b9048a177
Branches Tags
salt:master
salt:kopia
salt:cleanup
salt:rewrite
...
compare: salt:81988a50fdf9cf86c54dfdcadf7ff1dbaa4dd772
Branches Tags
salt:master
salt:kopia
salt:cleanup
salt:rewrite

3 Commits
2f788a1a6e ... 81988a50fd

Author SHA1 Message Date
Salt
81988a50fd Remove defunct deb link for raspberry pi imager 2021-09-23 21:32:36 -05:00
Salt
aa98612d6c Rework data structures for flatpaks to properly allow for different remotes 2021-09-23 21:31:32 -05:00
Salt
69a8036398 Configure flatpak last on desktop plays 2021-09-23 21:22:35 -05:00
3 changed files with 16 additions and 12 deletions
Show Stats Expand all files Collapse all files

1
playbooks/device_roles_workstation.yml
View File

@ -58,7 +58,6 @@
- xserver-xephyr - xserver-xephyr
desktop_apt_debs_extra: desktop_apt_debs_extra:
- "https://zoom.us/client/latest/zoom_amd64.deb" # Zoom, proprietary shitware - "https://zoom.us/client/latest/zoom_amd64.deb" # Zoom, proprietary shitware
- "https://downloads.raspberrypi.org/imager/imager_amd64.deb" # Pi imager
tags: [ desktop, desktop-role ] tags: [ desktop, desktop-role ]
- role: grub - role: grub
tags: [ desktop, grub ] tags: [ desktop, grub ]

12
roles/desktop/defaults/main.yml
View File

@ -157,8 +157,12 @@ desktop_flatpak_remotes:
desktop_flatpak_remotes_extra: [] desktop_flatpak_remotes_extra: []
desktop_flatpak_packages: desktop_flatpak_packages:
- com.obsproject.Studio - remote: flathub
- net.lutris.Lutris packages:
- net.minetest.Minetest - com.obsproject.Studio
- org.DolphinEmu.dolphin-emu - net.minetest.Minetest
- org.DolphinEmu.dolphin-emu
- remote: flathub-beta
packages:
- net.lutris.Lutris
desktop_flatpak_packages_extra: [] desktop_flatpak_packages_extra: []

15
roles/desktop/tasks/packages.yml
View File

@ -29,13 +29,6 @@
# Ignoring errors here is important because this task fails on package backdates # Ignoring errors here is important because this task fails on package backdates
ignore_errors: yes ignore_errors: yes
when: ansible_pkg_mgr == "apt" when: ansible_pkg_mgr == "apt"
- name: configure flatpak
block:
- name: configure flatpak remotes
flatpak_remote: name="{{ item.name }}" state=present flatpakrepo_url="{{ item.url }}"
with_items: "{{ desktop_flatpak_remotes + desktop_flatpak_remotes_extra }}"
- name: configure installed flatpaks
flatpak: name="{{ desktop_flatpak_packages + desktop_flatpak_packages_extra }}"
- name: configure portage - name: configure portage
block: block:
# Portage is very complex, so we sync an entire known good configuration tree # Portage is very complex, so we sync an entire known good configuration tree
@ -51,3 +44,11 @@
- name: configure pip3 packages - name: configure pip3 packages
pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}" pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}"
when: ansible_os_family != "Gentoo" when: ansible_os_family != "Gentoo"
- name: configure flatpak
block:
- name: configure flatpak remotes
flatpak_remote: name="{{ item.name }}" state=present flatpakrepo_url="{{ item.url }}"
with_items: "{{ desktop_flatpak_remotes + desktop_flatpak_remotes_extra }}"
- name: configure installed flatpaks
flatpak: name="{{ item.packages }}" state=present remote="{{ item.remote | default('flathub', true) }}"
with_items: "{{ desktop_flatpak_packages + desktop_flatpak_packages_extra }}"