D3689.id9544.diff
No OneTemporary
Actions

Size

18 KB

Referenced Files

None

Subscribers

None

D3689.id9544.diff
View Options

	diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
	--- a/KNOWN_ISSUES.md
	+++ b/KNOWN_ISSUES.md
	@@ -18,7 +18,7 @@
	After a new FreeBSD release, the kernel modules can be compiled
	against a version incompatible with the installed kernel.

	-We hitted twice this issue with pefs-kmod, for FreeBSD 11.1 and 14.0.
	+We hit twice this issue with pefs-kmod, for FreeBSD 11.1 and 14.0.

	Workaround

	diff --git a/_modules/network_utils.py b/_modules/network_utils.py
	--- a/_modules/network_utils.py
	+++ b/_modules/network_utils.py
	@@ -25,7 +25,7 @@
	# - starts by contiguous 1, e.g. here 1111111111111111111111111111
	# - ends by contiguous 0, e.g. here 0000
	#
	- # Also, as 0.0.0.0 is invalid, netmask must starts by 1.
	+ # Also, as 0.0.0.0 is invalid, the netmask must start by 1.
	return re.compile("^1+0*$").match(bits) is not None


	@@ -39,7 +39,7 @@
	if not is_valid_netmask(netmask):
	raise ValueError("Netmask is invalid.")

	- # The CIDR prefix is the count of 1 bits in each octet.
	+ # The CIDR prefix is the count of '1' bits in each octet.
	# e.g. 255.255.255.240 can be split in octets [255, 255, 255, 240],
	# then becomes ['0b11111111', '0b11111111', '0b11111111', '0b11110000'].
	#
	@@ -57,8 +57,8 @@


	def can_directly_be_discovered(gateway, address, prefixlen):
	- """Determines if the gateway belong to the same prefix than the address,
	- and so can be directly be discovered in NDP."""
	+ """Determines if the gateway belongs to the same prefix as the address,
	+ and so can directly be discovered in NDP."""
	return _ipv6_address_to_prefix(gateway, prefixlen) == _ipv6_address_to_prefix(
	address, prefixlen
	)
	diff --git a/hotfixes/python3.sls b/hotfixes/python3.sls
	--- a/hotfixes/python3.sls
	+++ b/hotfixes/python3.sls
	@@ -8,8 +8,8 @@
	# -------------------------------------------------------------
	# Python 3 alias
	#
	-# If a the python3 meta-port is missing, we only have executables
	-# like python3.9 available. As most of our scripts uses `python3`,
	+# If the python3 meta-port is missing, we only have executables
	+# like python3.9 available. As most of our scripts use `python3`,
	# it's probably best to ensure an alias by looking for an interpreter.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	diff --git a/pillar/core/users.sls b/pillar/core/users.sls
	--- a/pillar/core/users.sls
	+++ b/pillar/core/users.sls
	@@ -16,11 +16,11 @@
	# revokedusers:
	# Users in this list will be removed from the servers.
	#
	-# To rename an user:
	+# To rename a user:
	# Edit the username in the shellusers section,
	# add the former username to the revokedusers list.
	#
	-# Sort the accounts by their username alphabetic order.
	+# Sort the accounts by their username in alphabetic order.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	revokedusers:
	diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
	--- a/pillar/credentials/vault.sls
	+++ b/pillar/credentials/vault.sls
	@@ -34,17 +34,17 @@
	apps: apps/data

	# -------------------------------------------------------------
	-# Vault policies to deploy as-is, ie without templating.
	+# Vault policies to deploy as-is, i.e., without templating.
	#
	# Entries of vault_policies must match a .hcl file in
	-# roles/vault/policies/files folder.
	+# the roles /vault/policies/files folder.
	#
	# If you need a template, create a new pillar entry instead
	# and add the parsing logic either:
	# - directly to roles/vault/policies/
	#
	# - through _modules/credentials.py for policies to apply
	-# to Salt nodes, like e.g. vault_secrets_by_role
	+# to Salt nodes, like e.g., vault_secrets_by_role
	#
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	@@ -59,8 +59,8 @@
	# -------------------------------------------------------------
	# Vault policies for Salt itself
	#
	-# The policy attached to the login method (e.g. approle)
	-# used by the Salt primary server to login to Vault.
	+# The policy attached to the login method (e.g., approle)
	+# used by the Salt primary server to log in to Vault.
	#
	# Source is the name of a policy managed by the vault_policies
	# section. Target is the name of the policy attached.
	@@ -73,9 +73,9 @@
	# -------------------------------------------------------------
	# Vault full policies to include by role
	#
	-# Declare the extra policies each nodes need.
	+# Declare the extra policies each node needs.
	#
	-# In adition of those extra policies, the vault_secrets_by_role
	+# In addition to those extra policies, the vault_secrets_by_role
	# will be parsed for the keys.
	#
	# IMPORTANT: as grains['roles'] can be modified by the node,
	@@ -93,7 +93,7 @@
	#
	# Avoid * notation as this namespace is shared between Vault
	# and the applications. As such, only secrets the Salt nodes
	-# needs in a state they need to deploy should be listed here.
	+# need in a state they need to deploy should be listed here.
	#
	# Use %%node%% as variable for node name.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	diff --git a/pillar/dbserver/cluster-B.sls b/pillar/dbserver/cluster-B.sls
	--- a/pillar/dbserver/cluster-B.sls
	+++ b/pillar/dbserver/cluster-B.sls
	@@ -116,14 +116,14 @@
	# by default, but we generally prefer utf8mb4 as encoding.
	#
	# For collation, MySQL 8 uses utf8mb4_0900_ai_ci / utf8mb4_0900_as_cs
	- # It's a accent (in)sensitive case (in)sensitive based on Unicode 9.0.
	- # For MariaDB 10.10+, we can use uca1400_as_ci, that's Unicode 14.0.
	+ # It's an accent (in)sensitive case (in)sensitive based on Unicode 9.0.
	+ # For MariaDB 10.10+, we can use uca1400_as_ci; that's Unicode 14.0.
	#
	# We note it with the full name utf8mb4_uca1400_as_ci, something not needed
	# for manual requests, but allowing mysql_database.present to check equality.
	#
	# TRANSITION NOTE. On MariaDB 10.6, utf8mb4_unicode_520_ci is the "newest".
	- # From 2023-04-15, we starting to use uca1400_as_ci as default collation.
	+ # From 2023-04-15, we start to use uca1400_as_ci as the default collation.

	databases:
	# Database used by IRC eggdrops
	diff --git a/pillar/dbserver/windriver.sls b/pillar/dbserver/windriver.sls
	--- a/pillar/dbserver/windriver.sls
	+++ b/pillar/dbserver/windriver.sls
	@@ -16,8 +16,8 @@
	# Account used by Salt to configure the server
	credentials: dbserver/windriver-mariadb/users/salt

	- # As of 2024-09, users and databases are managed manually
	- # You're most than welcome to automate any user/db deployment here.
	+ # As of 2024-09, users and databases are managed manually.
	+ # You're more than welcome to automate any user/db deployment here.
	# cluster-B.sls can be helpful for syntax hints
	users: {}
	databases: {}
	@@ -36,8 +36,8 @@

	listen_addresses: "*"

	- # As of 2024-09, users and databases are managed manually
	- # You're most than welcome to automate any user/db deployment here.
	+ # As of 2024-09, users and databases are managed manually.
	+ # You're more than welcome to automate any user/db deployment here.
	# cluster-A.sls can be helpful for syntax hints
	users:
	netbox:
	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -11,16 +11,16 @@
	# To compute optimal Docker containers start order, the following
	# rules apply:
	#
	-# - depends_of_containers: launch after a specific container
	+# - depends_of_containers: launch after specific containers
	# values are the keys for those containers
	#
	# - depends_of_services: launch after containers from this service
	#
	-# Hierarchy of keys can use dot (.) as separator, e.g. links.mysql
	+# Hierarchy of keys can use dot (.) as separator, e.g., links.mysql
	#
	-# Values are configuration keys from docker_containers pillar.
	+# Values are configuration keys from the docker_containers pillar.
	#
	-# Soft dependencies (e.g. Notifications Center depends of Sentry)
	+# Soft dependencies (e.g., Notifications Center depends on Sentry)
	# aren't documented, as it can still run without it.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	@@ -106,7 +106,7 @@
	etherpad: /health
	hound: /healthz

	- # Test a regular URL for services without health check
	+ # Test a regular URL for services without a health check
	api-datasources: /datasources
	hauk: /
	jenkins: /login
	diff --git a/pillar/saas/rabbitmq.sls b/pillar/saas/rabbitmq.sls
	--- a/pillar/saas/rabbitmq.sls
	+++ b/pillar/saas/rabbitmq.sls
	@@ -8,7 +8,7 @@
	# -------------------------------------------------------------
	# RabbitMQ clusters
	#
	-# Each cluster is defined by a deployment method (e.g. docker),
	+# Each cluster is defined by a deployment method (e.g., docker),
	# and the node we can use to configure it.
	#
	# The cluster configuration is a collection of vhosts and users:
	@@ -23,7 +23,7 @@
	#
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	#
	-# The vhost configuration allows to define the exchanges and queues,
	+# The vhost configuration allows defining the exchanges and queues,
	# and the permissions users have on them.
	#
	# exchanges:
	@@ -31,14 +31,14 @@
	#
	# queues:
	# Application can create their own ephemeral queue.
	-# For that, it needs configure permission on the vhost.
	+# For that, it needs 'configure' permission on the vhost.
	#
	# If an application needs a stable one, it should be configured here,
	-# so we can drop the configure permission.
	+# so we can drop the 'configure' permission.
	#
	# permissions:
	# See https://www.rabbitmq.com/access-control.html#authorisation
	-# for the needed permissions for an AMQP operation
	+# for the necessary permissions for an AMQP operation
	#
	# To give access to server-generated queue names, use amq\.gen.*
	# To not give any access, use blank string
	diff --git a/pillar/tower.sls b/pillar/tower.sls
	--- a/pillar/tower.sls
	+++ b/pillar/tower.sls
	@@ -17,5 +17,5 @@

	- webserver/{{ minion_id }}/*.sls

	- # For devserver role, there is no cluster associated
	+ # Servers with the devserver role have no cluster associated
	- dbserver/{{ minion_id }}.sls
	diff --git a/roles/core/init.sls b/roles/core/init.sls
	--- a/roles/core/init.sls
	+++ b/roles/core/init.sls
	@@ -26,9 +26,9 @@
	- .userland-software
	- .users

	- # Depends of users or groups
	+ # Depends on users or groups
	- .deploy
	- .userland-home

	- # Depends of software (git)
	+ # Depends on software (git)
	- .src
	diff --git a/roles/core/network/ipv6_fixes.sls b/roles/core/network/ipv6_fixes.sls
	--- a/roles/core/network/ipv6_fixes.sls
	+++ b/roles/core/network/ipv6_fixes.sls
	@@ -30,9 +30,9 @@
	#
	# OVH network doesn't announce an IPv6 route for a VM at first.
	# If from the VM, we reach another network, the route is then
	-# announced for a while, before being dropped.
	+# announced for a while before being dropped.
	#
	-# To workaround that behavior, solution is to ping regularly
	+# To work around that behavior, a solution is to regularly ping
	# an external site so packets reach OVH router and a route is
	# announced.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	diff --git a/roles/dbserver-mysql/content/init.sls b/roles/dbserver-mysql/content/init.sls
	--- a/roles/dbserver-mysql/content/init.sls
	+++ b/roles/dbserver-mysql/content/init.sls
	@@ -52,8 +52,8 @@
	# according https://mariadb.com/kb/en/grant/#syntax name.
	#
	# Please note using "database" instead or "privilege_level"
	-# isn't considered as a a best practice. We understand to use
	-# directly mysql_grants simplifies the module configuration
	+# isn't considered as a best practice. We understand to use
	+# directly mysql_grants simplifies the module configuration,
	# and as such this may be necessary for compatibility, but
	# we encourage a more precise terminology.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	diff --git a/roles/paas-docker/containers/pixelfed.sls b/roles/paas-docker/containers/pixelfed.sls
	--- a/roles/paas-docker/containers/pixelfed.sls
	+++ b/roles/paas-docker/containers/pixelfed.sls
	@@ -13,7 +13,7 @@
	# -------------------------------------------------------------
	# Data directory
	#
	-# The uid/gid pair depends of the image base:
	+# The uid/gid pair depends on the image base:
	#
	# - library/php + fpm: 82:85
	# - library/php + Apache: 33:33
	diff --git a/roles/paas-docker/wwwroot-content/files/domain-not-found.html b/roles/paas-docker/wwwroot-content/files/domain-not-found.html
	--- a/roles/paas-docker/wwwroot-content/files/domain-not-found.html
	+++ b/roles/paas-docker/wwwroot-content/files/domain-not-found.html
	@@ -32,13 +32,13 @@
	<div class="large-12 columns">
	<h2>What can I do?</h2>
	<p>First, check the address you used is written correctly.</p>
	- <p>Then, if you followed a link through a website, it's probably a bug. You can report it as a server outage,
	+ <p>Then, if you've followed a link through a website, it's probably a bug. You can report it as a server outage
	to be investigated.</p>
	<p>If you're currently configuring the service, the next step is to provide a nginx configuration in the
	operations repository, to be put in the roles/paas-docker/nginx/files/vhosts container. The filename
	must match the Docker service/application name (and not the container name).</p>
	- <p>Finally, if this is your domain and you never intended to host it on the Nasqueron PaaS, you can check your
	- CNAME, A and AAAA records, it probably points to us.</p>
	+ <p>Finally, if this is your domain, and you never intended to host it on the Nasqueron PaaS, you can check your
	+ CNAME, A and AAAA records; it probably points to us.</p>
	<ul>
	<li><a href="https://devcentral.nasqueron.org/maniphest/task/edit/form/4/">Report a server outage</a></li>
	<li><a href="https://agora.nasqueron.org/Get_support">Get further assistance</a></li>
	diff --git a/roles/vault/init.sls b/roles/vault/init.sls
	--- a/roles/vault/init.sls
	+++ b/roles/vault/init.sls
	@@ -8,7 +8,7 @@
	include:
	- .vault

	- # Depends of Vault installed
	+ # Depends on Vault installed
	- .policies

	# -------------------------------------------------------------
	@@ -16,7 +16,7 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	# The bootstrap unit can be run once for the whole cluster
	-# if you wish to regerate the Vault configuration from scratch
	+# if you wish to regenerate the Vault configuration from scratch
	# instead of restoring the storage back-end.
	#
	# As such, .bootstrap should NOT be included in the includes list.
	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
	@@ -26,7 +26,7 @@
	# Software used by TC2
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-# TC2 needs logins, pw, mkdir, chown, hostname, id, sockstat,su, cat
	+# TC2 needs logins, pw, mkdir, chown, hostname, id, sockstat, su, cat
	# /usr/local/etc/rc.d/nginx, /usr/local/etc/rc.d/php-fpm,
	# /usr/local/etc/rc.d/jenkins
	# Those are expected to be on the system administrated.
	diff --git a/roles/webserver-content/README.md b/roles/webserver-content/README.md
	--- a/roles/webserver-content/README.md
	+++ b/roles/webserver-content/README.md
	@@ -6,7 +6,7 @@
	when there is a custom logic to prepare it, like a specific Git repository
	to clone, or a build process to follow.

	-These roles does NOT describe web server configuration,
	+These roles do NOT describe web server configuration,
	which is done in other `webserver-` roles.

	## Structure
	@@ -30,7 +30,7 @@
	2. Include a `init.sls` file for your subdomains
	3. Declare the new domain in pillar/webserver

	-For example the tld/acme/init.sls file could be:
	+For example, the tld/acme/init.sls file could be:
	```
	include:
	- .www
	@@ -39,14 +39,14 @@

	Alphabetical order is followed, but www is generally first.

	-In the pillar file, website are assigned to a role.
	+In the pillar file, a website is assigned to a role.

	-If you wish to deploy all the sites on one role, you can directly include
	+If you wish to deploy all the sites in one role, you can directly include
	the folder, and your init.sls will do the rest.

	If not, you can list the path to the subdomain file, without the .sls extension.

	-For example to deploy bipbip.acme.tld (`tld/acme/bipbip.sls`) on servers
	+For example, to deploy bipbip.acme.tld (`tld/acme/bipbip.sls`) on servers
	with the shellserver role:

	```
	diff --git a/roles/webserver-content/be/dereckson/assets.sls b/roles/webserver-content/be/dereckson/assets.sls
	--- a/roles/webserver-content/be/dereckson/assets.sls
	+++ b/roles/webserver-content/be/dereckson/assets.sls
	@@ -9,7 +9,7 @@
	# Deploy /opt/staging/wwwroot/d.be/assets to assets.d.be
	#
	# !!! WARNING !!!
	-# This folder could contain non staged resources. As such,
	+# This folder could contain non-staged resources. As such,
	# clean must be let at False.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	diff --git a/utils/dump-py-state.py b/utils/dump-py-state.py
	--- a/utils/dump-py-state.py
	+++ b/utils/dump-py-state.py
	@@ -1,7 +1,7 @@
	#!/usr/bin/env python3

	# -------------------------------------------------------------
	-# rOPS — compile a #!py .sls file and dump result in YAML
	+# rOPS — compile a #!py .sls file and dump the result in YAML
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-10-17
	diff --git a/utils/netbox/build-etc-hosts-drake.py b/utils/netbox/build-etc-hosts-drake.py
	--- a/utils/netbox/build-etc-hosts-drake.py
	+++ b/utils/netbox/build-etc-hosts-drake.py
	@@ -70,7 +70,7 @@


	def init_app():
	- """Prepare a services container for appplication."""
	+ """Prepare a service container for the application."""
	config = get_netbox_config()

	return {
	diff --git a/utils/netbox/document-hypervisors.py b/utils/netbox/document-hypervisors.py
	--- a/utils/netbox/document-hypervisors.py
	+++ b/utils/netbox/document-hypervisors.py
	@@ -74,7 +74,7 @@


	def init_app():
	- """Prepare a services container for appplication."""
	+ """Prepare a service container for application."""
	config = get_netbox_config()

	return {

File Metadata

Mime Type: text/plain
Expires: Sat, Sep 20, 02:47 (16 h, 25 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2997423
Default Alt Text: D3689.id9544.diff (18 KB)

D3689.id9544.diffNo OneTemporaryActions

D3689.id9544.diffView Options

File Metadata

Event Timeline

D3689.id9544.diff
No OneTemporary
Actions

D3689.id9544.diff
View Options