Merge branch 'builder'

builder/builder-gitconfig

@@ -0,0 +1,16 @@
+[user]
+	name = NAME
+	email = EMAIL
+	signingkey = KEY
+
+[credential]
+	helper = cache
+
+[commit]
+	gpgsign = true
+
+[gpg]
+	program = qubes-gpg-client-wrapper
+
+[alias]
+  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short

builder/builder-split-gpg-config

@@ -0,0 +1 @@
+gpg

builder/clone.sls

@@ -0,0 +1,9 @@
+include:
+  - build.template-fedora-30-minimal
+
+qvm-clone-id:
+  qvm.clone:
+    - require:
+      - sls: build.template-fedora-30-minimal 
+    - name: template-builder
+    - source: fedora-30-minimal

builder/clone.top

@@ -0,0 +1,4 @@
+base:
+  dom0:
+    - match: nodegroup
+    - build.clone

builder/config.sls

@@ -0,0 +1,26 @@
+/home/user/.gitconfig:
+  file.managed:
+    - source:
+      - salt://build/builder-gitconfig
+    - user: user
+    - group: user
+
+/rw/config/gpg-split-domain:
+  file.managed:
+    - source:
+      - salt://build/builder-split-gpg-config
+    - user: root
+    - group: root
+
+/home/user/.rpmmacros:
+  file.managed:
+    - source:
+      - salt://build/builder-rpmmacros
+    - user: user
+    - group: user
+
+https://github.com/QubesOS/qubes-builder.git:
+  git.latest:
+    - name: https://github.com/QubesOS/qubes-builder.git
+    - user: user
+    - target: /home/user/qubes-builder

builder/config.top

@@ -0,0 +1,3 @@
+base:
+  builder:
+    - build.config

builder/create.sls

@@ -0,0 +1,30 @@
+include:
+  - build.clone
+
+qvm-present-id:
+  qvm.present:
+    - name: builder
+    - template: template-builder
+    - label: gray
+
+qvm-prefs-id:
+  qvm.prefs:
+    - name: builder
+    - netvm: tor
+    - memory: 800
+    - maxmem: 8000
+    - vcpus: 4
+
+qvm-features-id:
+  qvm.features:
+    - name: builder
+    - disable:
+      - service.cups
+
+'qvm-volume extend builder:private 20G' :
+  cmd.run
+
+update_file:
+  file.prepend:
+    - name: /etc/qubes-rpc/policy/qubes.Gpg
+    - text: builder gpg allow

builder/create.top

@@ -0,0 +1,4 @@
+base:
+  dom0:
+    - match: nodegroup
+    - build.create

builder/install.sls

@@ -0,0 +1,27 @@
+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+installed:
+  pkg.installed:
+    - pkgs:
+      - qubes-core-agent-networking
+      - qubes-core-agent-passwordless-root
+      - qubes-gpg-split
+      - reprepro
+      - gnupg
+      - git
+      - createrepo
+      - rpm-build
+      - make
+      - wget
+      - rpmdevtools
+      - python2-sh
+      - dialog
+      - rpm-sign
+      - dpkg-dev
+      - debootstrap
+      - PyYAML
+      - devscripts
+      - perl-Digest-MD5
+      - perl-Digest-SHA
+      - createrepo_c
+      - createrepo_c-libs

builder/install.top

@@ -0,0 +1,5 @@
+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+base:
+  template-builder:
+  - build.install

builder/template-fedora-30-minimal.sls

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+##
+# qvm.template-fedora-30-minimal
+# ======================
+#
+# Installs 'fedora-30-minimal' template.
+#
+# Execute:
+#   qubesctl state.sls qvm.template-fedora-30-minimal dom0
+##
+
+template-fedora-30-minimal:
+  pkg.installed:
+    - name:     qubes-template-fedora-30-minimal
+    - fromrepo: qubes-templates-itl