mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
codespell: grammar nazi
Run codespell[1] against sources. [1] https://github.com/lucasdemarchi/codespell
This commit is contained in:
Alexey Ivanov
parent
a2c1833458
commit
d23ff3821e
48 changed files with 94 additions and 94 deletions
|
|
@ -165,7 +165,7 @@ Can I run different versions of Salt on my Master and Minion?
|
|||
|
||||
As of release 0.17.1 backwards compatibility was broken (specifically for
|
||||
0.17.1 trying to interface with older releases) due to a protocol change for
|
||||
security purposes. The Salt team continues to emphasize backwards compatiblity
|
||||
security purposes. The Salt team continues to emphasize backwards compatibility
|
||||
as an important feature and plans to support it to the best of our ability to
|
||||
do so.
|
||||
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ PATH using a \fBfile.symlink\fP state.
|
|||
.sp
|
||||
As of release 0.17.1 backwards compatibility was broken (specifically for
|
||||
0.17.1 trying to interface with older releases) due to a protocol change for
|
||||
security purposes. The Salt team continues to emphasize backwards compatiblity
|
||||
security purposes. The Salt team continues to emphasize backwards compatibility
|
||||
as an important feature and plans to support it to the best of our ability to
|
||||
do so.
|
||||
.SS Does Salt support backing up managed files?
|
||||
|
|
@ -12067,7 +12067,7 @@ Keys in the us\-west\-1 region can be configured at
|
|||
\fI\%https://console.aws.amazon.com/ec2/home?region=us\-west\-1#s=KeyPairs\fP
|
||||
.sp
|
||||
\&...and so on. When creating a key pair, the browser will prompt to download a
|
||||
pem file. This file must be placed in a directory accessable by Salt Cloud,
|
||||
pem file. This file must be placed in a directory accessible by Salt Cloud,
|
||||
with permissions set to either 0400 or 0600.
|
||||
.SS Security Groups
|
||||
.sp
|
||||
|
|
@ -18197,7 +18197,7 @@ salt myminion cloud.action show_image provider=my\-ec2\-config \e
|
|||
.UNINDENT
|
||||
.UNINDENT
|
||||
.sp
|
||||
The actions available are largely dependant upon the module for the specific
|
||||
The actions available are largely dependent upon the module for the specific
|
||||
cloud provider. The following actions are available for all cloud providers:
|
||||
.INDENT 0.0
|
||||
.TP
|
||||
|
|
@ -19416,7 +19416,7 @@ pip install git+https://github.com/saltstack/salt\-cloud.git#egg=salt_cloud
|
|||
.sp
|
||||
Salt cloud is a public cloud provisioning tool. Salt cloud is made to integrate
|
||||
Salt into cloud providers in a clean way so that minions on public cloud
|
||||
systems can be quickly and easily modeled and provisioned.
|
||||
systems can be quickly and easily modelled and provisioned.
|
||||
.sp
|
||||
Salt cloud allows for cloud based minions to be managed via virtual machine
|
||||
maps and profiles. This means that individual cloud VMs can be created, or
|
||||
|
|
@ -19932,7 +19932,7 @@ available and should be attached to by \fBsalt\-ssh\fP\&. By default the roster
|
|||
file is located at /etc/salt/roster.
|
||||
.SS How Rosters Work
|
||||
.sp
|
||||
The roster system compiles a data structure internally refered to as
|
||||
The roster system compiles a data structure internally referred to as
|
||||
\fItargets\fP\&. The \fItargets\fP is a list of target systems and attributes about how
|
||||
to connect to said systems. The only requirement for a roster module in Salt
|
||||
is to return the \fItargets\fP data structure.
|
||||
|
|
@ -20598,7 +20598,7 @@ reactor: # Master config section "reactor"
|
|||
Reactor sls files are similar to state and pillar sls files. They are
|
||||
by default yaml + Jinja templates and are passed familar context variables.
|
||||
.sp
|
||||
They differ because of the addtion of the \fBtag\fP and \fBdata\fP variables.
|
||||
They differ because of the addition of the \fBtag\fP and \fBdata\fP variables.
|
||||
.INDENT 0.0
|
||||
.IP \(bu 2
|
||||
The \fBtag\fP variable is just the tag in the fired event.
|
||||
|
|
@ -28798,7 +28798,7 @@ salt \(aq*\(aq pkg.install php54 taps=\(aq["josegonzalez/php", "homebrew/dupes"]
|
|||
.UNINDENT
|
||||
.TP
|
||||
.B options
|
||||
Options to pass to brew. Only applies to inital install. Due to how brew
|
||||
Options to pass to brew. Only applies to initial install. Due to how brew
|
||||
works, modifying chosen options requires a full uninstall followed by a
|
||||
fresh install. Note that if "pkgs" is used, all options will be passed
|
||||
to all packages. Unreconized options for a package will be silently
|
||||
|
|
@ -30313,7 +30313,7 @@ server.
|
|||
The script will be executed directly, so it can be written in any available
|
||||
programming language.
|
||||
.sp
|
||||
The script can also be formated as a template, the default is jinja.
|
||||
The script can also be formatted as a template, the default is jinja.
|
||||
Arguments for the script can be specified as well.
|
||||
.sp
|
||||
CLI Example:
|
||||
|
|
@ -30354,7 +30354,7 @@ server.
|
|||
The script will be executed directly, so it can be written in any available
|
||||
programming language.
|
||||
.sp
|
||||
The script can also be formated as a template, the default is jinja.
|
||||
The script can also be formatted as a template, the default is jinja.
|
||||
.sp
|
||||
Only evaluate the script return code and do not block for terminal output
|
||||
.sp
|
||||
|
|
@ -30426,7 +30426,7 @@ Use composer to install PHP dependencies for a directory
|
|||
.B salt.modules.composer.install(dir, composer=None, php=None, runas=None, prefer_source=None, prefer_dist=None, no_scripts=None, no_plugins=None, optimize=None, no_dev=None, quiet=False, composer_home=\(aq/root\(aq)
|
||||
Install composer dependencies for a directory.
|
||||
.sp
|
||||
If composer has not been installed globally making it avaliable in the
|
||||
If composer has not been installed globally making it available in the
|
||||
system PATH & making it executible, the \fBcomposer\fP and \fBphp\fP parameters
|
||||
will need to be set to the location of the executables.
|
||||
.INDENT 7.0
|
||||
|
|
@ -36647,7 +36647,7 @@ salt \(aq*\(aq file.rename /path/to/src /path/to/dst
|
|||
.INDENT 0.0
|
||||
.TP
|
||||
.B salt.modules.file.replace(path, pattern, repl, count=0, flags=0, bufsize=1, backup=\(aq.bak\(aq, dry_run=False, search_only=False, show_changes=True)
|
||||
Replace occurances of a pattern in a file
|
||||
Replace occurrences of a pattern in a file
|
||||
.sp
|
||||
New in version 0.17.0.
|
||||
|
||||
|
|
@ -36779,7 +36779,7 @@ salt \(aq*\(aq file.rmdir /tmp/foo/
|
|||
.INDENT 0.0
|
||||
.TP
|
||||
.B salt.modules.file.search(path, pattern, flags=0, bufsize=1)
|
||||
Search for occurances of a pattern in a file
|
||||
Search for occurrences of a pattern in a file
|
||||
.sp
|
||||
New in version 0.17.0.
|
||||
|
||||
|
|
@ -40125,7 +40125,7 @@ salt \(aq*\(aq gnome.setClockFormat <12h|24h> user=<username>
|
|||
.INDENT 0.0
|
||||
.TP
|
||||
.B salt.modules.gnomedesktop.setClockShowDate(kvalue, **kwargs)
|
||||
Set whether the date is visable in the clock
|
||||
Set whether the date is visible in the clock
|
||||
.sp
|
||||
CLI Example:
|
||||
.INDENT 7.0
|
||||
|
|
@ -41278,7 +41278,7 @@ salt \(aq*\(aq iptables.build_rule filter INPUT command=I position=3 \e
|
|||
.INDENT 0.0
|
||||
.TP
|
||||
.B salt.modules.iptables.check(table=\(aqfilter\(aq, chain=None, rule=None)
|
||||
Check for the existance of a rule in the table and chain
|
||||
Check for the existence of a rule in the table and chain
|
||||
.INDENT 7.0
|
||||
.TP
|
||||
.B This function accepts a rule in a standard iptables command format,
|
||||
|
|
@ -41306,7 +41306,7 @@ salt \(aq*\(aq iptables.check filter INPUT \e
|
|||
New in version Hydrogen.
|
||||
|
||||
.sp
|
||||
Check for the existance of a chain in the table
|
||||
Check for the existence of a chain in the table
|
||||
.sp
|
||||
CLI Example:
|
||||
.INDENT 7.0
|
||||
|
|
@ -51462,7 +51462,7 @@ Support for \fBpkgng\fP, the new package manager for FreeBSD
|
|||
\fBWARNING:\fP
|
||||
.INDENT 0.0
|
||||
.INDENT 3.5
|
||||
This module has been completely rewritten. Up to and includng version
|
||||
This module has been completely rewritten. Up to and including version
|
||||
0.17.x, it was available as the \fBpkgng\fP module, (\fBpkgng.install\fP,
|
||||
\fBpkgng.delete\fP, etc.), but moving forward this module will no longer be
|
||||
available as \fBpkgng\fP, as it will behave like a normal Salt \fBpkg\fP
|
||||
|
|
@ -54207,7 +54207,7 @@ salt \(aq*\(aq ps.get_users
|
|||
.INDENT 0.0
|
||||
.TP
|
||||
.B salt.modules.ps.kill_pid(pid, signal=15)
|
||||
Kill a proccess by PID.
|
||||
Kill a process by PID.
|
||||
.INDENT 7.0
|
||||
.INDENT 3.5
|
||||
.sp
|
||||
|
|
@ -73082,7 +73082,7 @@ httpd:
|
|||
.UNINDENT
|
||||
.UNINDENT
|
||||
.sp
|
||||
In this example, the httpd sevice running state will not be applied
|
||||
In this example, the httpd service running state will not be applied
|
||||
(i.e., the httpd service will not be started) unless both the https package is
|
||||
installed AND the network state is satisfied.
|
||||
.sp
|
||||
|
|
@ -75736,7 +75736,7 @@ Archive states.
|
|||
.TP
|
||||
.B salt.states.archive.extracted(name, source, archive_format, tar_options=None, source_hash=None, if_missing=None)
|
||||
State that make sure an archive is extracted in a directory.
|
||||
The downloaded archive is erased if succesfully extracted.
|
||||
The downloaded archive is erased if successfully extracted.
|
||||
The archive is downloaded only if necessary.
|
||||
.INDENT 7.0
|
||||
.INDENT 3.5
|
||||
|
|
@ -76613,7 +76613,7 @@ date > /tmp/crontest:
|
|||
Then the existing cron will be updated, but if the cron command is changed,
|
||||
then a new cron job will be added to the user\(aqs crontab.
|
||||
.sp
|
||||
Salt also supports running a cron every \fBx minutes\fP very similarily to the Unix
|
||||
Salt also supports running a cron every \fBx minutes\fP very similarly to the Unix
|
||||
convention of using \fB*/5\fP to have a job run every five minutes. In Salt, this
|
||||
looks like:
|
||||
.INDENT 0.0
|
||||
|
|
@ -76792,7 +76792,7 @@ The host portion of the DNS record, e.g., \(aqwebserver\(aq
|
|||
The zone to check
|
||||
.TP
|
||||
.B data
|
||||
Data for the DNS record. E.g., the IP addres for an A record. If omitted,
|
||||
Data for the DNS record. E.g., the IP address for an A record. If omitted,
|
||||
all records matching name (and rdtype, if provided) will be purged.
|
||||
.TP
|
||||
.B rdtype
|
||||
|
|
@ -76815,7 +76815,7 @@ The zone to check/update
|
|||
TTL for the record
|
||||
.TP
|
||||
.B data
|
||||
Data for the DNS record. E.g., the IP addres for an A record.
|
||||
Data for the DNS record. E.g., the IP address for an A record.
|
||||
.TP
|
||||
.B rdtype
|
||||
DNS resource type. Default \(aqA\(aq.
|
||||
|
|
@ -77074,7 +77074,7 @@ the name \(aqdocker\(aq would conflict with the underlying docker\-py library.
|
|||
.sp
|
||||
We should add magic to all methods to also match containers by name
|
||||
now that the \(aqnaming link\(aq stuff has been merged in docker.
|
||||
This applies for exemple to:
|
||||
This applies for example to:
|
||||
.INDENT 0.0
|
||||
.INDENT 3.5
|
||||
.INDENT 0.0
|
||||
|
|
@ -77821,7 +77821,7 @@ file. If \fBFalse\fP return a boolean if any changes were made.
|
|||
.B Return type
|
||||
bool or str
|
||||
.sp
|
||||
Exemple of usage with an accumulator and with a variable:
|
||||
Example of usage with an accumulator and with a variable:
|
||||
.INDENT 7.0
|
||||
.INDENT 3.5
|
||||
.sp
|
||||
|
|
@ -79894,7 +79894,7 @@ The name of the LVS server.
|
|||
The service protocol(only support \fBtcp\fP, \fBudp\fP and \fBfwmark\fP service).
|
||||
.TP
|
||||
.B service_address
|
||||
The LVS service adress.
|
||||
The LVS service address.
|
||||
.TP
|
||||
.B server_address
|
||||
The LVS real server address.
|
||||
|
|
@ -79958,7 +79958,7 @@ The name of the LVS service
|
|||
The service protocol
|
||||
.TP
|
||||
.B service_address
|
||||
The LVS service adress
|
||||
The LVS service address
|
||||
.UNINDENT
|
||||
.UNINDENT
|
||||
.INDENT 0.0
|
||||
|
|
@ -96758,7 +96758,7 @@ If so, run the installer command.
|
|||
Execute \fBpkg.list_pkgs\fP and compare to the result stored from
|
||||
before installation.
|
||||
.IP 5. 3
|
||||
Sucess/Failure/Changes will be reported based on the differences
|
||||
Success/Failure/Changes will be reported based on the differences
|
||||
between the original and final \fBpkg.list_pkgs\fP results.
|
||||
.UNINDENT
|
||||
.sp
|
||||
|
|
@ -103959,7 +103959,7 @@ system.
|
|||
.SS Salt Cloud Merged in Salt
|
||||
.sp
|
||||
Salt Cloud is a tool for provisioning salted minions across various cloud
|
||||
providers. Prior to this release, Salt Cloud was a seperate project but this
|
||||
providers. Prior to this release, Salt Cloud was a separate project but this
|
||||
marks its full integration with the Salt distribution. A Getting Started guide
|
||||
and additional documentation for Salt Cloud can be found \fBhere\fP:
|
||||
.SS Salt Virt
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ the discrete states are split or groups into separate sls files:
|
|||
- pkg: httpd
|
||||
- sls: network
|
||||
|
||||
In this example, the httpd sevice running state will not be applied
|
||||
In this example, the httpd service running state will not be applied
|
||||
(i.e., the httpd service will not be started) unless both the https package is
|
||||
installed AND the network state is satisfied.
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ roughly as follows:
|
|||
3. If so, run the installer command.
|
||||
4. Execute ``pkg.list_pkgs`` and compare to the result stored from
|
||||
before installation.
|
||||
5. Sucess/Failure/Changes will be reported based on the differences
|
||||
5. Success/Failure/Changes will be reported based on the differences
|
||||
between the original and final ``pkg.list_pkgs`` results.
|
||||
|
||||
If there are any problems in using the package manager it is likely to
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Salt Cloud Documentation
|
|||
|
||||
Salt cloud is a public cloud provisioning tool. Salt cloud is made to integrate
|
||||
Salt into cloud providers in a clean way so that minions on public cloud
|
||||
systems can be quickly and easily modeled and provisioned.
|
||||
systems can be quickly and easily modelled and provisioned.
|
||||
|
||||
Salt cloud allows for cloud based minions to be managed via virtual machine
|
||||
maps and profiles. This means that individual cloud VMs can be created, or
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ GoGrid
|
|||
List Available Resources
|
||||
========================
|
||||
|
||||
Setting up Salt Cloud requires knowlege of the available sizes and images on
|
||||
Setting up Salt Cloud requires knowledge of the available sizes and images on
|
||||
cloud providers. Listing the available images and sizes can now be done with
|
||||
the salt-cloud command:
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ AWS Improvements
|
|||
|
||||
AWS is much more complex to work with than any of the other supported cloud
|
||||
providers. As such, additional configuration has been added in order to
|
||||
accomodate their usage:
|
||||
accommodate their usage:
|
||||
|
||||
AWS.ssh_username:
|
||||
Because AWS images can include a variety of different usernames for the
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ commands is used, an instance name must be provided. If one of the standard
|
|||
salt myminion cloud.action show_image provider=my-ec2-config \
|
||||
image=ami-1624987f
|
||||
|
||||
The actions available are largely dependant upon the module for the specific
|
||||
The actions available are largely dependent upon the module for the specific
|
||||
cloud provider. The following actions are available for all cloud providers:
|
||||
|
||||
``list_nodes``
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ and each event tag has a list of reactor SLS files to be run.
|
|||
Reactor sls files are similar to state and pillar sls files. They are
|
||||
by default yaml + Jinja templates and are passed familar context variables.
|
||||
|
||||
They differ because of the addtion of the ``tag`` and ``data`` variables.
|
||||
They differ because of the addition of the ``tag`` and ``data`` variables.
|
||||
|
||||
- The ``tag`` variable is just the tag in the fired event.
|
||||
- The ``data`` variable is the event's data dict.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Salt Cloud Merged into Salt
|
|||
---------------------------
|
||||
|
||||
Salt Cloud is a tool for provisioning salted minions across various cloud
|
||||
providers. Prior to this release, Salt Cloud was a seperate project but this
|
||||
providers. Prior to this release, Salt Cloud was a separate project but this
|
||||
marks its full integration with the Salt distribution. A Getting Started guide
|
||||
and additional documentation for Salt Cloud can be found :doc:`here
|
||||
</topics/cloud/index>`:
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ file is located at /etc/salt/roster.
|
|||
How Rosters Work
|
||||
================
|
||||
|
||||
The roster system compiles a data structure internally refered to as
|
||||
The roster system compiles a data structure internally referred to as
|
||||
`targets`. The `targets` is a list of target systems and attributes about how
|
||||
to connect to said systems. The only requirement for a roster module in Salt
|
||||
is to return the `targets` data structure.
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ with an unresponsive daemon, be sure to include this information if possible.
|
|||
Live Salt-Master Profiling
|
||||
==========================
|
||||
|
||||
When faced with perfomance problems one can turn on master process profiling by
|
||||
When faced with performance problems one can turn on master process profiling by
|
||||
sending it SIGUSR2.
|
||||
|
||||
.. code-block:: bash
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
# TODO: -E --exsel[tab] -- how?
|
||||
# TODO: --compound[tab] -- how?
|
||||
# TODO: use history to extract some words, esp. if ${cur} is empty
|
||||
# TODO: TEST EVERYTING a lot
|
||||
# TODO: TEST EVERYTHING a lot
|
||||
# TODO: cache results of some functions? where? how long?
|
||||
# TODO: is it ok to use '--timeout 2' ?
|
||||
|
||||
|
|
|
|||
|
|
@ -620,7 +620,7 @@ class Cloud(object):
|
|||
ret_multip.update(obj)
|
||||
|
||||
# build up a datastructure similar to what the non-parallel
|
||||
# destory uses
|
||||
# destroy uses
|
||||
for obj in parallel_data:
|
||||
alias = obj['alias']
|
||||
driver = obj['driver']
|
||||
|
|
|
|||
|
|
@ -2140,7 +2140,7 @@ install_red_hat_enterprise_server_testing_post() {
|
|||
# Amazon Linux AMI Install Functions
|
||||
#
|
||||
install_amazon_linux_ami_deps() {
|
||||
# Acording to http://aws.amazon.com/amazon-linux-ami/faqs/#epel we should
|
||||
# According to http://aws.amazon.com/amazon-linux-ami/faqs/#epel we should
|
||||
# enable the EPEL 6 repo
|
||||
if [ $CPU_ARCH_L = "i686" ]; then
|
||||
EPEL_ARCH="i386"
|
||||
|
|
@ -2380,7 +2380,7 @@ __freebsd_get_packagesite() {
|
|||
set -o nounset
|
||||
}
|
||||
|
||||
# Using a seperate conf step to head for idempotent install...
|
||||
# Using a separate conf step to head for idempotent install...
|
||||
__configure_freebsd_pkg_details() {
|
||||
|
||||
## pkg.conf is deprecated.
|
||||
|
|
|
|||
|
|
@ -50,5 +50,5 @@ class SaltCloudExecutionTimeout(SaltCloudException):
|
|||
|
||||
class SaltCloudExecutionFailure(SaltCloudException):
|
||||
'''
|
||||
Raised when too much failures have ocurred while querying/waiting for data.
|
||||
Raised when too much failures have occurred while querying/waiting for data.
|
||||
'''
|
||||
|
|
|
|||
|
|
@ -824,7 +824,7 @@ class LocalFuncs(object):
|
|||
log.error(exc)
|
||||
log.error('Exception occurred while '
|
||||
'introspecting {0}: {1}'.format(fun, exc))
|
||||
data['return'] = 'Exception occured in wheel {0}: {1}: {2}'.format(
|
||||
data['return'] = 'Exception occurred in wheel {0}: {1}: {2}'.format(
|
||||
fun,
|
||||
exc.__class__.__name__,
|
||||
exc,
|
||||
|
|
@ -893,7 +893,7 @@ class LocalFuncs(object):
|
|||
except Exception as exc:
|
||||
log.error('Exception occurred while '
|
||||
'introspecting {0}: {1}'.format(fun, exc))
|
||||
data['return'] = 'Exception occured in wheel {0}: {1}: {2}'.format(
|
||||
data['return'] = 'Exception occurred in wheel {0}: {1}: {2}'.format(
|
||||
fun,
|
||||
exc.__class__.__name__,
|
||||
exc,
|
||||
|
|
|
|||
|
|
@ -2236,7 +2236,7 @@ class ClearFuncs(object):
|
|||
log.error(exc)
|
||||
log.error('Exception occurred while '
|
||||
'introspecting {0}: {1}'.format(fun, exc))
|
||||
data['return'] = 'Exception occured in wheel {0}: {1}: {2}'.format(
|
||||
data['return'] = 'Exception occurred in wheel {0}: {1}: {2}'.format(
|
||||
fun,
|
||||
exc.__class__.__name__,
|
||||
exc,
|
||||
|
|
@ -2305,7 +2305,7 @@ class ClearFuncs(object):
|
|||
except Exception as exc:
|
||||
log.error('Exception occurred while '
|
||||
'introspecting {0}: {1}'.format(fun, exc))
|
||||
data['return'] = 'Exception occured in wheel {0}: {1}: {2}'.format(
|
||||
data['return'] = 'Exception occurred in wheel {0}: {1}: {2}'.format(
|
||||
fun,
|
||||
exc.__class__.__name__,
|
||||
exc,
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ def install(name=None, pkgs=None, taps=None, options=None, **kwargs):
|
|||
salt '*' pkg.install php54 taps='["josegonzalez/php", "homebrew/dupes"]'
|
||||
|
||||
options
|
||||
Options to pass to brew. Only applies to inital install. Due to how brew
|
||||
Options to pass to brew. Only applies to initial install. Due to how brew
|
||||
works, modifying chosen options requires a full uninstall followed by a
|
||||
fresh install. Note that if "pkgs" is used, all options will be passed
|
||||
to all packages. Unreconized options for a package will be silently
|
||||
|
|
|
|||
|
|
@ -917,7 +917,7 @@ def script(source,
|
|||
The script will be executed directly, so it can be written in any available
|
||||
programming language.
|
||||
|
||||
The script can also be formated as a template, the default is jinja.
|
||||
The script can also be formatted as a template, the default is jinja.
|
||||
Arguments for the script can be specified as well.
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -1019,7 +1019,7 @@ def script_retcode(source,
|
|||
The script will be executed directly, so it can be written in any available
|
||||
programming language.
|
||||
|
||||
The script can also be formated as a template, the default is jinja.
|
||||
The script can also be formatted as a template, the default is jinja.
|
||||
|
||||
Only evaluate the script return code and do not block for terminal output
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ def install(dir,
|
|||
'''
|
||||
Install composer dependencies for a directory.
|
||||
|
||||
If composer has not been installed globally making it avaliable in the
|
||||
If composer has not been installed globally making it available in the
|
||||
system PATH & making it executible, the ``composer`` and ``php`` parameters
|
||||
will need to be set to the location of the executables.
|
||||
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ def _log_default_network(opt, value):
|
|||
|
||||
def _raise_error_iface(iface, option, expected):
|
||||
'''
|
||||
Log and raise an error with a logical formated message.
|
||||
Log and raise an error with a logical formatted message.
|
||||
'''
|
||||
msg = _error_msg_iface(iface, option, expected)
|
||||
log.error(msg)
|
||||
|
|
@ -182,7 +182,7 @@ def _raise_error_iface(iface, option, expected):
|
|||
|
||||
def _raise_error_network(option, expected):
|
||||
'''
|
||||
Log and raise an error with a logical formated message.
|
||||
Log and raise an error with a logical formatted message.
|
||||
'''
|
||||
msg = _error_msg_network(option, expected)
|
||||
log.error(msg)
|
||||
|
|
@ -191,7 +191,7 @@ def _raise_error_network(option, expected):
|
|||
|
||||
def _raise_error_routes(iface, option, expected):
|
||||
'''
|
||||
Log and raise an error with a logical formated message.
|
||||
Log and raise an error with a logical formatted message.
|
||||
'''
|
||||
msg = _error_msg_routes(iface, option, expected)
|
||||
log.error(msg)
|
||||
|
|
|
|||
|
|
@ -770,7 +770,7 @@ def stop(container, timeout=10, *args, **kwargs):
|
|||
except Exception:
|
||||
invalid(status, id=container, out=traceback.format_exc(),
|
||||
comment=(
|
||||
'An exception occured while stopping '
|
||||
'An exception occurred while stopping '
|
||||
'your container {0}').format(container))
|
||||
return status
|
||||
|
||||
|
|
|
|||
|
|
@ -896,7 +896,7 @@ def replace(path,
|
|||
show_changes=True,
|
||||
):
|
||||
'''
|
||||
Replace occurances of a pattern in a file
|
||||
Replace occurrences of a pattern in a file
|
||||
|
||||
.. versionadded:: 0.17.0
|
||||
|
||||
|
|
@ -1124,7 +1124,7 @@ def blockreplace(path,
|
|||
orig_file.append(line)
|
||||
if result is not None:
|
||||
new_file.append(result)
|
||||
# end for. If we are here without block managment we maybe have some problems,
|
||||
# end for. If we are here without block management we maybe have some problems,
|
||||
# or we need to initialise the marked block
|
||||
|
||||
if in_block:
|
||||
|
|
@ -1191,7 +1191,7 @@ def search(path,
|
|||
bufsize=1,
|
||||
):
|
||||
'''
|
||||
Search for occurances of a pattern in a file
|
||||
Search for occurrences of a pattern in a file
|
||||
|
||||
.. versionadded:: 0.17.0
|
||||
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ def getClockShowDate(**kwargs):
|
|||
|
||||
def setClockShowDate(kvalue, **kwargs):
|
||||
'''
|
||||
Set whether the date is visable in the clock
|
||||
Set whether the date is visible in the clock
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ def save(filename=None, family='ipv4'):
|
|||
|
||||
def check(table='filter', chain=None, rule=None, family='ipv4'):
|
||||
'''
|
||||
Check for the existance of a rule in the table and chain
|
||||
Check for the existence of a rule in the table and chain
|
||||
|
||||
This function accepts a rule in a standard iptables command format,
|
||||
starting with the chain. Trying to force users to adapt to a new
|
||||
|
|
@ -377,7 +377,7 @@ def check_chain(table='filter', chain=None, family='ipv4'):
|
|||
'''
|
||||
.. versionadded:: 2014.1.0 (Hydrogen)
|
||||
|
||||
Check for the existance of a chain in the table
|
||||
Check for the existence of a chain in the table
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Support for ``pkgng``, the new package manager for FreeBSD
|
|||
|
||||
.. warning::
|
||||
|
||||
This module has been completely rewritten. Up to and includng version
|
||||
This module has been completely rewritten. Up to and including version
|
||||
0.17.x, it was available as the ``pkgng`` module, (``pkgng.install``,
|
||||
``pkgng.delete``, etc.), but moving forward this module will no longer be
|
||||
available as ``pkgng``, as it will behave like a normal Salt ``pkg``
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ def get_pid_list():
|
|||
|
||||
def kill_pid(pid, signal=15):
|
||||
'''
|
||||
Kill a proccess by PID.
|
||||
Kill a process by PID.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
|
|
|||
|
|
@ -733,7 +733,7 @@ def _parse_network_settings(opts, current):
|
|||
|
||||
def _raise_error_iface(iface, option, expected):
|
||||
'''
|
||||
Log and raise an error with a logical formated message.
|
||||
Log and raise an error with a logical formatted message.
|
||||
'''
|
||||
msg = _error_msg_iface(iface, option, expected)
|
||||
log.error(msg)
|
||||
|
|
@ -742,7 +742,7 @@ def _raise_error_iface(iface, option, expected):
|
|||
|
||||
def _raise_error_network(option, expected):
|
||||
'''
|
||||
Log and raise an error with a logical formated message.
|
||||
Log and raise an error with a logical formatted message.
|
||||
'''
|
||||
msg = _error_msg_network(option, expected)
|
||||
log.error(msg)
|
||||
|
|
@ -751,7 +751,7 @@ def _raise_error_network(option, expected):
|
|||
|
||||
def _raise_error_routes(iface, option, expected):
|
||||
'''
|
||||
Log and raise an error with a logical formated message.
|
||||
Log and raise an error with a logical formatted message.
|
||||
'''
|
||||
msg = _error_msg_routes(iface, option, expected)
|
||||
log.error(msg)
|
||||
|
|
|
|||
|
|
@ -1260,7 +1260,7 @@ def delta_import(handler, host=None, core_name=None, options=None, extra=None):
|
|||
if not resp['success']:
|
||||
return resp
|
||||
options = _merge_options(options)
|
||||
#if we're nuking data, and we're multi-core disable replication for safty
|
||||
#if we're nuking data, and we're multi-core disable replication for safety
|
||||
if options['clean'] and _check_for_cores():
|
||||
resp = set_replication_enabled(False, host=host, core_name=core_name)
|
||||
if not resp['success']:
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ def check_key(user, key, enc, comment, options, config='.ssh/authorized_keys',
|
|||
current = auth_keys(user, config)
|
||||
nline = _format_auth_line(key, enc, comment, options)
|
||||
|
||||
# Removing existing keys from the auth_keys isnt really a good idea
|
||||
# Removing existing keys from the auth_keys isn't really a good idea
|
||||
# in fact
|
||||
#
|
||||
# as:
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ def refresh_db():
|
|||
Returns:
|
||||
|
||||
- ``True``: Updates are available
|
||||
- ``False``: An error occured
|
||||
- ``False``: An error occurred
|
||||
- ``None``: No updates are available
|
||||
|
||||
CLI Example:
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class GitPillar(object):
|
|||
|
||||
def __init__(self, branch, repo_location, opts):
|
||||
'''
|
||||
Try to initilize the Git repo object
|
||||
Try to initialize the Git repo object
|
||||
'''
|
||||
self.branch = branch
|
||||
self.rp_location = repo_location
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ There are a few things to keep in mind:
|
|||
* The use of encryption, i.e. setting gpgowner in your settings, requires
|
||||
python-gnupg to be installed.
|
||||
* The field gpgowner specifies a user's ~/.gpg directory. This must contain a
|
||||
gpg public key matching the adress the mail is sent to. If left unset, no
|
||||
gpg public key matching the address the mail is sent to. If left unset, no
|
||||
encryption will be used.
|
||||
* smtp.fields lets you include the value(s) of various fields in the subject
|
||||
line of the email. These are comma-delimited. For instance:
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class RunnerClient(object):
|
|||
data['return'] = self.low(fun, low)
|
||||
data['success'] = True
|
||||
except Exception as exc:
|
||||
data['return'] = 'Exception occured in runner {0}: {1}: {2}'.format(
|
||||
data['return'] = 'Exception occurred in runner {0}: {1}: {2}'.format(
|
||||
fun,
|
||||
exc.__class__.__name__,
|
||||
exc,
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@ objShell.Exec("{1}{2}")'''
|
|||
|
||||
# First off, change to the local temp directory, stop salt-minion (if
|
||||
# running), and remove the master's public key.
|
||||
# This is to accomodate for reinstalling Salt over an old or broken build,
|
||||
# This is to accommodate for reinstalling Salt over an old or broken build,
|
||||
# e.g. if the master address is changed, the salt-minion process will fail
|
||||
# to authenticate and quit; which means infinite restarts under Windows.
|
||||
batch = 'cd /d %TEMP%\nnet stop salt-minion\ndel c:\\salt\\conf\\pki\\minion\\minion_master.pub\n'
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ class Compiler(object):
|
|||
name, body['__sls__'], type(name))
|
||||
errors.append(err)
|
||||
if not isinstance(body, dict):
|
||||
err = ('The type {0} in {1} is not formated as a dictionary'
|
||||
err = ('The type {0} in {1} is not formatted as a dictionary'
|
||||
.format(name, body))
|
||||
errors.append(err)
|
||||
continue
|
||||
|
|
@ -756,7 +756,7 @@ class State(object):
|
|||
name, body['__sls__'], type(name))
|
||||
errors.append(err)
|
||||
if not isinstance(body, dict):
|
||||
err = ('The type {0} in {1} is not formated as a dictionary'
|
||||
err = ('The type {0} in {1} is not formatted as a dictionary'
|
||||
.format(name, body))
|
||||
errors.append(err)
|
||||
continue
|
||||
|
|
@ -1123,7 +1123,7 @@ class State(object):
|
|||
rkey = key.split('_')[0]
|
||||
items = arg[key]
|
||||
if isinstance(items, dict):
|
||||
# Formated as a single req_in
|
||||
# Formatted as a single req_in
|
||||
for _state, name in items.items():
|
||||
|
||||
# Not a use requisite_in
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ def extracted(name,
|
|||
.. versionadded:: 2014.1.0 (Hydrogen)
|
||||
|
||||
State that make sure an archive is extracted in a directory.
|
||||
The downloaded archive is erased if succesfully extracted.
|
||||
The downloaded archive is erased if successfully extracted.
|
||||
The archive is downloaded only if necessary.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
|
@ -68,7 +68,7 @@ def extracted(name,
|
|||
Only used for tar format, it need to be the tar argument specific to
|
||||
this archive, such as 'J' for LZMA.
|
||||
Using this option means that the tar executable on the target will
|
||||
be used, which is less platform independant.
|
||||
be used, which is less platform independent.
|
||||
If this option is not set, then the Python tarfile module is used.
|
||||
The tarfile module supports gzip and bz2 in Python 2.
|
||||
'''
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ Is changed to this:
|
|||
Then the existing cron will be updated, but if the cron command is changed,
|
||||
then a new cron job will be added to the user's crontab.
|
||||
|
||||
Salt also supports running a cron every ``x minutes`` very similarily to the Unix
|
||||
Salt also supports running a cron every ``x minutes`` very similarly to the Unix
|
||||
convention of using ``*/5`` to have a job run every five minutes. In Salt, this
|
||||
looks like:
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ def present(name, zone, ttl, data, rdtype='A'):
|
|||
TTL for the record
|
||||
|
||||
data
|
||||
Data for the DNS record. E.g., the IP addres for an A record.
|
||||
Data for the DNS record. E.g., the IP address for an A record.
|
||||
|
||||
rdtype
|
||||
DNS resource type. Default 'A'.
|
||||
|
|
@ -80,7 +80,7 @@ def absent(name, zone, data=None, rdtype=None):
|
|||
The zone to check
|
||||
|
||||
data
|
||||
Data for the DNS record. E.g., the IP addres for an A record. If omitted,
|
||||
Data for the DNS record. E.g., the IP address for an A record. If omitted,
|
||||
all records matching name (and rdtype, if provided) will be purged.
|
||||
|
||||
rdtype
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ Available Functions
|
|||
|
||||
We should add magic to all methods to also match containers by name
|
||||
now that the 'naming link' stuff has been merged in docker.
|
||||
This applies for exemple to:
|
||||
This applies for example to:
|
||||
|
||||
- running
|
||||
- absent
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ def absent(name, protocol=None, service_address=None, server_address=None):
|
|||
The service protocol(only support ``tcp``, ``udp`` and ``fwmark`` service).
|
||||
|
||||
service_address
|
||||
The LVS service adress.
|
||||
The LVS service address.
|
||||
|
||||
server_address
|
||||
The LVS real server address.
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ def absent(name, protocol=None, service_address=None):
|
|||
The service protocol
|
||||
|
||||
service_address
|
||||
The LVS service adress
|
||||
The LVS service address
|
||||
'''
|
||||
ret = {'name': name,
|
||||
'changes': {},
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ def present(name,
|
|||
|
||||
'md5{MD5OF({password}{role}}'
|
||||
|
||||
If encrypted is None or True, the password will be automaticly
|
||||
If encrypted is None or True, the password will be automatically
|
||||
encrypted to the previous
|
||||
format if it is not already done.
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ def present(name,
|
|||
# default to encrypted passwords
|
||||
if encrypted is not False:
|
||||
encrypted = postgres._DEFAULT_PASSWORDS_ENCRYPTION
|
||||
# maybe encrypt if if not already and neccesary
|
||||
# maybe encrypt if if not already and necessary
|
||||
password = postgres._maybe_encrypt_password(name,
|
||||
password,
|
||||
encrypted=encrypted)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ def present(name,
|
|||
|
||||
'md5{MD5OF({password}{role}}'
|
||||
|
||||
If encrypted is None or True, the password will be automaticly
|
||||
If encrypted is None or True, the password will be automatically
|
||||
encrypted to the previous
|
||||
format if it is not already done.
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ def present(name,
|
|||
# default to encrypted passwords
|
||||
if encrypted is not False:
|
||||
encrypted = postgres._DEFAULT_PASSWORDS_ENCRYPTION
|
||||
# maybe encrypt if if not already and neccesary
|
||||
# maybe encrypt if if not already and necessary
|
||||
password = postgres._maybe_encrypt_password(name,
|
||||
password,
|
||||
encrypted=encrypted)
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ class SaltEvent(object):
|
|||
def get_event(self, wait=5, tag='', full=False):
|
||||
'''
|
||||
Get a single publication.
|
||||
IF no publication available THEN block for upto wait seconds
|
||||
IF no publication available THEN block for up to wait seconds
|
||||
AND either return publication OR None IF no publication available.
|
||||
|
||||
IF wait is 0 then block forever.
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@ class PostgresTestCase(TestCase):
|
|||
|
||||
@patch('salt.modules.postgres.create_metadata',
|
||||
Mock(side_effect=[
|
||||
# create suceeded
|
||||
# create succeeded
|
||||
[postgres._EXTENSION_NOT_INSTALLED],
|
||||
[postgres._EXTENSION_INSTALLED],
|
||||
[postgres._EXTENSION_NOT_INSTALLED],
|
||||
|
|
@ -591,11 +591,11 @@ class PostgresTestCase(TestCase):
|
|||
postgres._EXTENSION_TO_UPGRADE,
|
||||
postgres._EXTENSION_INSTALLED],
|
||||
[postgres._EXTENSION_INSTALLED],
|
||||
# move suceeded
|
||||
# move succeeded
|
||||
[postgres._EXTENSION_TO_MOVE,
|
||||
postgres._EXTENSION_INSTALLED],
|
||||
[postgres._EXTENSION_INSTALLED],
|
||||
# upgrade suceeded
|
||||
# upgrade succeeded
|
||||
[postgres._EXTENSION_TO_UPGRADE,
|
||||
postgres._EXTENSION_INSTALLED],
|
||||
[postgres._EXTENSION_INSTALLED],
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ class BuildoutOnlineTestCase(Base):
|
|||
b2_dir = os.path.join(self.tdir, 'b', 'b2')
|
||||
self.assertTrue(buildout._has_old_distribute(self.py_dis))
|
||||
# this is too hard to check as on debian & other where old
|
||||
# packages are present (virtualenv), we cant have
|
||||
# packages are present (virtualenv), we can't have
|
||||
# a clean site-packages
|
||||
# self.assertFalse(buildout._has_old_distribute(self.py_blank))
|
||||
self.assertFalse(buildout._has_old_distribute(self.py_st))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue