4 Commits

Author SHA1 Message Date
652d32b175 Add flatpak role for Debian 2023-08-01 19:46:24 +01:00
9497da521c Fix 1password role on Debian 2023-08-01 19:32:32 +01:00
df00529f86 Use /etc/os-release to ID Ubuntu/Debian
Ansible facts aren't always enough to determine if a distro is derived
from Ubuntu or not, this is available from `/etc/os-release` when it
contains `ID_LIKE="ubuntu debian"`. This patch uses `/etc/os-release` to
correctly handle Ubuntu installations, e.g. PPA's, for all Ubuntu
derived dirtros rather than just Ubuntu itself.
2023-08-01 19:14:32 +01:00
58cd98c817 Always fixup clone win_git repo owner 2023-07-29 12:07:05 +01:00
11 changed files with 50 additions and 25 deletions

View File

@@ -127,14 +127,6 @@ function Invoke-GitClone {
if ($result.rc -ne 0) {
$module.FailJson($result.stderr)
}
# Ensure the newly cloned repository has the correct owner
$userName = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
$idRef = [System.Security.Principal.NTAccount]::new($userName)
Get-Item $dest | foreach { `
$_ ; $_ | Get-ChildItem -Force -Recurse `
} | foreach { `
$acl = $_ | Get-Acl; $acl.SetOwner($idRef); $_ | Set-Acl -AclObject $acl `
}
}
function Invoke-GitCheckout {
@@ -228,4 +220,13 @@ if ($recursive) {
Invoke-GitSubmoduleUpdate $dest
}
# Ensure the repository has the correct owner
$userName = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name
$idRef = [System.Security.Principal.NTAccount]::new($userName)
Get-Item $dest | foreach { `
$_ ; $_ | Get-ChildItem -Force -Recurse `
} | foreach { `
$acl = $_ | Get-Acl; $acl.SetOwner($idRef); $_ | Set-Acl -AclObject $acl `
}
$module.ExitJson()

View File

@@ -35,6 +35,11 @@
https://downloads.1password.com/linux/debian/{{arch}} stable main
dest: /etc/apt/sources.list.d/1password.list
- name: apt update
become: true
apt:
update_cache: true
- name: install gui package
when: '"WSL" not in ansible_kernel'
become: true

View File

@@ -9,10 +9,6 @@
repo: git@code.infektor.net:config/AutoHotKey.git
dest: '{{autohotkey_repo_dir}}'
branch: master
- win_owner:
path: '{{autohotkey_repo_dir}}'
user: Benie
recurse: true
- name: create scheduled task
win_scheduled_task:

View File

@@ -0,0 +1,6 @@
---
- name: install apt package
become: true
apt:
name: flatpak
state: latest

View File

@@ -0,0 +1,9 @@
---
- include_tasks: '{{ansible_os_family}}.yaml'
- name: add flathub repository remote
become: true
flatpak_remote:
name: flathub
state: present
flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo

View File

@@ -1,5 +1,17 @@
---
- name: slurp /etc/os-release
slurp:
src: /etc/os-release
register: os_release_slurp
- set_fact:
os_release: "{{ os_release_slurp.content |
b64decode | trim() | replace('=', ': ') | from_yaml }}"
- include_tasks: Ubuntu.yaml
when: "'ID_LIKE' in os_release and os_release.ID_LIKE == 'ubuntu debian'"
- name: install apt packages
when: "'ID_LIKE' not in os_release"
become: true
apt:
name:

View File

@@ -1,2 +0,0 @@
---
- include_tasks: Ubuntu.yaml

View File

@@ -1,2 +0,0 @@
---
- include_tasks: Ubuntu.yaml

View File

@@ -1,5 +1,2 @@
---
- include_tasks: '{{ansible_os_family}}.yaml'
when: ansible_os_family in ['Darwin', 'Windows']
- include_tasks: '{{ansible_distribution}}.yaml'
when: ansible_os_family not in ['Darwin', 'Windows']

View File

@@ -1,7 +1,14 @@
---
- name: slurp /etc/os-release
slurp:
src: /etc/os-release
register: os_release_slurp
- set_fact:
os_release: "{{ os_release_slurp.content |
b64decode | trim() | replace('=', ': ') | from_yaml }}"
- name: add neovim stable ppa
when: ansible_distribution == 'Ubuntu' and
ansible_distribution_version == '20.04'
when: "'ID_LIKE' in os_release and os_release.ID_LIKE == 'ubuntu debian'"
become: true
apt_repository:
repo: ppa:neovim-ppa/stable

View File

@@ -12,7 +12,3 @@
repo: git@github.com:kbenzie/notes.git
dest: '{{obsidian_notes_repo}}'
branch: main
- win_owner:
path: '{{obsidian_notes_repo}}'
user: Benie
recurse: true