Page MenuHomeDevCentral
Files F3664799

D3498.id9007.diff
No OneTemporary
Actions

D3498.id9007.diff
View Options

diff --git a/pillar/packages/freebsd.sls b/pillar/packages/freebsd.sls
new file mode 100644
--- /dev/null
+++ b/pillar/packages/freebsd.sls
@@ -0,0 +1,15 @@
+# -------------------------------------------------------------
+# Salt configuration for Nasqueron servers
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# Packages :: FreeBSD
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+nasqueron_packages_freebsd:
+ ABI:
+ - FreeBSD:13:amd64
+ - FreeBSD:14:amd64
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -72,5 +72,6 @@
- devserver.ports
- devserver.repos
- observability.prometheus
+ - packages.freebsd
- webserver.labs
- webserver.wwwroot51
diff --git a/roles/core/userland-software/files/Nasqueron.conf b/roles/core/userland-software/files/Nasqueron.conf
--- a/roles/core/userland-software/files/Nasqueron.conf
+++ b/roles/core/userland-software/files/Nasqueron.conf
@@ -13,7 +13,6 @@
# -------------------------------------------------------------
Nasqueron: {
- url: "pkg+https://packages.nasqueron.org/freebsd",
- mirror_type: "srv",
+ url: "https://packages.nasqueron.org/freebsd/${ABI}/",
enabled: yes
}
diff --git a/roles/freebsd-repo/repo/files/Makefile b/roles/freebsd-repo/repo/files/Makefile
--- a/roles/freebsd-repo/repo/files/Makefile
+++ b/roles/freebsd-repo/repo/files/Makefile
@@ -13,7 +13,7 @@
# and will be lost if the state is redeployed.
# </auto-generated>
-METADATA=digests.txz meta.txz packagesite.txz
+METADATA=digests.txz meta meta.conf meta.txz packagesite.pkg packagesite.txz data.pkg data.txz
# -------------------------------------------------------------
# Main targets
diff --git a/roles/freebsd-repo/repo/init.sls b/roles/freebsd-repo/repo/init.sls
--- a/roles/freebsd-repo/repo/init.sls
+++ b/roles/freebsd-repo/repo/init.sls
@@ -16,10 +16,18 @@
- makedirs: True
- user: builder
-{{ repo.repo_dir }}/Makefile:
+{% for ABI in pillar["nasqueron_packages_freebsd"]["ABI"] %}
+
+"{{ repo.repo_dir }}/{{ ABI }}":
+ file.directory:
+ - user: builder
+
+"{{ repo.repo_dir }}/{{ ABI }}/Makefile":
file.managed:
- source: salt://roles/freebsd-repo/repo/files/Makefile
+{% endfor %}
+
# -------------------------------------------------------------
# Signature tool
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 18, 13:42 (7 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2201182
Default Alt Text
D3498.id9007.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator