[CICD-Pass] Merge 129bedd into master

MTecknology · Jun 26, 2022 · a90d732 · a90d732
2 parents b0d7e27 + 129bedd
commit a90d732
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/states/basics.sls b/states/basics.sls
@@ -5,6 +5,7 @@ base_pkgs:
       - build-essential
       - file
       - git
+      - gnupg
       - lsof
       - net-tools
       - openssh-client

diff --git a/states/teckhost_users/michael.sls b/states/teckhost_users/michael.sls
@@ -13,9 +13,11 @@ teckhost-michael-extras:
       - pylint3
       - python3-pudb
       - python3-flake8
+      - syslinux
       - texlive-latex-base
       - texlive-latex-recommended
       - vagrant
+      - xorriso
       #- virtualbox # TODO: This is pending unstable->stable
       {% endif %}
 
@@ -121,7 +123,7 @@ overflow:
     ('.crypt', 'repos/data/.private/.crypt'),
     ('.dput.cf', 'repos/data/.homedir/.dput.cf'),
     ('.gbp.conf', 'repos/data/.homedir/.gbp.conf'),
-    ('.gnupg/gpg.conf', 'repos/private/.gnupg/gpg.conf'),
+    ('.gnupg/gpg.conf', 'repos/data/.private/.gnupg/gpg.conf'),
     ('.gitconfig', 'repos/data/.homedir/.gitconfig'),
     ('.pass.kdbx', 'crypt/mnt/vault/pass.kdbx'),
     ('.pbuilderrc', 'repos/data/.homedir/.pbuilderrc'),