Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F7484401
D3480.id8973.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D3480.id8973.diff
View Options
diff --git a/pillar/devserver/ports.sls b/pillar/devserver/ports.sls
--- a/pillar/devserver/ports.sls
+++ b/pillar/devserver/ports.sls
@@ -151,3 +151,11 @@
category: www
name: npm
creates: /usr/local/bin/npm
+
+# -------------------------------------------------------------
+# Poudriere
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+poudriere:
+ zfs_pool: arcology
+ tmpfs: wrkdir
diff --git a/roles/devserver/init.sls b/roles/devserver/init.sls
--- a/roles/devserver/init.sls
+++ b/roles/devserver/init.sls
@@ -13,5 +13,6 @@
- .pkg
- .userland-software
- .userland-home
+ - .poudriere
- .webserver-home
- .webserver-wwwroot51
diff --git a/roles/devserver/poudriere/config.sls b/roles/devserver/poudriere/config.sls
new file mode 100644
--- /dev/null
+++ b/roles/devserver/poudriere/config.sls
@@ -0,0 +1,19 @@
+# -------------------------------------------------------------
+# Poudriere
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% from "map.jinja" import dirs with context %}
+
+# -------------------------------------------------------------
+# General configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.etc }}/poudriere.conf:
+ file.managed:
+ - source: salt://roles/devserver/poudriere/files/poudriere.conf
+ - template: jinja
+ - context:
+ poudriere: {{ pillar["poudriere"] }}
diff --git a/roles/devserver/poudriere/files/poudriere.conf b/roles/devserver/poudriere/files/poudriere.conf
new file mode 100644
--- /dev/null
+++ b/roles/devserver/poudriere/files/poudriere.conf
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------
+# Poudriere configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/devserver/poudriere/files/poudriere.conf
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+ZPOOL={{ poudriere.zfs_pool }}
+
+FREEBSD_HOST=https://download.FreeBSD.org
+
+RESOLV_CONF=/etc/resolv.conf
+
+BASEFS=/usr/local/poudriere
+DISTFILES_CACHE=/usr/ports/distfiles
+
+USE_PORTLINT=yes
+
+# -------------------------------------------------------------
+# RAM usage - tmpfs
+#
+# "yes" = "wrkdir" + "data"
+# wrkdir - Use tmpfs(5) for port building WRKDIRPREFIX
+# data - Use tmpfs(5) for poudriere cache/temp build data
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+USE_TMPFS={{ poudriere.tmpfs }}
diff --git a/roles/devserver/init.sls b/roles/devserver/poudriere/init.sls
copy from roles/devserver/init.sls
copy to roles/devserver/poudriere/init.sls
--- a/roles/devserver/init.sls
+++ b/roles/devserver/poudriere/init.sls
@@ -1,17 +1,11 @@
# -------------------------------------------------------------
-# Salt — Provision a development server
+# Poudriere
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Created: 2017-10-20
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- - .datacube
- - .dns
- - .mail
- - .pkg
- - .userland-software
- - .userland-home
- - .webserver-home
- - .webserver-wwwroot51
+ - software
+ - config
+ - jails
diff --git a/roles/devserver/poudriere/jails.sls b/roles/devserver/poudriere/jails.sls
new file mode 100644
--- /dev/null
+++ b/roles/devserver/poudriere/jails.sls
@@ -0,0 +1,43 @@
+#!py
+
+# -------------------------------------------------------------
+# Poudriere :: Jails
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: BSD-2-Clause
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# Data helper methods
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+def get_kernel_version():
+ # "14.1-RELEASE-p5" -> "14.1-RELEASE"
+ return "-".join(__grains__["kernelrelease"].split("-")[0:2])
+
+
+# -------------------------------------------------------------
+# Configuration provider
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+def run():
+ major = __grains__["osmajorrelease"]
+ version = get_kernel_version()
+ arch = __grains__["cpuarch"]
+
+ return {
+ "poudriere_jails_base": {
+ "cmd.run": [
+ {"name": f"poudriere jail -c -j base{major} -v {version} -a {arch}"},
+ {"creates": f"/usr/local/poudriere/jails/base{major}"},
+ ]
+ },
+ "poudriere_ports": {
+ "cmd.run": [
+ {"name": "poudriere ports -c -m git+https -B main"},
+ {"creates": "/usr/local/poudriere/ports/default"},
+ ]
+ },
+ }
diff --git a/roles/devserver/init.sls b/roles/devserver/poudriere/software.sls
copy from roles/devserver/init.sls
copy to roles/devserver/poudriere/software.sls
--- a/roles/devserver/init.sls
+++ b/roles/devserver/poudriere/software.sls
@@ -1,17 +1,9 @@
# -------------------------------------------------------------
-# Salt — Provision a development server
+# Poudriere
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Created: 2017-10-20
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .datacube
- - .dns
- - .mail
- - .pkg
- - .userland-software
- - .userland-home
- - .webserver-home
- - .webserver-wwwroot51
+poudriere:
+ pkg.installed
diff --git a/roles/devserver/userland-software/misc.sls b/roles/devserver/userland-software/misc.sls
--- a/roles/devserver/userland-software/misc.sls
+++ b/roles/devserver/userland-software/misc.sls
@@ -69,7 +69,6 @@
- portmaster
- portshaker
- porttools
- - poudriere
- portsearch
portsearch_database:
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Apr 28, 12:51 (12 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2612152
Default Alt Text
D3480.id8973.diff (6 KB)
Attached To
Mode
D3480: Install Poudriere on devserver role
Attached
Detach File
Event Timeline
Log In to Comment