D3954.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3954.diff
View Options

	diff --git a/map.jinja b/map.jinja
	--- a/map.jinja
	+++ b/map.jinja
	@@ -135,7 +135,6 @@
	'tdom': 'tdom',
	'varnish': 'varnish',
	'verbiste': 'verbiste',
	- 'youtube-dl': 'youtube-dl',
	'yubico-pam': 'libpam-yubico',
	},
	'RedHat': {
	@@ -161,7 +160,6 @@
	'tcl': 'tcl',
	'tcltls': 'tcltls',
	'varnish': 'varnish',
	- 'youtube-dl': 'youtube-dl',
	'yubico-pam': 'pam_yubico',
	},
	'Arch': {
	@@ -174,7 +172,6 @@
	'sphinx': 'python-sphinx',
	'tcltls': 'tcltls',
	'varnish': 'varnish',
	- 'youtube-dl': 'youtube-dl',
	'yubico-pam': 'yubico-pam',
	},
	'FreeBSD' : {
	@@ -211,7 +208,6 @@
	'tdom': 'tDOM',
	'varnish': 'varnish5',
	'verbiste': 'fr-verbiste',
	- 'youtube-dl': 'youtube_dl',
	'yubico-pam': 'pam_yubico',
	},
	}, default='Debian') %}
	diff --git a/roles/viperserv/software/init.sls b/roles/viperserv/software/init.sls
	--- a/roles/viperserv/software/init.sls
	+++ b/roles/viperserv/software/init.sls
	@@ -6,8 +6,6 @@
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	-{% from "map.jinja" import packages with context %}
	-
	# -------------------------------------------------------------
	# Software used by Dæghrefn
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	@@ -17,7 +15,7 @@
	- pkgs:
	- tcl-Trf
	- tcludp
	- - {{ packages['youtube-dl'] }}
	+ - yt-dlp

	# Dæghrefn also need php, ps, grep
	# Gerrit code needs ssh, ssh-agent and ssh-add