Compare commits

...

2 Commits

Author SHA1 Message Date
50a13e2bcd ☁️ Add Sky Labs server inventory 2022-12-19 13:59:53 +01:00
bc0dd6487f 📥️ Various nice improvements 2022-12-19 13:59:24 +01:00
17 changed files with 95 additions and 52 deletions

View File

@ -1,4 +1,6 @@
[alpine]
docker-alpine-test ansible_connection=docker ansible_user=root ansible_host=ansible
;[skyid:children]
;alpine
[apk:children]
alpine
alpine

View File

@ -12,7 +12,7 @@ pubkeys: [
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuXK610CJq4pQrTOxESRXEyzQgAICHjgjvfl5GpOR1DoBAmp4oAsckJjbUWqdsdJN/bHc3Femcy71jvZADoO1RyJ16gZVbGsrz1Ale1/VHifjh1vtFt93dI7amUsyogKS9Ypy/FOVUpSMEtsiIwku5D2LJXe80qOS+TV8INTaplufwf+mrLavBCmQ2jYvC5U3c40JoUD2fs63S4FGgX/XbxZnhYuiIzQiHuk8VBDYXME0noGB7UTo+3oBjZSHCkdsjPIZ0CrxNdCV+dAVQ1K8OYekBmGsjL131buvX8irLyDzpEBqxkyP7J+qx7Imea1KJHL3JneJWTfiCSSXCxJpEp8xlot0OTfmJ0Kfon49F74yClqy+ztgyF8BiSWcNylD1TbOqDMJApJh7/toTcVT6VJ74z7p+/3q5+K3mSUC6BO5ilyD+k9/Af4NjIcfD/P9AWyVR+UEXAN1TrgZWI3V3KZENg3geqyyRPFLh3p1NvlwvhwcUn+jGLm82ZrBvaDqB1ihqkF/1mZLiUrsij/7sEUxI3ZIiLPEVRHPnOb+6oFomWPOGbhwPbl98lOgarsNQzQaOe36KFGC6zHPwN/d5PT5TNCgUQ7Gg8igTlXKSH/XUNy4ArQrjTisWt6k93zrAn0HK2Mh774Bvf9eAXqkvlIoti+r8X8nbiIpVAKvm8Q== siv@billy,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6HmJQGvQghh8g8JWoUkQf6d3rokSJad4on69WahrvyBUzDASwOnACX0yztDYYu7UzH8TtJqknbp2P5JSKVR+PFvNxo24QYC671QzGyRq4urL8YDsWj5feSL4MEvFY0ivNRNxAKxLHXg+i0jQtiDwBOkhQl0VFrqsKdGlEVcghVeogBAdzHFQNQ7ENZMS30qzW1wrcwWbUBF8ZSvwEQgCXH0UHcIWi3Rzd0g0LfvfbOtI1UjuBzT0gd5F1RSHh0XJWK7jcVrNShMVQqmWWLuHVd8T2k7flGQDBeZPKo3GXdnB4cXgkfNJrsyNDLoJXimj8UryNpn3ejV9DkreL985uAmkLPY11bkD6vWgdZgXA3aWpLQm05crOu4GEn1bGhbnIORm4mjxlANJB0QC9FliCAVkLk4OY7UGnx4mgqMyYjb2LCdgGKVVto97UAisJxWikLiM5nCNrCaGBe05d2nVxPXVKwALI3E2AeIYSmjE4N3mBgUIxWuGS6KoOZsnoSYS3+blQV0W/POuFw4NhlWgZUi8GAaGPfWj8pM/u9dH8FKxhK/PabVKtltLkn4ntgewaeNl18n1NFkQtcDD7Kkg/ZIQ9SiNchK0SxR0/Pgwo/A5GacF+nwTgxGwDJbQ0OPaVlbQd/cCaXl1AX9s7R5Xd8D35KFHTJ1IVnZohDGVQvQ== mob]
packages: [neofetch,htop,git,zsh,lsd,bat]
packages: [neofetch,rsync,htop,git,zsh,lsd,bat]
package_manager: null
extra_packages: []
update: true

View File

@ -1 +0,0 @@
update: false

View File

@ -1 +0,0 @@
update: false

View File

@ -1,4 +1,5 @@
user_groups: [sysadmins]
user_groups: [sysadmins,systemd-journal]
zsh_prompt: "{{ '%F{blue}% %n%F{green}% @%F{red}% %m %F{yellow}% %1~%f >' }}"
setup: [zsh,bash,extra]
zsh_opt_config: false
extra_packages: []

View File

@ -1 +1,2 @@
user_groups: [sudo,adm,kvm,users,docker]
---
user_groups: [sudo, adm, kvm, users, docker]

View File

@ -1,2 +1,3 @@
---
zsh_opt_config: true
user_groups: [wheel,sudo,adm,kvm,users,docker]
user_groups: [wheel, sudo, adm, kvm, users, docker]

View File

@ -1,15 +1,8 @@
---
zsh_opt_config: false
zsh_prompt: "{{ '%F{blue}% %n%F{green}% @%F{red}% %m %F{#bb33bb}% %1~%f >' }}"
pubkeys: [
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJjfmCya6+rbVz1guQN1LBJoJ7KKAvVf+KQn48980QVYvP3e9mWp3vidTHZOEK1TMiEL7fkPehfjUWna1D/G4i70xN7GhDScd2T8F1QFJzhr+x1zIoYXTCuHXxKvZKTbTroTbQwsvtXbz30+gzRErMamOIVrzUfXax1YaG0d+2HmryeXSL1rq/5v/H9K1j5Ou+77QOZ9cdaLcynOU2+1qhtAjyAm7RA9yoySqmgp1/CzrixQ9x4OWJaGFbL2ooyXY2lnz23rttEo1ziwJpX7LU1oNHOqBxRIVBepakN5Oy3PW1lOLHCV0ipgAFs03ScPgwZ1C2Y5b1svTKl0fH5XF8huSKFaTg9jiJ89rniWq/u8Hebb9U37/VnLKbTLiPZLdES3b1FZHuYFDes+VQHcPXjzdSQ5J+bGZ8EuBLRa9LXd37hCqXEWgMxZ3BvqUW5VF6G5nmHQdxOdf3gb/FNdcKXjK6nRDzx7DNeV81wp/Lo9KI1hu5g6BdNnI5Dy5l4d3CBDre7QP09fUmKve+AK1m9DdEIRxvtzo+X0Hi32+qhWyQUQhzEm+DG+brOuIpDAH9CoNts2cUjTqqzlW7eQ51N6xUe4PfMv2yoL0DvlRK6hBaAz50lHWD3ubXbdNl3Pd8msCOAg9vhIN7Zgfvvs2Ic19Q/YoPMqylWpIowxEfbw== 1337h4ckz0r5@mukti,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1O7dXSrkDZ0l2kQMDnUPcALEYrq9l+fCKANb4sKZebRr+CkvO0Yat6f/O1a4OJWKeIpOMNIG60aiQB4Npn1ACosQ5Jgw1GypEr6QWDKdWqTEQ4qQaJk2sAKbUpEHTvtwlRTZy5zxC0TrRSjXcNmPR5O4GGMPLAdWFmD9iIRA+tjGvB6U4NY8KafxzBmje95oVP8erayEZT90IgljLisg29uAofAfAhjP/KV/z1ppmwrL7Et6N2ZcOfFl+KOcefzjt0bdkV0gFXqYKEFK9WEpVXEHE7CpOu/dJZgVvTT+jfHhWhANkl66dDbv80nfHAINASCBCoUi6CFb8TBru4WABeoyKEQnC04IqHXvgOMr5/f9Sx1PHZNxkXNVuSPbkSnA7Qk4OnHG5c/rEeZ850eM8j0or29PyNFvZjWjBrIG1iReRTdSDkzdwojLuCKMrN8qxmDMuYW0Ey9DCsC2iKyYzJ+3dhilXkaUtQYHrtCM4DB4rcAWV2hRS1mRZwWmKH4QWvwVbjipKAzHg3i2hMFIC6HbNxbYHrzFCSCZN07ObLsyMYR28I74JfFxpNg0OQAZ5QVvOe+PletFjqbpVnjrGhEkBCyGIOfZ14PlJhN0CW8/9fTy6EzvruD2yGTUMq+pJhhJ3Zj5J+zaFJsz3tPxf+OVcsGFLEtbJvu6C9yCT5Q== siv@msitoo,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYIRUCrS6d8HdsDwsiXUvkHFDkUwrULBhIQzsQD5o8bZdaovvAHbB8wnpIvsDBgxdwlH7W0zPfo4P52n+bsq0jH8vkD+wIlSUrKJfj8IWDAHajxCSRG9h4mHtYvhKnV8ER96sdFh+85ULUa6LynCrixE9tFGHvNmNyMacP8BkdrnRb6Sj6l2EZGtViJ9KK66mfOMW6JSpkCsKT5GNY8l2AM2nMnAFrKWNGjKz5M1j85u5Ieqsk3nXhIxFJOWpqLe1CSWH42StA6QAwiN2j7taEaUiO85BgeulMGJe/feZEJHW/wOEd26k0+j4/vJ7tVUZFUk6gpIW01qkSqI0W6fhMSaAMoGKau3l/pEurfE8dQlHbHzOkUs2Il+AcXSZmxuAZiJ5+MhiaN7MtOT3pirD/uQDkEeA9e9ib++K0mu1pEMcsRGqc5XXqpKpWQqw5ceUSbdP3DOuhYLWo8GfP8vSixcFQKiuue7QLhWplsERsD57fjEq+wViXD8aBFNhPrw8V15rR7xuZe4JyBtTdpyoEx7Ji2hRMy5mYekSW9bINpmhve3KAte5G8iIsBrDxMEj1AJDyIofkSkuR75GvbIqCLxtMIC0ahfH7/DrVDr9xNnzfV1NeQ1GglP0BgUpmRtP6ozXotRqBKbiSoH6K+2HgsgKQZukZ4xzMxrV8fBApUQ== siv@MSI,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuXK610CJq4pQrTOxESRXEyzQgAICHjgjvfl5GpOR1DoBAmp4oAsckJjbUWqdsdJN/bHc3Femcy71jvZADoO1RyJ16gZVbGsrz1Ale1/VHifjh1vtFt93dI7amUsyogKS9Ypy/FOVUpSMEtsiIwku5D2LJXe80qOS+TV8INTaplufwf+mrLavBCmQ2jYvC5U3c40JoUD2fs63S4FGgX/XbxZnhYuiIzQiHuk8VBDYXME0noGB7UTo+3oBjZSHCkdsjPIZ0CrxNdCV+dAVQ1K8OYekBmGsjL131buvX8irLyDzpEBqxkyP7J+qx7Imea1KJHL3JneJWTfiCSSXCxJpEp8xlot0OTfmJ0Kfon49F74yClqy+ztgyF8BiSWcNylD1TbOqDMJApJh7/toTcVT6VJ74z7p+/3q5+K3mSUC6BO5ilyD+k9/Af4NjIcfD/P9AWyVR+UEXAN1TrgZWI3V3KZENg3geqyyRPFLh3p1NvlwvhwcUn+jGLm82ZrBvaDqB1ihqkF/1mZLiUrsij/7sEUxI3ZIiLPEVRHPnOb+6oFomWPOGbhwPbl98lOgarsNQzQaOe36KFGC6zHPwN/d5PT5TNCgUQ7Gg8igTlXKSH/XUNy4ArQrjTisWt6k93zrAn0HK2Mh774Bvf9eAXqkvlIoti+r8X8nbiIpVAKvm8Q== siv@billy,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6HmJQGvQghh8g8JWoUkQf6d3rokSJad4on69WahrvyBUzDASwOnACX0yztDYYu7UzH8TtJqknbp2P5JSKVR+PFvNxo24QYC671QzGyRq4urL8YDsWj5feSL4MEvFY0ivNRNxAKxLHXg+i0jQtiDwBOkhQl0VFrqsKdGlEVcghVeogBAdzHFQNQ7ENZMS30qzW1wrcwWbUBF8ZSvwEQgCXH0UHcIWi3Rzd0g0LfvfbOtI1UjuBzT0gd5F1RSHh0XJWK7jcVrNShMVQqmWWLuHVd8T2k7flGQDBeZPKo3GXdnB4cXgkfNJrsyNDLoJXimj8UryNpn3ejV9DkreL985uAmkLPY11bkD6vWgdZgXA3aWpLQm05crOu4GEn1bGhbnIORm4mjxlANJB0QC9FliCAVkLk4OY7UGnx4mgqMyYjb2LCdgGKVVto97UAisJxWikLiM5nCNrCaGBe05d2nVxPXVKwALI3E2AeIYSmjE4N3mBgUIxWuGS6KoOZsnoSYS3+blQV0W/POuFw4NhlWgZUi8GAaGPfWj8pM/u9dH8FKxhK/PabVKtltLkn4ntgewaeNl18n1NFkQtcDD7Kkg/ZIQ9SiNchK0SxR0/Pgwo/A5GacF+nwTgxGwDJbQ0OPaVlbQd/cCaXl1AX9s7R5Xd8D35KFHTJ1IVnZohDGVQvQ== mob]
packages: [neofetch,htop,git,zsh,lsd,bat]
package_manager: null
# extra_packages: []
update: true
update: false
setup: [zsh,extra,system] # ,bash,emacs
revert: false
revert: false

View File

@ -1,11 +1,12 @@
# pubkeys: [
# ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1O7dXSrkDZ0l2kQMDnUPcALEYrq9l+fCKANb4sKZebRr+CkvO0Yat6f/O1a4OJWKeIpOMNIG60aiQB4Npn1ACosQ5Jgw1GypEr6QWDKdWqTEQ4qQaJk2sAKbUpEHTvtwlRTZy5zxC0TrRSjXcNmPR5O4GGMPLAdWFmD9iIRA+tjGvB6U4NY8KafxzBmje95oVP8erayEZT90IgljLisg29uAofAfAhjP/KV/z1ppmwrL7Et6N2ZcOfFl+KOcefzjt0bdkV0gFXqYKEFK9WEpVXEHE7CpOu/dJZgVvTT+jfHhWhANkl66dDbv80nfHAINASCBCoUi6CFb8TBru4WABeoyKEQnC04IqHXvgOMr5/f9Sx1PHZNxkXNVuSPbkSnA7Qk4OnHG5c/rEeZ850eM8j0or29PyNFvZjWjBrIG1iReRTdSDkzdwojLuCKMrN8qxmDMuYW0Ey9DCsC2iKyYzJ+3dhilXkaUtQYHrtCM4DB4rcAWV2hRS1mRZwWmKH4QWvwVbjipKAzHg3i2hMFIC6HbNxbYHrzFCSCZN07ObLsyMYR28I74JfFxpNg0OQAZ5QVvOe+PletFjqbpVnjrGhEkBCyGIOfZ14PlJhN0CW8/9fTy6EzvruD2yGTUMq+pJhhJ3Zj5J+zaFJsz3tPxf+OVcsGFLEtbJvu6C9yCT5Q== siv@msitoo,
# ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop]
# extra_packages: [openssh,emacs,doas,lsd]
pubkeys: [
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1O7dXSrkDZ0l2kQMDnUPcALEYrq9l+fCKANb4sKZebRr+CkvO0Yat6f/O1a4OJWKeIpOMNIG60aiQB4Npn1ACosQ5Jgw1GypEr6QWDKdWqTEQ4qQaJk2sAKbUpEHTvtwlRTZy5zxC0TrRSjXcNmPR5O4GGMPLAdWFmD9iIRA+tjGvB6U4NY8KafxzBmje95oVP8erayEZT90IgljLisg29uAofAfAhjP/KV/z1ppmwrL7Et6N2ZcOfFl+KOcefzjt0bdkV0gFXqYKEFK9WEpVXEHE7CpOu/dJZgVvTT+jfHhWhANkl66dDbv80nfHAINASCBCoUi6CFb8TBru4WABeoyKEQnC04IqHXvgOMr5/f9Sx1PHZNxkXNVuSPbkSnA7Qk4OnHG5c/rEeZ850eM8j0or29PyNFvZjWjBrIG1iReRTdSDkzdwojLuCKMrN8qxmDMuYW0Ey9DCsC2iKyYzJ+3dhilXkaUtQYHrtCM4DB4rcAWV2hRS1mRZwWmKH4QWvwVbjipKAzHg3i2hMFIC6HbNxbYHrzFCSCZN07ObLsyMYR28I74JfFxpNg0OQAZ5QVvOe+PletFjqbpVnjrGhEkBCyGIOfZ14PlJhN0CW8/9fTy6EzvruD2yGTUMq+pJhhJ3Zj5J+zaFJsz3tPxf+OVcsGFLEtbJvu6C9yCT5Q== siv@msitoo,
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop]
#extra_packages: [openssh,emacs,doas,lsd]
extra_packages: [git]
user_groups: [adm,users]
setup: [bash,zsh,system,extra] # ,emacs
# zsh_opt_config: true
package_manager: apk
pubkeys: []
extra_packages: [doas,lsd]
# update: false
# update: false

View File

@ -1,3 +1,4 @@
---
- name: Install packages
when: update
block:
@ -7,7 +8,7 @@
block:
- name: Install the good stuff (pacman)
pacman: name={{ item }} state=latest
ignore_errors: yes
ignore_errors: true
with_items:
- "{{ extra_packages }}"
- "{{ packages }}"
@ -24,7 +25,7 @@
block:
- name: Install the good stuff (apk)
apk: name={{ item }} state=latest
ignore_errors: yes
ignore_errors: true
with_items:
- "{{ extra_packages }}"
- "{{ packages }}"
@ -41,7 +42,7 @@
block:
- name: Install the good stuff (apt)
apt: package={{ item }} state=latest
ignore_errors: yes
ignore_errors: true
with_items:
- "{{ extra_packages }}"
- "{{ packages }}"

View File

@ -1,13 +1,14 @@
#!/bin/sh
which lsd>/dev/null
if [ "$?" = "0" ]; then
alias ls="lsd -h --color=auto --group-dirs first"
else
([ $? -eq 0 ] && \
alias ls="lsd -h --color=auto --group-dirs first") || \
alias ls="ls -h --color=auto --group-directories-first"
fi
# ([ "$?" = "0" ] && \
# alias ls="lsd -h --color=auto --group-dirs first") || \
# if [ $? -eq 0 ]; then
# alias ls="lsd -h --color=auto --group-dirs first"
# else
# alias ls="ls -h --color=auto --group-directories-first"
# fi
which doas>/dev/null && [ $? -eq 0 ] && alias doas="sudo"
alias\
ll="ls -l"\
la="ls -a"\

21
roles/shell/files/bin/vault.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/sh
[ -z "$REMOTE" ] && REMOTE=siv@archy.42069.no:/home/coder
run_rsync() {
rsync "$1" "$2" "$3"
[ $? -eq 12 ] && echo -e "\e[0;31mRsync is missing on the remote server!\e[0," && exit 0
}
pull() {
run_rsync "$1" "$3" "$2"
}
push() {
run_rsync "$1" "$2" "$3"
}
sync() {
pull "$1" "$2" "$3"
push "$1" "$2" "$3"
}
case "$1" in
mount) cryfs ~/.vault ~/vault -o allow_root ;;
push|pull|sync) $1 "-aze ssh" "$HOME/.vault" "$REMOTE" ;;
*) echo "Usage: $0 [ push | pull | sync | mount ]" ;;
esac

View File

@ -3,6 +3,8 @@
- name: Add .bat.conf
copy: src=bat.conf dest={{ home }}/.bat.conf owner={{ name }} group={{ group }} mode=0644
when: "'bat' in packages or 'bat' in extra_packages"
- name: Add ~/.local/bin
copy: src=bin dest={{ home }}/.local/bin owner={{ name }} group={{ group }} mode=0755
- name: Install zsh syntax highlighting (~/.zshrc.d folder)
when: not zsh_opt_config

View File

@ -1,6 +1,6 @@
---
- name: Update and upgrade package managed stuff
# when: update
when: update
block:
# - name: Install yay (AUR helper)
@ -24,9 +24,9 @@
when: "'alpine' in group_names"
tags: update alpine
- name: Update and upgrade xbps packages
- name: Update, upgrade and autoremove xbps packages
become: true
shell: xbps-install -Suv
shell: xbps-install -Suv && xbps-remove -ROo
when: package_manager == 'xbps' or 'xbps' in group_names
tags: update
@ -35,6 +35,7 @@
apk:
update_cache: true
upgrade: true
state: 'latest'
when: package_manager == 'apk' or 'apk' in group_names
tags: update
@ -42,6 +43,7 @@
become: true
apt:
update_cache: true
autoremove: true
upgrade: true
when: package_manager == 'apt' or 'apt' in group_names
tags: update

View File

@ -1,8 +1,7 @@
---
- hosts: all
roles:
- role: update
when: update
tags: update
- {role: update, tags: update}
- common
- user
- shell
- shell

24
skyid.ini Normal file
View File

@ -0,0 +1,24 @@
[all:vars]
ansible_ssh_private_key_file=~/.ssh/skyid_rsa
ansible_become_exe=sudo
ansible_user=sivert
[skyid]
smokeping.skyid.no
myrkdalen.skyid.no
lost-islands.skyid.no
monitoring.skyid.no
gulf-of-oman.skyid.no
lofoten.skyid.no
narvik.skyid.no
hangar-22.skyid.no
propaganda.skyid.no
toten.skyid.no
hamar.skyid.no
mercury.skyid.no
bergen.skyid.no
molde.skyid.no
deploy.skyid.no
scrapmetal.skyid.no
dawnbreaker.skyid.no
backup.skyid.no

View File

@ -1,5 +1,5 @@
#!/bin/bash
user="siv"
user="${USER:-"root"}"
function playbook() {
book="${1:-"site.yml"}"
@ -10,22 +10,18 @@ function playbook() {
case "$1" in
play)
book="${2:-"site.yml"}"
# opts=""
# [ ! -z "$3" ] && opts="-t $3"
ansible-playbook "$book" -i docker.ini;;
book="${2:-"site.yml"}"
# opts=""
# [ ! -z "$3" ] && opts="-t $3"
ansible-playbook "$book" -i docker.ini;;
# playbook "$2" "$3";;
kill)
docker kill ansible;;
kill) docker kill ansible;;
run)
docker run --rm --name ansible -id alpine
[ "$?" == "0" ] && docker exec ansible /bin/sh -c "apk update && apk add python3"
ansible -i docker.ini all -m ping;;
zsh)
docker exec -itu "$user" ansible zsh;;
sh)
docker exec -it ansible sh;;
"")echo "Usage: $0 [run|kill|play|sh|{container cmd}]";;
*)
docker exec -itu "$user" ansible "$@";;
zsh) docker exec -itu "$user" ansible zsh;;
*sh) docker exec -it ansible "$1";;
"") echo "Usage: $0 [run|kill|play|zsh|*sh|{container cmd}]";;
*) docker exec -itu "$user" ansible $@;;
esac