View Options

	diff --git a/hotfixes/init.sls b/hotfixes/init.sls
	index 0261adc..ed20c6b 100644
	--- a/hotfixes/init.sls
	+++ b/hotfixes/init.sls
	@@ -1,18 +1,19 @@
	# -------------------------------------------------------------
	# Salt — Hotfixes to mitigate bugs and security issues
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2017-02-27
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	include:
	- .salt
	- .CVE-2017-6074
	- .T1261-srv-data
	- .T1345-drop-jails-from-ysul
	- .MariaDB
	- .leap-seconds
	- .portsnap
	- .python3
	- .old-directories
	+ - .tmux
	diff --git a/hotfixes/tmux.sls b/hotfixes/tmux.sls
	new file mode 100644
	index 0000000..73f7096
	--- /dev/null
	+++ b/hotfixes/tmux.sls
	@@ -0,0 +1,17 @@
	+# -------------------------------------------------------------
	+# Salt — Prune tmux default configuration
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# License: Trivial work, not eligible to copyright
	+# -------------------------------------------------------------
	+
	+# -------------------------------------------------------------
	+# T2029
	+# Don't provision root tmux config as default
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+/etc/tmux.conf:
	+ file.absent
	+
	+/usr/local/etc/tmux.conf:
	+ file.absent
	diff --git a/roles/core/userland-software/base.sls b/roles/core/userland-software/base.sls
	index c3c81ce..8d9702e 100644
	--- a/roles/core/userland-software/base.sls
	+++ b/roles/core/userland-software/base.sls
	@@ -1,133 +1,133 @@
	# -------------------------------------------------------------
	# Salt — Provision software needed by other core roles
	# to deploy on all servers
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% from "map.jinja" import dirs, packages with context %}

	# -------------------------------------------------------------
	# Shells
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	shells:
	pkg.installed:
	- pkgs:
	- bash
	- zsh
	{% if grains['kernel'] == 'Linux' %}
	- tcsh
	{% endif %}

	# Shell utilities
	{% if grains['os'] == 'FreeBSD' %}
	- starship
	{% endif %}

	{% if grains['kernel'] == 'Linux' and grains['osarch'] == 'x86_64' %}
	install_starship:
	cmd.run:
	- name: snap install starship
	- creates: /var/lib/snapd/snap/bin/starship
	{% endif %}

	/usr/local/share/zsh/site-functions/_pm:
	file.managed:
	# At commit 683d331 - 2017-11-05
	- source: https://raw.githubusercontent.com/Angelmmiguel/pm/master/zsh/_pm
	- source_hash: deea33968be713cdbd8385d3a72df2dd09c444e42499531893133f009f0ce0ea
	- makedirs: True

	# -------------------------------------------------------------
	# tmux
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	tmux:
	pkg.installed

	-{{ dirs.etc }}/tmux.conf:
	+/root/.tmux.conf:
	file.managed:
	- source: salt://roles/core/userland-software/files/tmux.conf

	{{ dirs.bin }}/tmux-reattach:
	file.managed:
	- source: salt://roles/core/userland-software/files/tmux-reattach.sh
	- mode: 755

	# -------------------------------------------------------------
	# Python
	#
	# The "python3" package takes care on FreeBSD to create
	# the symbolic link to the relevant Python 3.x version.
	#
	# If Python is implicitly installed instead, it will be
	# a package like python3.9 without the symlink.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	python3:
	pkg.installed

	# -------------------------------------------------------------
	# System administration utilities
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	sysadmin_utilities:
	pkg.installed:
	- pkgs:
	- bat
	- colordiff
	- nano
	- ripgrep
	- tree
	- wget
	{% if grains['os'] == 'FreeBSD' %}
	- gnu-watch
	{% else %}
	- {{ packages.netcat }}
	- net-tools
	{% endif %}
	{% if grains['os_family'] == 'RedHat' %}
	- patch
	- psmisc
	- tar
	{% endif %}

	{% if grains['os'] == 'Debian' %}
	/usr/bin/bat:
	file.symlink:
	- target: /usr/bin/batcat
	{% endif %}

	{% if grains['os'] == 'FreeBSD' %}
	/usr/local/bin/gwatch:
	file.symlink:
	- target: /usr/local/bin/gnu-watch
	{% endif %}

	{% if grains['os_family'] == 'RedHat' %}
	{{ dirs.bin }}/new-partition:
	file.managed:
	- source: salt://roles/core/userland-software/files/new-partition.sh
	- mode: 755
	{% endif %}

	# -------------------------------------------------------------
	# Nano configuration
	#
	# YAML syntax highlighting is only available on newest versions:
	# As checked 2023-04-19, it's not available on Debian and Rocky.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if salt['file.file_exists'](dirs["share"] + "/nano/yaml.nanorc") %}
	nano_sls_support:
	file.replace:
	- name: {{ dirs.share }}/nano/yaml.nanorc
	- pattern: {{ 'syntax yaml "\.ya?ml$"' \| regex_escape }}
	- repl: syntax yaml "\.(ya?ml\|sls)$"
	{% endif %}

	{{ dirs.etc }}/nanorc:
	nano.config_autogenerated:
	- nanorc_dir: {{ dirs.share }}/nano

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 25, 10:41 (1 d, 20 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2257483
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions