Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F44253346
D4167.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D4167.diff
View Options
diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
--- a/KNOWN_ISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -16,11 +16,11 @@
On FreeBSD 15.1, the package py312-certbot will create a conflict between
py311-acme and py312-acme. That will deinstall Salt.
-As a work around:
+As a workaround:
- reinstall py311-salt from Nasqueron-Salt temporary repository
- redeploy roles/certificates after removing the state 'letsencrypt_software'
-Medium-term solution is to end to migrate all certificates to acme.sh,
+The medium-term solution is to end to migrate all certificates to acme.sh,
and we'll be able to remove the certbot software.
## Role: devserver
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
Additional utilities for humans and Terraform provisioning are also provided.
Nasqueron infrastructure servers support our community
-of creative people, writers, developers and thinkers.
+of creative people, writers, developers, and thinkers.
Nasqueron follows the principle of *Infrastructure as Code*
to offer documentation, reproducibility, transparency and
@@ -164,7 +164,7 @@
The repository uses the following terminology:
- **Salt primary server**: a server that issues commands to other servers or itself
- - **Node**: a server, baremetal or VM configured by Salt
+ - **Node**: a server, baremetal, or VM configured by Salt
Nasqueron follows the inclusive language conventions to ensure that our
community is welcoming to everyone.
diff --git a/_modules/credentials.py b/_modules/credentials.py
--- a/_modules/credentials.py
+++ b/_modules/credentials.py
@@ -86,7 +86,7 @@
def get_username(key, prefix=None):
"""
- A function to fetch the username associated to a credential
+ A function to fetch the username associated with a credential
through Vault
CLI Example:
diff --git a/_modules/node.py b/_modules/node.py
--- a/_modules/node.py
+++ b/_modules/node.py
@@ -142,8 +142,8 @@
A function to filter a dictionary by roles.
The dictionary must respect the following structure:
- - keys are role to check the current node against
- - values are list of items
+ - keys are the role to check the current node against
+ - values are a list of items
If a key '*' is also present, it will be included
for every role.
@@ -518,8 +518,8 @@
vhid = fhrp.get("id")
- # ignore invalid CARP entries
- # when vhid or vip are empty in netbox,
+ # Ignore invalid CARP entries
+ # when vhid or vip are empty in NetBox,
# in the pillar configuration we'll see that entry carp fhrp = []
if vhid is None:
return []
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
@@ -50,7 +50,7 @@
<p>First, check the address you used is written correctly.</p>
<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
+ <p>If you're currently configuring the service, the next step is to provide an 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
diff --git a/roles/webserver-legacy/php-builder/source.sls b/roles/webserver-legacy/php-builder/source.sls
--- a/roles/webserver-legacy/php-builder/source.sls
+++ b/roles/webserver-legacy/php-builder/source.sls
@@ -120,7 +120,7 @@
}
if build["version"] < "7":
- # New versions of Onigurama requires a patch not merged in 5.6.38
+ # New versions of Onigurama require a patch not merged in 5.6.38
# See https://bugs.php.net/bug.php?id=76113
config["php_build_" + build_name + "_phase1_patch"] = {
"file.patch": [
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Aug 17, 05:36 (20 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4001393
Default Alt Text
D4167.diff (4 KB)
Attached To
Mode
D4167: Improve grammar
Attached
Detach File
Event Timeline
Log In to Comment