Skip to content

Commit

Permalink
Whonix for R2 templates
Browse files Browse the repository at this point in the history
  • Loading branch information
marmarek committed May 18, 2015
1 parent f6a67e7 commit 89eacc2
Show file tree
Hide file tree
Showing 4 changed files with 408 additions and 0 deletions.
107 changes: 107 additions & 0 deletions R2/templates-community/whonix-gw-experimental-3.0.2-201505180340.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
GIT_PREFIX = QubesOS/qubes-

DIST_DOM0 =

DISTS_VM := whonix-gateway

GIT_BASEURL ?= https://github.com
GIT_PREFIX ?= QubesOS/qubes-

BACKEND_VMM=xen

COMPONENTS = \
vmm-xen \
core-vchan-xen \
linux-utils \
core-agent-linux \
gui-common \
gui-agent-linux \
app-linux-split-gpg \
app-thunderbird \
app-linux-pdf-converter \
linux-template-builder \
builder \
builder-debian \
template-whonix

BUILDER_PLUGINS =
BUILDER_PLUGINS += builder-debian
BUILDER_PLUGINS += template-whonix

BRANCH = release2
BRANCH_linux_template_builder = master
BRANCH_app_linux_split_gpg = master
BRANCH_app_linux_tor = master
BRANCH_app_thunderbird = master
BRANCH_app_linux_pdf_converter = master
BRANCH_builder = master
BRANCH_builder_fedora = master
BRANCH_builder_debian = master
BRANCH_vmm_xen = xen-4.1

GIT_URL_template_whonix = $(GIT_BASEURL)/nrgaway/qubes-template-whonix.git
BRANCH_template_whonix = Whonix10

TEMPLATE_FLAVOR_DIR :=
TEMPLATE_FLAVOR_DIR += +gnome:$$SCRIPTSDIR/gnome
TEMPLATE_FLAVOR_DIR += +flash:$$SCRIPTSDIR/flash
TEMPLATE_FLAVOR_DIR += +desktop:$$SCRIPTSDIR/desktop

TEMPLATE_ALIAS += whonix-gateway:wheezy+whonix-gateway+standard
#TEMPLATE_ALIAS += whonix-gateway+minimal:wheezy+whonix-gateway+minimal
TEMPLATE_ALIAS += whonix-workstation:wheezy+whonix-workstation+standard
TEMPLATE_ALIAS += whonix-workstation+gnome:wheezy+whonix-workstation+standard+gnome

TEMPLATE_LABEL += wheezy+whonix-gateway+standard:whonix-gw-experimental
#TEMPLATE_LABEL += wheezy+whonix-gateway+minimal:whonix-gw-experimental-minimal
TEMPLATE_LABEL += wheezy+whonix-workstation+standard:whonix-ws
TEMPLATE_LABEL += wheezy+whonix-workstation+standard+gnome:whonix-ws-gnome

# Qubes-builder deps
DEPENDENCIES := git rpmdevtools rpm-build createrepo

# Additional for debian template
DEPENDENCIES += debootstrap dpkg-dev

DEBIAN_MIRRORS = http://ftp.us.debian.org/debian/

VERBOSE=2

BUILDER_TURBO_MODE = 1
TERM = dumb

################################################################################
### The following settings copied to builder.conf will make builder use ###
### exactly the same sources ###
################################################################################
BRANCH_Whonix = 10.0.0.5.5-stable
BRANCH_app_linux_pdf_converter = v2.0.3
BRANCH_app_linux_split_gpg = v2.0.11
BRANCH_app_thunderbird = v1.2.7
BRANCH_builder = 4db8571eaf46f91587a6c8c0057cd7180e536d7e
BRANCH_builder_debian = cda55df09976b3dc3644e065f04f49c296e8bdf5
BRANCH_core_agent_linux = v2.1.61
BRANCH_core_vchan_xen = v2.2.11
BRANCH_genmkfile = 1.7-1
BRANCH_gui_agent_linux = v2.1.34
BRANCH_gui_common = v2.0.4
BRANCH_linux_template_builder = v3.0.2
BRANCH_linux_utils = v2.0.20
BRANCH_qubes_whonix = 10.0.5-1
BRANCH_template_whonix = be91370c788925d6dd86a4c0f3ef7e81677cb7f2
BRANCH_vmm_xen = v4.1.6.1-22


import-whonix-keys:
if ! [ -d "$(KEYRING_DIR_GIT)" ]; then \
export GNUPGHOME="$(KEYRING_DIR_GIT)"; \
scripts/verify-git-tag; \
gpg --keyserver pgp.mit.edu --recv-key E0E32283FDCAC1A510078F271BB9B1FB5A4C6DAD || exit 1; \
echo 'E0E32283FDCAC1A510078F271BB9B1FB5A4C6DAD:6:' | gpg --import-ownertrust; \
gpg --keyserver pgp.mit.edu --recv-key 916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA || exit 1; \
echo '916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA:6:' | gpg --import-ownertrust; \
fi

get-sources:: import-whonix-keys

# vim: ft=makefile
107 changes: 107 additions & 0 deletions R2/templates-community/whonix-ws-3.0.2-201505180707.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
GIT_PREFIX = QubesOS/qubes-

DIST_DOM0 =

DISTS_VM := whonix-workstation

GIT_BASEURL ?= https://github.com
GIT_PREFIX ?= QubesOS/qubes-

BACKEND_VMM=xen

COMPONENTS = \
vmm-xen \
core-vchan-xen \
linux-utils \
core-agent-linux \
gui-common \
gui-agent-linux \
app-linux-split-gpg \
app-thunderbird \
app-linux-pdf-converter \
linux-template-builder \
builder \
builder-debian \
template-whonix

BUILDER_PLUGINS =
BUILDER_PLUGINS += builder-debian
BUILDER_PLUGINS += template-whonix

BRANCH = release2
BRANCH_linux_template_builder = master
BRANCH_app_linux_split_gpg = master
BRANCH_app_linux_tor = master
BRANCH_app_thunderbird = master
BRANCH_app_linux_pdf_converter = master
BRANCH_builder = master
BRANCH_builder_fedora = master
BRANCH_builder_debian = master
BRANCH_vmm_xen = xen-4.1

GIT_URL_template_whonix = $(GIT_BASEURL)/nrgaway/qubes-template-whonix.git
BRANCH_template_whonix = Whonix10

TEMPLATE_FLAVOR_DIR :=
TEMPLATE_FLAVOR_DIR += +gnome:$$SCRIPTSDIR/gnome
TEMPLATE_FLAVOR_DIR += +flash:$$SCRIPTSDIR/flash
TEMPLATE_FLAVOR_DIR += +desktop:$$SCRIPTSDIR/desktop

TEMPLATE_ALIAS += whonix-gateway:wheezy+whonix-gateway+standard
#TEMPLATE_ALIAS += whonix-gateway+minimal:wheezy+whonix-gateway+minimal
TEMPLATE_ALIAS += whonix-workstation:wheezy+whonix-workstation+standard
TEMPLATE_ALIAS += whonix-workstation+gnome:wheezy+whonix-workstation+standard+gnome

TEMPLATE_LABEL += wheezy+whonix-gateway+standard:whonix-gw-experimental
#TEMPLATE_LABEL += wheezy+whonix-gateway+minimal:whonix-gw-experimental-minimal
TEMPLATE_LABEL += wheezy+whonix-workstation+standard:whonix-ws
TEMPLATE_LABEL += wheezy+whonix-workstation+standard+gnome:whonix-ws-gnome

# Qubes-builder deps
DEPENDENCIES := git rpmdevtools rpm-build createrepo

# Additional for debian template
DEPENDENCIES += debootstrap dpkg-dev

DEBIAN_MIRRORS = http://ftp.us.debian.org/debian/

VERBOSE=2

BUILDER_TURBO_MODE = 1
TERM = dumb

################################################################################
### The following settings copied to builder.conf will make builder use ###
### exactly the same sources ###
################################################################################
BRANCH_Whonix = 10.0.0.5.5-stable
BRANCH_app_linux_pdf_converter = v2.0.3
BRANCH_app_linux_split_gpg = v2.0.11
BRANCH_app_thunderbird = v1.2.7
BRANCH_builder = 4db8571eaf46f91587a6c8c0057cd7180e536d7e
BRANCH_builder_debian = cda55df09976b3dc3644e065f04f49c296e8bdf5
BRANCH_core_agent_linux = v2.1.61
BRANCH_core_vchan_xen = v2.2.11
BRANCH_genmkfile = 1.7-1
BRANCH_gui_agent_linux = v2.1.34
BRANCH_gui_common = v2.0.4
BRANCH_linux_template_builder = v3.0.2
BRANCH_linux_utils = v2.0.20
BRANCH_qubes_whonix = 10.0.5-1
BRANCH_template_whonix = be91370c788925d6dd86a4c0f3ef7e81677cb7f2
BRANCH_vmm_xen = v4.1.6.1-22


import-whonix-keys:
if ! [ -d "$(KEYRING_DIR_GIT)" ]; then \
export GNUPGHOME="$(KEYRING_DIR_GIT)"; \
scripts/verify-git-tag; \
gpg --keyserver pgp.mit.edu --recv-key E0E32283FDCAC1A510078F271BB9B1FB5A4C6DAD || exit 1; \
echo 'E0E32283FDCAC1A510078F271BB9B1FB5A4C6DAD:6:' | gpg --import-ownertrust; \
gpg --keyserver pgp.mit.edu --recv-key 916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA || exit 1; \
echo '916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA:6:' | gpg --import-ownertrust; \
fi

get-sources:: import-whonix-keys

# vim: ft=makefile
106 changes: 106 additions & 0 deletions R2/templates-community/whonix-ws-gnome-3.0.2-201505181120.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
GIT_PREFIX = QubesOS/qubes-

DIST_DOM0 =

DISTS_VM := whonix-workstation+gnome

GIT_BASEURL ?= https://github.com
GIT_PREFIX ?= QubesOS/qubes-

BACKEND_VMM=xen

COMPONENTS = \
vmm-xen \
core-vchan-xen \
linux-utils \
core-agent-linux \
gui-common \
gui-agent-linux \
app-linux-split-gpg \
app-thunderbird \
app-linux-pdf-converter \
linux-template-builder \
builder \
builder-debian \
template-whonix

BUILDER_PLUGINS =
BUILDER_PLUGINS += builder-debian
BUILDER_PLUGINS += template-whonix

BRANCH = release2
BRANCH_linux_template_builder = master
BRANCH_app_linux_split_gpg = master
BRANCH_app_linux_tor = master
BRANCH_app_thunderbird = master
BRANCH_app_linux_pdf_converter = master
BRANCH_builder = master
BRANCH_builder_fedora = master
BRANCH_builder_debian = master
BRANCH_vmm_xen = xen-4.1

GIT_URL_template_whonix = $(GIT_BASEURL)/nrgaway/qubes-template-whonix.git
BRANCH_template_whonix = Whonix10

TEMPLATE_FLAVOR_DIR :=
TEMPLATE_FLAVOR_DIR += +gnome:$$SCRIPTSDIR/gnome
TEMPLATE_FLAVOR_DIR += +flash:$$SCRIPTSDIR/flash
TEMPLATE_FLAVOR_DIR += +desktop:$$SCRIPTSDIR/desktop

TEMPLATE_ALIAS += whonix-gateway:wheezy+whonix-gateway+standard
#TEMPLATE_ALIAS += whonix-gateway+minimal:wheezy+whonix-gateway+minimal
TEMPLATE_ALIAS += whonix-workstation:wheezy+whonix-workstation+standard
TEMPLATE_ALIAS += whonix-workstation+gnome:wheezy+whonix-workstation+standard+gnome

TEMPLATE_LABEL += wheezy+whonix-gateway+standard:whonix-gw-experimental
#TEMPLATE_LABEL += wheezy+whonix-gateway+minimal:whonix-gw-experimental-minimal
TEMPLATE_LABEL += wheezy+whonix-workstation+standard:whonix-ws
TEMPLATE_LABEL += wheezy+whonix-workstation+standard+gnome:whonix-ws-gnome

# Qubes-builder deps
DEPENDENCIES := git rpmdevtools rpm-build createrepo

# Additional for debian template
DEPENDENCIES += debootstrap dpkg-dev

DEBIAN_MIRRORS = http://ftp.us.debian.org/debian/

VERBOSE=2

BUILDER_TURBO_MODE = 1
TERM = dumb

################################################################################
### The following settings copied to builder.conf will make builder use ###
### exactly the same sources ###
################################################################################
BRANCH_Whonix = 10.0.0.5.5-stable
BRANCH_app_linux_pdf_converter = v2.0.3
BRANCH_app_linux_split_gpg = v2.0.11
BRANCH_app_thunderbird = v1.2.7
BRANCH_builder = 4db8571eaf46f91587a6c8c0057cd7180e536d7e
BRANCH_builder_debian = cda55df09976b3dc3644e065f04f49c296e8bdf5
BRANCH_core_agent_linux = v2.1.61
BRANCH_core_vchan_xen = v2.2.11
BRANCH_genmkfile = 1.7-1
BRANCH_gui_agent_linux = v2.1.34
BRANCH_gui_common = v2.0.4
BRANCH_linux_template_builder = v3.0.2
BRANCH_linux_utils = v2.0.20
BRANCH_qubes_whonix = 10.0.5-1
BRANCH_template_whonix = be91370c788925d6dd86a4c0f3ef7e81677cb7f2
BRANCH_vmm_xen = v4.1.6.1-22

import-whonix-keys:
if ! [ -d "$(KEYRING_DIR_GIT)" ]; then \
export GNUPGHOME="$(KEYRING_DIR_GIT)"; \
scripts/verify-git-tag; \
gpg --keyserver pgp.mit.edu --recv-key E0E32283FDCAC1A510078F271BB9B1FB5A4C6DAD || exit 1; \
echo 'E0E32283FDCAC1A510078F271BB9B1FB5A4C6DAD:6:' | gpg --import-ownertrust; \
gpg --keyserver pgp.mit.edu --recv-key 916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA || exit 1; \
echo '916B8D99C38EAF5E8ADC7A2A8D66066A2EEACCDA:6:' | gpg --import-ownertrust; \
fi

get-sources:: import-whonix-keys

# vim: ft=makefile

0 comments on commit 89eacc2

Please sign in to comment.