Page MenuHomeDevCentral
Files F49621067

D4208.id11041.diff
No OneTemporary
Actions

D4208.id11041.diff
View Options

diff --git a/AGENTS.md b/AGENTS.md
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,7 +4,7 @@
### State dependencies
-Salt executes states in file order, so execution order within an SLS file is deterministic.
+Salt executes states in file order, so the execution order within an SLS file is deterministic.
Do **not** add `require`, `watch`, `onchanges`, or similar requisites merely to express the dependency between successive states in the same file.
@@ -44,7 +44,7 @@
files/config.yaml
```
-If adding Jinja syntax would cause the file to be incorrectly handled by a shell, Python, YAML, or other language linter, append `.jinja` to the original extension:
+If adding Jinja syntax causes the file to be incorrectly handled by a shell, Python, YAML, or other language linter, append `.jinja` to the original extension:
```text
files/foo.sh.jinja
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@
* **Roles:** a role is a full high-level service (e.g., mailserver, paas-docker)
* **Units:** a unit is a component to achieve the service's goals
- (e.g., a userland software collection, a nginx server)
+ (e.g., a userland software collection, an nginx server)
Directories follow `roles/<role>/<unit>`.
diff --git a/_modules/forest.py b/_modules/forest.py
--- a/_modules/forest.py
+++ b/_modules/forest.py
@@ -104,7 +104,7 @@
def get_users(forest=None):
"""
A function to get users for a forest as a dictionary,
- including the users properties.
+ including the user's properties.
CLI Example::
diff --git a/_states/credentials.py b/_states/credentials.py
--- a/_states/credentials.py
+++ b/_states/credentials.py
@@ -4,7 +4,7 @@
# Salt — Credentials state
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Description: Allow to declare credentials-related states
+# Description: Allow declaring credentials-related states
# License: BSD-2-Clause
# -------------------------------------------------------------
diff --git a/pillar/paas/docker/dwellers/main.sls b/pillar/paas/docker/dwellers/main.sls
--- a/pillar/paas/docker/dwellers/main.sls
+++ b/pillar/paas/docker/dwellers/main.sls
@@ -120,7 +120,7 @@
# Mastodon is currently deployed manually through docker-compose
# and not yet integrated to the platform. This declaration is
- # currently only used for extra utilities deployment.
+ # currently only used for extra utilities' deployment.
mastodon_sidekiq:
mastodon_sidekiq_1:
diff --git a/roles/core/network/init.sls b/roles/core/network/init.sls
--- a/roles/core/network/init.sls
+++ b/roles/core/network/init.sls
@@ -20,4 +20,4 @@
# - ipv4 (e.g. IntraNought network cards on EXSi hypervisor VMs)
# - gre (e.g. isolated servers needing a tunnel)
#
-# Both are needed for servers with router role.
+# Both are needed for servers with the router role.
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
@@ -39,7 +39,7 @@
# T1194 - Debian offers a nologin pam module avoiding people
# to log in when /etc/nologin exists. OS can pop this file,
-# for example at shutdown time or when systemd boot hasn't
+# for example, at shutdown time or when systemd boot hasn't
# finished.
pam_disable_nologin:
diff --git a/roles/devserver/poudriere/content.sls b/roles/devserver/poudriere/content.sls
--- a/roles/devserver/poudriere/content.sls
+++ b/roles/devserver/poudriere/content.sls
@@ -44,7 +44,7 @@
version = get_kernel_version()
arch = __grains__["cpuarch"]
- # Base jail and ports tree
+ # Base jail and ports' tree
states = {
"poudriere_jails_base": {
"cmd.run": [
diff --git a/roles/devserver/userland-home/cron.sls b/roles/devserver/userland-home/cron.sls
--- a/roles/devserver/userland-home/cron.sls
+++ b/roles/devserver/userland-home/cron.sls
@@ -9,7 +9,7 @@
def get_cron_path(user):
- """Get source cron path in operations repository."""
+ """Get the source cron path in operations repository."""
return f"roles/devserver/userland-home/files/_crons/{user}"
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
@@ -226,8 +226,8 @@
devserver_software_vim:
pkg.installed:
- pkgs:
- # Vim itself is already declared in core role.
- # FreeBSD also offers nvi in base system.
+ # Vim itself is already declared in the core role.
+ # FreeBSD also offers nvi in the base system.
# Neovim
- neovim
diff --git a/roles/opensearch/opensearch/config.sls b/roles/opensearch/opensearch/config.sls
--- a/roles/opensearch/opensearch/config.sls
+++ b/roles/opensearch/opensearch/config.sls
@@ -32,7 +32,7 @@
# TLS certificates
#
# This method is based on OpenSearch Ansible playbook to
-# generate self-signed certificates for node to node (transport)
+# generate self-signed certificates for node-to-node (transport)
# communication, and for the rest API.
#
# The certificates are generated by Search Guard Offline TLS Tool.
diff --git a/roles/paas-docker/containers/files/orbeon/nasqueron_forms/web.xml b/roles/paas-docker/containers/files/orbeon/nasqueron_forms/web.xml
--- a/roles/paas-docker/containers/files/orbeon/nasqueron_forms/web.xml
+++ b/roles/paas-docker/containers/files/orbeon/nasqueron_forms/web.xml
@@ -24,7 +24,7 @@
<display-name>Nasqueron Forms</display-name>
<description>
- Nasqueron Forms is an Orbeon Forms, a XForms web forms solutions
+ Nasqueron Forms is an Orbeon Forms, a XForms web forms solution
to create and fill complex forms.
</description>
<distributable/>
@@ -320,7 +320,7 @@
<url-pattern>/exist/xmlrpc/*</url-pattern>
</servlet-mapping>-->
<!-- End eXist XMLRPC support -->
- <!-- Uncomment this for the relational persistence, and change oracle if necessary -->
+ <!-- Uncomment this for the relational persistence and change oracle if necessary -->
<!--
<resource-ref>
<description>DataSource</description>
@@ -328,10 +328,10 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>-->
- <!-- End relational persistence, and change oracle if necessary -->
+ <!-- End relational persistence and change oracle if necessary -->
<!-- Form Runner authentication -->
- <!-- Require the security role on /fr/auth by default. To protect everything this must be changed. -->
+ <!-- Require the security role on /fr/auth by default. To protect everything, this must be changed. -->
<security-constraint>
<web-resource-collection>
<web-resource-name>Form Runner</web-resource-name>
diff --git a/roles/paas-docker/kernel/init.sls b/roles/paas-docker/kernel/init.sls
--- a/roles/paas-docker/kernel/init.sls
+++ b/roles/paas-docker/kernel/init.sls
@@ -23,7 +23,7 @@
{% else %}
-# /sys/kernel allows to write settings and display the selected one in []
+# /sys/kernel allows writing settings and display the selected one in []
restrict_hugepages:
cmd.run:
- name: echo madvise > /sys/kernel/mm/transparent_hugepage/enabled
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
@@ -60,7 +60,7 @@
app_port: {{ container["app_port"] }}
aliases: {{ container["aliases"] | default("", true) | join(" ") }}
# If the nginx configuration needs more key,
- # pass directly the container dictionary.
+ # directly pass the container dictionary.
args: {{ container }}
{% endif %}
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
@@ -186,7 +186,7 @@
{% if grains["os_family"] == "Debian" %}
- {{ packages_prefixes.php }}json
- # On Debian, these PDO extensions doesn't follow regular names
+ # On Debian, these PDO extensions don't follow regular names
# but are installed if you require the legacy extension name.
- {{ packages_prefixes.php }}mysql
- {{ packages_prefixes.php }}pgsql
@@ -213,7 +213,7 @@
- {{ packages_prefixes.php }}xmlwriter
- {{ packages_prefixes.php }}zip
- {{ packages_prefixes.php }}zlib
- # On Debian, these PDO extensions doesn't follow regular names:
+ # On Debian, these PDO extensions don't follow regular names:
- {{ packages_prefixes.php }}pdo_mysql
- {{ packages_prefixes.php }}pdo_pgsql
- {{ packages_prefixes.php }}pdo_sqlite
diff --git a/roles/webserver-alkane/php/cleanup.sls b/roles/webserver-alkane/php/cleanup.sls
--- a/roles/webserver-alkane/php/cleanup.sls
+++ b/roles/webserver-alkane/php/cleanup.sls
@@ -9,7 +9,7 @@
# an instance, pools from other instances
# should be deleted if they exist.
#
-# That allows to move pools among instances.
+# That allows moving pools among instances.
# -------------------------------------------------------------
diff --git a/roles/webserver-alkane/php/php.sls b/roles/webserver-alkane/php/php.sls
--- a/roles/webserver-alkane/php/php.sls
+++ b/roles/webserver-alkane/php/php.sls
@@ -85,7 +85,7 @@
tasks:
{% if is_devserver %}
# Since D2655, devserver uses /var/run/mysql
- # This is not needed on production as MySQL is on another node
+ # This is not needed in production as MySQL is on another node
- set_mysql_sockets
{% else %}
# Enable Opcache, with aggressive caching
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
@@ -4,7 +4,7 @@
This role provisions the `/var/wwwroot` folder with the website content,
when there is a custom logic to prepare it, like a specific Git repository
-to clone, or a build process to follow.
+to clone or a build process to follow.
These roles do NOT describe web server configuration,
which is done in other `webserver-` roles.
diff --git a/roles/webserver-content/org/nasqueron/init.sls b/roles/webserver-content/org/nasqueron/init.sls
--- a/roles/webserver-content/org/nasqueron/init.sls
+++ b/roles/webserver-content/org/nasqueron/init.sls
@@ -8,4 +8,4 @@
# This section is intentionally left blank.
# As Nasqueron sites are distributed among several servers,
-# per domain files should be directly included instead.
+# per-domain files should be directly included instead.
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
@@ -1,13 +1,13 @@
#!/usr/bin/env python3
# -------------------------------------------------------------
-# NetBox — Document hypervisors facts in NetBox
+# NetBox — Document hypervisors' facts in NetBox
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: BSD-2-Clause
# Description: This script connects to hypervisors,
-# gather facts like last version used,
-# and document them to NetBox config context.
+# gathers facts like the last version used,
+# and documents them to NetBox config context.
# Dependencies: PyYAML, pynetbox
# -------------------------------------------------------------

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 14, 10:03 (19 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4085429
Default Alt Text
D4208.id11041.diff (11 KB)

Event Timeline

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