Page MenuHomeDevCentral
Files F3586860

D3443.diff
No OneTemporary
Actions

D3443.diff
View Options

diff --git a/hotfixes/init.sls b/hotfixes/init.sls
--- a/hotfixes/init.sls
+++ b/hotfixes/init.sls
@@ -13,5 +13,6 @@
- .T1345-drop-jails-from-ysul
- .MariaDB
- .leap-seconds
+ - .portsnap
- .python3
- .old-directories
diff --git a/hotfixes/portsnap.sls b/hotfixes/portsnap.sls
new file mode 100644
--- /dev/null
+++ b/hotfixes/portsnap.sls
@@ -0,0 +1,24 @@
+# -------------------------------------------------------------
+# Salt — Prune portsnap
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# T2019
+# Don't use portsnap anymore for FreeBSD ports
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{% if grains["os"] == "FreeBSD" %}
+
+/var/db/portsnap:
+ file.absent
+
+/usr/ports/.portsnap.INDEX:
+ file.absent
+
+portsnap:
+ pkg.removed
+
+{% endif %}
diff --git a/roles/core/init.sls b/roles/core/init.sls
--- a/roles/core/init.sls
+++ b/roles/core/init.sls
@@ -16,7 +16,6 @@
- .motd
- .ntp
- .src
- - .ports
- .rsyslog
- .salt
- .sshd
diff --git a/roles/core/ports/init.sls b/roles/core/ports/init.sls
deleted file mode 100644
--- a/roles/core/ports/init.sls
+++ /dev/null
@@ -1,19 +0,0 @@
-# -------------------------------------------------------------
-# Extract FreeBSD ports
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Nasqueron
-# Created: 2020-01-20
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-{% if grains['os'] == 'FreeBSD' %}
-
-portsnap:
- pkg.installed
-
-/usr/ports:
- cmd.run:
- - name: portsnap --interactive fetch extract
- - creates: /usr/ports/Makefile
-
-{% endif %}
diff --git a/roles/core/rc/files/periodic.conf b/roles/core/rc/files/periodic.conf
--- a/roles/core/rc/files/periodic.conf
+++ b/roles/core/rc/files/periodic.conf
@@ -1,6 +1,3 @@
-# 300.calendar
-daily_portsnap_enable="YES"
-
# 480.status-ntpd
daily_status_ntpd_enable="YES"
diff --git a/roles/core/userland-software/files/720.portsnap b/roles/core/userland-software/files/720.portsnap
deleted file mode 100755
--- a/roles/core/userland-software/files/720.portsnap
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# -------------------------------------------------------------
-# Fetch ports
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Nasqueron
-# Author : FreeBSD contributors
-# License: BSD-2-Clause
-# Source file: roles/core/userland-software/files/720.portsnap
-# -------------------------------------------------------------
-#
-# <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>
-# -------------------------------------------------------------
-
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
- . /etc/defaults/periodic.conf
- source_periodic_confs
-fi
-
-case "$daily_portsnap_enable" in
- [Yy][Ee][Ss])
- echo ""
- echo "Running portsnap:"
-
- portsnap auto && rc=0 || rc=3;;
-
- *) rc=0;;
-esac
-
-exit $rc
diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
--- a/roles/core/userland-software/init.sls
+++ b/roles/core/userland-software/init.sls
@@ -63,12 +63,6 @@
- target: /var/lib/snapd/snap
{% endif %}
-{% if grains['os'] == 'FreeBSD' %}
-/etc/periodic/daily/720.portsnap:
- file.managed:
- - source: salt://roles/core/userland-software/files/720.portsnap
-{% endif %}
-
# -------------------------------------------------------------
# Shells
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 14:21 (13 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2155149
Default Alt Text
D3443.diff (3 KB)

Event Timeline

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