Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3618412
D2579.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D2579.diff
View Options
diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
--- a/KNOWN_ISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -16,7 +16,7 @@
### PHP 5.6 <> PHP 7.x roulette
On FreeBSD, PEAR and composer pull PHP 5.6. As such, they will be skipped when
-the state installs PHP 7.x. But if you run again the state, if will downgrade
+the state installs PHP 7.x. But if you run again the state, it will downgrade
to PHP 5.6.
**Workaround**
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -41,12 +41,12 @@
Services are organized in roles and units.
* Roles: a role is a goal a service accomplishes (e.g. mailserver, paas-docker)
-* Units: an unit is a component needed to achieve this goal
+* Units: a unit is a component needed to achieve this goal
(e.g. an userland software collection, a nginx server)
Directories follow `roles/<role>/<unit>`.
-If configuration files for an unit should be stored,
+If configuration files for a unit should be stored,
a subfolder `files` is created at unit level.
The `pillar/ ` folder contains data about Eglide users,
diff --git a/_modules/nano.py b/_modules/nano.py
--- a/_modules/nano.py
+++ b/_modules/nano.py
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2020-02-09
-# Description: Allow to generate nano configuration
+# Description: Allow to generate a nano configuration
# License: BSD-2-Clause
# -------------------------------------------------------------
diff --git a/_modules/network_utils.py b/_modules/network_utils.py
--- a/_modules/network_utils.py
+++ b/_modules/network_utils.py
@@ -38,7 +38,7 @@
if not is_valid_netmask(netmask):
raise ValueError("Netmask is invalid.")
- # The CIDR prefix is the count of 1 bits in each octect.
+ # 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'].
#
diff --git a/_modules/node.py b/_modules/node.py
--- a/_modules/node.py
+++ b/_modules/node.py
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-10-21
-# Description: Functions related to the nodes pillar entry
+# Description: Functions related to the nodes' pillar entry
# License: BSD-2-Clause
# -------------------------------------------------------------
@@ -183,7 +183,7 @@
"""
A function to determine the wwwroot folder to use.
- Returns a string depending of the FQDN.
+ Returns a string depending on the FQDN.
CLI Example:
@@ -209,7 +209,7 @@
"""
A function to get a list of IPv6, enclosed by [].
- Returns a string depending of the IPv6 currently assigned.
+ Returns a string depending on the IPv6 currently assigned.
CLI Example:
diff --git a/_states/nano.py b/_states/nano.py
--- a/_states/nano.py
+++ b/_states/nano.py
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2020-02-09
-# Description: Allow to generate nano configuration
+# Description: Allow to generate a nano configuration
# License: BSD-2-Clause
# -------------------------------------------------------------
diff --git a/_tests/modules/test_forest.py b/_tests/modules/test_forest.py
--- a/_tests/modules/test_forest.py
+++ b/_tests/modules/test_forest.py
@@ -32,7 +32,7 @@
def test_list_groups(self):
self.assertEqual(["caras_galadhon", "ubiquity"], sorted(forest.list_groups()))
- def test_list_groups_when_there_are_none_for_the_foreest(self):
+ def test_list_groups_when_there_are_none_for_the_forest(self):
self.grains["id"] = "entwash"
self.assertEqual(["ubiquity"], forest.list_groups())
diff --git a/_tests/pillar/core/test_users.py b/_tests/pillar/core/test_users.py
--- a/_tests/pillar/core/test_users.py
+++ b/_tests/pillar/core/test_users.py
@@ -15,7 +15,7 @@
with open(PILLAR_FILE, "r") as fd:
self.pillar = yaml.safe_load(fd)
- # users must have an username, an UID and SSH keys
+ # users must have a username, an UID and SSH keys
def test_users_properties(self):
is_valid = True
errors = []
diff --git a/roles/dbserver-mysql/grc/init.sls b/roles/dbserver-mysql/grc/init.sls
--- a/roles/dbserver-mysql/grc/init.sls
+++ b/roles/dbserver-mysql/grc/init.sls
@@ -12,7 +12,7 @@
# -------------------------------------------------------------
# Coloration grc configuration file for MySQL client
#
-# “ This is more than pure aestetics- DBAs are looking at this output
+# “ This is more than pure aesthetics- DBAs are looking at this output
# for long hours, a bit of color (disabled by default) will make
# their life easier.
#
diff --git a/roles/devserver/userland-home/files/dereckson/.shell.yml b/roles/devserver/userland-home/files/dereckson/.shell.yml
--- a/roles/devserver/userland-home/files/dereckson/.shell.yml
+++ b/roles/devserver/userland-home/files/dereckson/.shell.yml
@@ -17,7 +17,7 @@
# -------------------------------------------------------------
# Aliases
#
-# Allow to quickly call an handler with extra arguments
+# Allow to quickly call a handler with extra arguments
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
aliases:
diff --git a/roles/devserver/userland-home/files/dereckson/bin/hypergeometric_distribution b/roles/devserver/userland-home/files/dereckson/bin/hypergeometric_distribution
--- a/roles/devserver/userland-home/files/dereckson/bin/hypergeometric_distribution
+++ b/roles/devserver/userland-home/files/dereckson/bin/hypergeometric_distribution
@@ -29,7 +29,7 @@
print()
print("Example:")
print()
- print("In a Magic the Gathering deck of 60 crads, you've put 23 lands.")
+ print("In a Magic the Gathering deck of 60 cards, you've put 23 lands.")
print("To compute the probability to get 3 lands in your opening hand (7 cards):")
print(f" {sys.argv[0]} 60 23 7 3")
diff --git a/roles/devserver/userland-software/files/shell.py b/roles/devserver/userland-software/files/shell.py
--- a/roles/devserver/userland-software/files/shell.py
+++ b/roles/devserver/userland-software/files/shell.py
@@ -181,7 +181,7 @@
if alias is not None:
return self.parse_alias(alias)
- # Is it an handler?
+ # Is it a handler?
handler = self.get_handler(target)
if handler is not None:
return self.parse_handler(handler)
diff --git a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
--- a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
+++ b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python2
# -------------------------------------------------------------
-# Mastodon - clear stuck video tasks from quueue
+# Mastodon - clear stuck video tasks from queue
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-12-08
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
@@ -30,7 +30,7 @@
chquasselpasswd_sudo_capabilities_file:
file.managed:
- name: {{ dirs.etc }}/sudoers.d/chquasselpasswd
- - source: salt://roles/shellserver/quassel-core/files/chquasselpasswd.suoders
+ - source: salt://roles/shellserver/quassel-core/files/chquasselpasswd.sudoers
- template: jinja
- context:
dirs: {{ dirs }}
diff --git a/roles/shellserver/quassel-core/files/chquasselpasswd.suoders b/roles/shellserver/quassel-core/files/chquasselpasswd.sudoers
rename from roles/shellserver/quassel-core/files/chquasselpasswd.suoders
rename to roles/shellserver/quassel-core/files/chquasselpasswd.sudoers
--- a/roles/shellserver/quassel-core/files/chquasselpasswd.suoders
+++ b/roles/shellserver/quassel-core/files/chquasselpasswd.sudoers
@@ -5,7 +5,7 @@
# Project: Eglide
# Created: 2018-03-28
# License: Trivial work, not eligible to copyright
-# Source file: roles/shellserver/quassel-core/files/chquasselpasswd.suoders
+# Source file: roles/shellserver/quassel-core/files/chquasselpasswd.sudoers
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/viperserv/eggdrop/files/eggdrop-core.conf b/roles/viperserv/eggdrop/files/eggdrop-core.conf
--- a/roles/viperserv/eggdrop/files/eggdrop-core.conf
+++ b/roles/viperserv/eggdrop/files/eggdrop-core.conf
@@ -61,7 +61,7 @@
# * set vhost4 or vhost6 to the IP/vhost you want to use
# * set listen-addr to the same IP/vhost as above
#
-# HOME COMPUTER/VPS, DIRECT INTERNET CONNETION (SINGLE IP, NO NAT)
+# HOME COMPUTER/VPS, DIRECT INTERNET CONNECTION (SINGLE IP, NO NAT)
# * do not set vhost4/vhost6
# * do not set listen-addr
#
@@ -463,7 +463,7 @@
# Control certificate verification for linking to hubs
#set ssl-verify-bots 0
-# Control cerfificate verification for SSL listening ports. This includes
+# Control certificate verification for SSL listening ports. This includes
# leaf bots connecting, users telneting in and /ctcp bot chat.
#set ssl-verify-clients 0
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.
-This roles does NOT describe web server configuration,
+These roles does NOT describe web server configuration,
which is done in other `webserver-` roles.
## Structure
@@ -44,7 +44,7 @@
the folder, and your init.sls will do the rest.
If not, two strategies exist: you can use node.filter_by_role in your
-init.sls too or perhaps more simply you can document in init.sls this
+init.sls too or perhaps more simply you can document in init.sls these
roles can't be deployed directly, and make references to sls files in
the pillar (without final .sls extension).
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
@@ -46,7 +46,7 @@
# -------------------------------------------------------------
# YAML style
#
-# Allows to dump with indented lists
+# Allows indented lists in dump
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/utils/reformat.py b/utils/reformat.py
--- a/utils/reformat.py
+++ b/utils/reformat.py
@@ -45,7 +45,7 @@
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
+ # We're probably in a header block or a correct one, so skip
self.pattern_detection_counter = 0
elif line == BLOCK_START:
# We've got a winner
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Oct 4, 04:39 (19 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2173622
Default Alt Text
D2579.diff (11 KB)
Attached To
Mode
D2579: Proofread repository
Attached
Detach File
Event Timeline
Log In to Comment