D2261.diff
No OneTemporary
Actions

Size

36 KB

Referenced Files

None

Subscribers

None

D2261.diff
View Options

	diff --git a/pillar/certificates/certificates.sls b/pillar/certificates/certificates.sls
	--- a/pillar/certificates/certificates.sls
	+++ b/pillar/certificates/certificates.sls
	@@ -8,7 +8,7 @@

	# -------------------------------------------------------------
	# Certificates
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	certificates_letsencrypt:
	eglide:
	diff --git a/pillar/nodes/forests.sls b/pillar/nodes/forests.sls
	--- a/pillar/nodes/forests.sls
	+++ b/pillar/nodes/forests.sls
	@@ -11,7 +11,7 @@

	# -------------------------------------------------------------
	# Table of contents
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	#
	# :: Forests
	# :: Shell groups
	diff --git a/roles/builder/account/init.sls b/roles/builder/account/init.sls
	--- a/roles/builder/account/init.sls
	+++ b/roles/builder/account/init.sls
	@@ -11,7 +11,7 @@

	# -------------------------------------------------------------
	# Service account
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	builder_account:
	user.present:
	@@ -25,7 +25,7 @@
	# Sudo capabilities
	#
	# Members of deployment should be able to sudo -u builder …
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	builder_sudo_capabilities_file:
	file.managed:
	diff --git a/roles/core/hostname/init.sls b/roles/core/hostname/init.sls
	--- a/roles/core/hostname/init.sls
	+++ b/roles/core/hostname/init.sls
	@@ -9,7 +9,7 @@

	# -------------------------------------------------------------
	# Store hostname into a configuration file
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/etc/hostname:
	file.managed:
	@@ -18,7 +18,7 @@

	# -------------------------------------------------------------
	# When the hostname is changed, what to run afterwards?
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	after_hostname_change:
	cmd.run:
	diff --git a/roles/core/sshd/init.sls b/roles/core/sshd/init.sls
	--- a/roles/core/sshd/init.sls
	+++ b/roles/core/sshd/init.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# OpenSSH
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/etc/ssh/sshd_config:
	file.managed:
	@@ -22,7 +22,7 @@

	# -------------------------------------------------------------
	# PAM
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	# T1194 - Debian offers a nologin pam module avoiding people
	# to log in when /run/nologin exists. OS can pop this file,
	diff --git a/roles/core/sudo/init.sls b/roles/core/sudo/init.sls
	--- a/roles/core/sudo/init.sls
	+++ b/roles/core/sudo/init.sls
	@@ -12,7 +12,7 @@
	# Sudo capabilities
	#
	# Ops should be able to sudo …
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/sudoers.d/ops:
	file.managed:
	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
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Software sources
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if grains['os'] == 'CentOS' %}
	epel-release:
	@@ -43,7 +43,7 @@

	# -------------------------------------------------------------
	# Shells
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	shells:
	pkg.installed:
	@@ -75,7 +75,7 @@

	# -------------------------------------------------------------
	# tmux
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	tmux:
	pkg.installed
	@@ -86,7 +86,7 @@

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

	sysadmin_utilities:
	pkg.installed:
	diff --git a/roles/core/users/init.sls b/roles/core/users/init.sls
	--- a/roles/core/users/init.sls
	+++ b/roles/core/users/init.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Table of contents
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	#
	# :: Disabled accounts
	# :: ZFS (before user account creation)
	@@ -28,7 +28,7 @@

	# -------------------------------------------------------------
	# Disabled accounts
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for username in pillar.get('revokedusers') %}
	{{ username }}:
	@@ -41,7 +41,7 @@
	# Where ZFS is available, home directories are created as separate
	# datasets. That has several benefits, like allowing users to create
	# snapshots or manage backups.
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if zfs_tank %}
	zfs_home_permissions_sets:
	@@ -79,7 +79,7 @@

	# -------------------------------------------------------------
	# Active accounts
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for username, user in users.items() %}
	{{ username }}:
	@@ -92,7 +92,7 @@

	# -------------------------------------------------------------
	# Groups
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for groupname, group in salt['forest.get_groups']().items() %}
	group_{{ groupname }}:
	@@ -104,7 +104,7 @@

	# -------------------------------------------------------------
	# SSH keys
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for username, user in users.items() %}

	diff --git a/roles/devserver/userland-home/files/dereckson/.zshrc b/roles/devserver/userland-home/files/dereckson/.zshrc
	--- a/roles/devserver/userland-home/files/dereckson/.zshrc
	+++ b/roles/devserver/userland-home/files/dereckson/.zshrc
	@@ -8,7 +8,7 @@

	# -------------------------------------------------------------
	# Table of contents
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	#
	# :: Completions
	# :: History
	diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls
	--- a/roles/devserver/userland-software/dev.sls
	+++ b/roles/devserver/userland-software/dev.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# C/C++
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_c:
	pkg.installed:
	@@ -21,7 +21,7 @@

	# -------------------------------------------------------------
	# Java
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_java:
	pkg.installed:
	@@ -32,7 +32,7 @@

	# -------------------------------------------------------------
	# .Net languages
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_dotnet:
	pkg.installed:
	@@ -41,7 +41,7 @@

	# -------------------------------------------------------------
	# Node
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_node:
	pkg.installed:
	@@ -67,7 +67,7 @@

	# -------------------------------------------------------------
	# PHP
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_php:
	pkg.installed:
	@@ -76,7 +76,7 @@

	# -------------------------------------------------------------
	# Python
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_python:
	pkg.installed:
	@@ -91,7 +91,7 @@

	# -------------------------------------------------------------
	# Ruby
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_ruby:
	pkg.installed:
	@@ -100,7 +100,7 @@

	# -------------------------------------------------------------
	# Rust
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_rust:
	pkg.installed:
	@@ -109,7 +109,7 @@

	# -------------------------------------------------------------
	# Shell
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_shell:
	pkg.installed:
	@@ -118,7 +118,7 @@

	# -------------------------------------------------------------
	# TCL
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_tcl:
	pkg.installed:
	@@ -131,7 +131,7 @@

	# -------------------------------------------------------------
	# Web development
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_web:
	pkg.installed:
	@@ -142,7 +142,7 @@
	# Tools like code review utilities
	#
	# Arcanist is installed in the Phabricator states
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	devserver_software_dev_misctools:
	pkg.installed:
	diff --git a/roles/paas-docker/docker/config.sls b/roles/paas-docker/docker/config.sls
	--- a/roles/paas-docker/docker/config.sls
	+++ b/roles/paas-docker/docker/config.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Configure lvm profile
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if grains['id'] in pillar['docker_daemon'] %}

	diff --git a/roles/paas-docker/docker/firewall.sls b/roles/paas-docker/docker/firewall.sls
	--- a/roles/paas-docker/docker/firewall.sls
	+++ b/roles/paas-docker/docker/firewall.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Firewalld
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if services['firewall'] == 'firewalld' %}

	diff --git a/roles/paas-docker/docker/images.sls b/roles/paas-docker/docker/images.sls
	--- a/roles/paas-docker/docker/images.sls
	+++ b/roles/paas-docker/docker/images.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Fetch Docker images
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for image in images %}
	{{ image }}:
	diff --git a/roles/paas-docker/docker/software.sls b/roles/paas-docker/docker/software.sls
	--- a/roles/paas-docker/docker/software.sls
	+++ b/roles/paas-docker/docker/software.sls
	@@ -8,7 +8,7 @@

	# -------------------------------------------------------------
	# Install Docker engine
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if grains['os'] == 'CentOS' %}
	remove_legacy_docker_packages:
	@@ -41,7 +41,7 @@

	# -------------------------------------------------------------
	# Service
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	start_docker_service:
	service.running:
	@@ -50,7 +50,7 @@

	# -------------------------------------------------------------
	# Additional utilities
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	install_docker_extra_packages:
	pkg.installed:
	diff --git a/roles/paas-docker/docker/storage.sls b/roles/paas-docker/docker/storage.sls
	--- a/roles/paas-docker/docker/storage.sls
	+++ b/roles/paas-docker/docker/storage.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Configure lvm profile
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if grains['id'] in pillar['docker_devicemapper'] %}

	diff --git a/roles/paas-docker/nginx/config.sls b/roles/paas-docker/nginx/config.sls
	--- a/roles/paas-docker/nginx/config.sls
	+++ b/roles/paas-docker/nginx/config.sls
	@@ -13,7 +13,7 @@
	# Base folder
	#
	# :: general configuration
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/nginx.conf:
	file.managed:
	@@ -29,7 +29,7 @@
	#
	# :: general configuration
	# :: application-specific code
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/includes:
	file.recurse:
	@@ -43,7 +43,7 @@
	# :: fallback when a domain isn't found
	# :: server cover page
	# :: containers
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/vhosts:
	file.directory:
	diff --git a/roles/paas-lxc/lxc/init.sls b/roles/paas-lxc/lxc/init.sls
	--- a/roles/paas-lxc/lxc/init.sls
	+++ b/roles/paas-lxc/lxc/init.sls
	@@ -8,7 +8,7 @@

	# -------------------------------------------------------------
	# Software
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	lxc_packages:
	pkg.installed:
	diff --git a/roles/saas-mediawiki/nginx/config.sls b/roles/saas-mediawiki/nginx/config.sls
	--- a/roles/saas-mediawiki/nginx/config.sls
	+++ b/roles/saas-mediawiki/nginx/config.sls
	@@ -11,7 +11,7 @@
	# includes folder
	#
	# :: MediaWiki and SaaS location blocks
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/includes:
	file.recurse:
	@@ -24,7 +24,7 @@

	# -------------------------------------------------------------
	# vhosts folder
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/vhosts:
	file.recurse:
	diff --git a/roles/saltmaster/account/init.sls b/roles/saltmaster/account/init.sls
	--- a/roles/saltmaster/account/init.sls
	+++ b/roles/saltmaster/account/init.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Accounts
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	# Salt account
	salt_account:
	@@ -41,7 +41,7 @@

	# -------------------------------------------------------------
	# Directories
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/opt/salt:
	file.directory
	@@ -56,7 +56,7 @@
	#
	# - alken-orin account on GitHub
	# Credentials are stored in DevCentral passphrase application
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/opt/salt/security:
	file.directory:
	@@ -75,7 +75,7 @@
	#
	# Ops should be able to sudo -u salt …
	# Deployers should be able to sudo -u deploy <anything>
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for sudofile in ['salt', 'deploy'] %}
	saltmaster_sudo_capabilities_{{ sudofile }}:
	diff --git a/roles/saltmaster/cloud/init.sls b/roles/saltmaster/cloud/init.sls
	--- a/roles/saltmaster/cloud/init.sls
	+++ b/roles/saltmaster/cloud/init.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Providers
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	saltmaster_cloud_providers:
	file.recurse:
	diff --git a/roles/shellserver/bonjour-chaton/account.sls b/roles/shellserver/bonjour-chaton/account.sls
	--- a/roles/shellserver/bonjour-chaton/account.sls
	+++ b/roles/shellserver/bonjour-chaton/account.sls
	@@ -9,7 +9,7 @@

	# -------------------------------------------------------------
	# Service account
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	bonjour_chaton_account:
	user.present:
	@@ -23,7 +23,7 @@
	# Sudo capabilities
	#
	# Members of bonjour-chaton-dev should be able to sudo -u bonjour_chaton …
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	bonjour_chaton_sudo_capabilities_file:
	file.managed:
	diff --git a/roles/shellserver/database/mysql.sls b/roles/shellserver/database/mysql.sls
	--- a/roles/shellserver/database/mysql.sls
	+++ b/roles/shellserver/database/mysql.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Software
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	mysql:
	pkg.installed:
	diff --git a/roles/shellserver/database/pgsql.sls b/roles/shellserver/database/pgsql.sls
	--- a/roles/shellserver/database/pgsql.sls
	+++ b/roles/shellserver/database/pgsql.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Software
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	postgresql:
	pkg.installed:
	diff --git a/roles/shellserver/odderon/account.sls b/roles/shellserver/odderon/account.sls
	--- a/roles/shellserver/odderon/account.sls
	+++ b/roles/shellserver/odderon/account.sls
	@@ -11,7 +11,7 @@

	# -------------------------------------------------------------
	# Service account
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	odderon_account:
	user.present:
	@@ -25,7 +25,7 @@
	# Sudo capabilities
	#
	# Members of nasqueron-irc should be able to sudo -u odderon …
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	odderon_sudo_capabilities_file:
	file.managed:
	diff --git a/roles/shellserver/odderon/config.sls b/roles/shellserver/odderon/config.sls
	--- a/roles/shellserver/odderon/config.sls
	+++ b/roles/shellserver/odderon/config.sls
	@@ -9,7 +9,7 @@

	# -------------------------------------------------------------
	# File permissions and ownership
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	odderon_fix_permissions_and_ownership:
	file.managed:
	diff --git a/roles/shellserver/odderon/service.sls b/roles/shellserver/odderon/service.sls
	--- a/roles/shellserver/odderon/service.sls
	+++ b/roles/shellserver/odderon/service.sls
	@@ -11,7 +11,7 @@

	# -------------------------------------------------------------
	# Unit configuration
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if services['manager'] == 'systemd' %}

	diff --git a/roles/shellserver/quassel-core/changepassword.sls b/roles/shellserver/quassel-core/changepassword.sls
	--- a/roles/shellserver/quassel-core/changepassword.sls
	+++ b/roles/shellserver/quassel-core/changepassword.sls
	@@ -25,7 +25,7 @@
	# Sudo capabilities
	#
	# Quassel users can change their password
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	chquasselpasswd_sudo_capabilities_file:
	file.managed:
	diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
	--- a/roles/shellserver/userland-software/base.sls
	+++ b/roles/shellserver/userland-software/base.sls
	@@ -17,7 +17,7 @@
	# Disclaimer: We don't caution the views of Richard Stallman
	# or the Church of Emacs positions.
	# See http://geekfeminism.wikia.com/wiki/EMACS_virgins_joke
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	editors:
	pkg.installed:
	@@ -29,7 +29,7 @@

	# -------------------------------------------------------------
	# General UNIX utilities
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	utilities:
	pkg.installed:
	@@ -70,7 +70,7 @@

	# -------------------------------------------------------------
	# More exotic shells
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	userland_software_shells:
	pkg.installed:
	@@ -79,7 +79,7 @@

	# -------------------------------------------------------------
	# Development
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	dev:
	pkg.installed:
	@@ -113,7 +113,7 @@

	# -------------------------------------------------------------
	# Languages
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	languages_removed:
	pkg.removed:
	@@ -142,7 +142,7 @@

	# -------------------------------------------------------------
	# De facto standard libraries for languages
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	languages_libs:
	pkg.installed:
	@@ -210,7 +210,7 @@

	# -------------------------------------------------------------
	# Workaround : install composer and phpcs on FreeBSD
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if grains['os'] == 'FreeBSD' %}
	/opt/composer:
	@@ -248,7 +248,7 @@

	# -------------------------------------------------------------
	# Spelling and language utilities
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	spelling:
	pkg.installed:
	@@ -259,7 +259,7 @@

	# -------------------------------------------------------------
	# Media utilities
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	media:
	pkg.installed:
	@@ -272,7 +272,7 @@

	# -------------------------------------------------------------
	# Office utilities (bureautique)
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	office_software:
	pkg.installed:
	@@ -283,7 +283,7 @@

	# -------------------------------------------------------------
	# Nano configuration
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% set nano_rc_files = salt['cmd.shell']('find ' + dirs['share'] + '/nano/ -type f') %}

	diff --git a/roles/shellserver/userland-software/irc.sls b/roles/shellserver/userland-software/irc.sls
	--- a/roles/shellserver/userland-software/irc.sls
	+++ b/roles/shellserver/userland-software/irc.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# IRC clients
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	irc_clients:
	pkg.installed:
	@@ -25,7 +25,7 @@

	# -------------------------------------------------------------
	# Bouncers
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	irc_bouncers:
	pkg.installed:
	@@ -34,7 +34,7 @@

	# -------------------------------------------------------------
	# Bots
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	eggdrop_installer:
	file.managed:
	@@ -44,7 +44,7 @@

	# -------------------------------------------------------------
	# Misc
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	irc_misc:
	pkg.installed:
	diff --git a/roles/shellserver/userland-software/openssl-legacy.sls b/roles/shellserver/userland-software/openssl-legacy.sls
	--- a/roles/shellserver/userland-software/openssl-legacy.sls
	+++ b/roles/shellserver/userland-software/openssl-legacy.sls
	@@ -14,7 +14,7 @@

	# -------------------------------------------------------------
	# Source code
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/usr/local/src:
	file.directory:
	@@ -43,7 +43,7 @@

	# -------------------------------------------------------------
	# Build
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	openssl_build:
	cmd.script:
	@@ -60,7 +60,7 @@

	# -------------------------------------------------------------
	# Install
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	openssl_install:
	cmd.run:
	diff --git a/roles/shellserver/userland-software/web.sls b/roles/shellserver/userland-software/web.sls
	--- a/roles/shellserver/userland-software/web.sls
	+++ b/roles/shellserver/userland-software/web.sls
	@@ -10,7 +10,7 @@

	# -------------------------------------------------------------
	# Web utilities
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	web_utilities:
	pkg.installed:
	diff --git a/roles/shellserver/web-hosting/files/eglide/nginx/nginx.conf b/roles/shellserver/web-hosting/files/eglide/nginx/nginx.conf
	--- a/roles/shellserver/web-hosting/files/eglide/nginx/nginx.conf
	+++ b/roles/shellserver/web-hosting/files/eglide/nginx/nginx.conf
	@@ -16,7 +16,7 @@

	# -------------------------------------------------------------
	# Server configuration
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	worker_processes 1;

	@@ -26,7 +26,7 @@

	# -------------------------------------------------------------
	# HTTP configuration
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	http {
	include mime.types;
	diff --git a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf
	--- a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf
	+++ b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf
	@@ -17,7 +17,7 @@
	# -------------------------------------------------------------
	# Default vhost as a catchall when Host: header value doesn't
	# match any server name, ie the domain is unknown.
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	server {
	listen 80;
	diff --git a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-eglide.org.conf b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-eglide.org.conf
	--- a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-eglide.org.conf
	+++ b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-eglide.org.conf
	@@ -17,7 +17,7 @@
	# -------------------------------------------------------------
	# Main vhost receives special responsibilities like serving
	# user directories.
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	server {

	diff --git a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf
	--- a/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf
	+++ b/roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf
	@@ -17,7 +17,7 @@
	# -------------------------------------------------------------
	# Main vhost receives special responsibilities like serving
	# user directories.
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	server {

	diff --git a/roles/viperserv/account/init.sls b/roles/viperserv/account/init.sls
	--- a/roles/viperserv/account/init.sls
	+++ b/roles/viperserv/account/init.sls
	@@ -11,7 +11,7 @@

	# -------------------------------------------------------------
	# Service accounts
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% for username, user in pillar['viperserv_accounts'].items() %}

	@@ -35,7 +35,7 @@
	# Sudo capabilities
	#
	# Members of nasqueron-irc should be able to sudo -u viperserv …
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	viperserv_sudo_capabilities_file:
	file.managed:
	diff --git a/roles/webserver-core/nginx/config.sls b/roles/webserver-core/nginx/config.sls
	--- a/roles/webserver-core/nginx/config.sls
	+++ b/roles/webserver-core/nginx/config.sls
	@@ -12,7 +12,7 @@
	#
	# :: general configuration
	# :: application-specific code
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	webserver_core_nginx_includes:
	file.recurse:
	@@ -25,7 +25,7 @@
	# vhost folder
	#
	# To be filled by the specific web role or unit
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/vhosts:
	file.directory
	diff --git a/roles/webserver-legacy/nginx/config.sls b/roles/webserver-legacy/nginx/config.sls
	--- a/roles/webserver-legacy/nginx/config.sls
	+++ b/roles/webserver-legacy/nginx/config.sls
	@@ -12,7 +12,7 @@
	#
	# :: general configuration
	# :: application-specific code
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/includes:
	file.recurse:
	@@ -22,7 +22,7 @@

	# -------------------------------------------------------------
	# vhosts folder
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ dirs.etc }}/nginx/vhosts:
	file.recurse:
	diff --git a/scripts/byTasks/HTTP/check-letsencrypt-certificates b/scripts/byTasks/HTTP/check-letsencrypt-certificates
	--- a/scripts/byTasks/HTTP/check-letsencrypt-certificates
	+++ b/scripts/byTasks/HTTP/check-letsencrypt-certificates
	@@ -14,7 +14,7 @@

	# -------------------------------------------------------------
	# Table of contents
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	#
	# :: Configuration
	# :: Checker code
	@@ -31,7 +31,7 @@

	# -------------------------------------------------------------
	# Configuration
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


	dirs = {
	diff --git a/utils/migrate-ssh-keys.py b/utils/migrate-ssh-keys.py
	--- a/utils/migrate-ssh-keys.py
	+++ b/utils/migrate-ssh-keys.py
	@@ -13,7 +13,7 @@

	# -------------------------------------------------------------
	# Table of contents
	-# -------------------------------------------------------------
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	#
	# :: Configuration
	# :: YAML style
	diff --git a/utils/reformat.py b/utils/reformat.py
	new file mode 100755
	--- /dev/null
	+++ b/utils/reformat.py
	@@ -0,0 +1,69 @@
	+#!/usr/bin/env python3
	+
	+# -------------------------------------------------------------
	+# Salt — Reformat Salt states and source code files
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# Created: 2020-02-26
	+# License: BSD-2-Clause
	+# Description: This script detects multi-lines patterns
	+# and rewrite them to apply the new style.
	+#
	+# Before: \n BLOCK_START [...] BLOCK_START
	+# After: \n BLOCK_START [...] BLOCK_END
	+# -------------------------------------------------------------
	+
	+import sys
	+
	+BLOCK_START = "# -------------------------------------------------------------\n"
	+BLOCK_END = "# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
	+
	+
	+def usage():
	+ print(f"usage: {sys.argv[0]} <file to reformat>", file=sys.stderr)
	+
	+
	+class Reformater:
	+ def __init__(self, file):
	+ self.file = file
	+ self.pattern_detection_counter = 0
	+
	+ def reformat_inline(self):
	+ buffer = []
	+ with open(self.file, "r+") as fd:
	+ for line in fd:
	+ buffer.append(self.reformat_line(line))
	+
	+ fd.seek(0)
	+ fd.truncate()
	+ fd.writelines(buffer)
	+
	+ def reformat_line(self, line):
	+ if self.pattern_detection_counter == 0 and line == "\n":
	+ self.pattern_detection_counter += 1
	+ elif self.pattern_detection_counter == 1 and line == BLOCK_START:
	+ self.pattern_detection_counter += 1
	+ elif self.pattern_detection_counter == 2:
	+ if line == BLOCK_END:
	+ # We're probably in an header block or a correct one, so skip
	+ self.pattern_detection_counter = 0
	+ elif line == BLOCK_START:
	+ # We've got a winner
	+ self.pattern_detection_counter = 0
	+ return BLOCK_END
	+ elif not line.startswith("#"):
	+ # Let's go on, it's a multiline comments block
	+ self.pattern_detection_counter = 0
	+ else:
	+ self.pattern_detection_counter = 0
	+
	+ return line
	+
	+
	+if __name__ == "__main__":
	+ if len(sys.argv) < 2:
	+ usage()
	+ sys.exit(1)
	+
	+ file_to_reformat = sys.argv[1]
	+ Reformater(file_to_reformat).reformat_inline()

File Metadata

Mime Type: text/plain
Expires: Mon, Nov 25, 15:48 (21 h, 1 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2262726
Default Alt Text: D2261.diff (36 KB)

D2261.diffNo OneTemporaryActions

D2261.diffView Options

File Metadata

Event Timeline

D2261.diff
No OneTemporary
Actions

D2261.diff
View Options