Skip to content

Commit

Permalink
Pre-commit fixups
Browse files Browse the repository at this point in the history
I use gilt[1] to pull in my Ansible roles, and a series of
pre-commit hooks which correct trailing whitespace and
newlines.  These are triggered when I vendor your project
into my repo.  Since this doesn't look too controversial,
figured I'd submit a PR.

[1]: https://gilt.readthedocs.io/en/latest/
  • Loading branch information
retr0h committed Jul 13, 2019
1 parent 1842433 commit 3659644
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ keepalived_bind_on_non_local: False
keepalived_daemon_options_file_path: "{{ _keepalived_daemon_options_file_path }}"

# Overriding keepalived daemon extra arguments, which will be applied inside of
# the keepalived_daemon_options_file_path variable.
# the keepalived_daemon_options_file_path variable.
# Example:
#keepalived_daemon_default_options_overrides:
#keepalived_daemon_default_options_overrides:
# - "DAEMON_ARGS='--snmp'"
keepalived_daemon_default_options_overrides: []
2 changes: 1 addition & 1 deletion templates/keepalived.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ virtual_server {{ vserver.ip }} {{ vserver.port }} {
SSL_GET {
url {
path {{ sslcheck.url_path }}
digest {{ sslcheck.url_digest }}
digest {{ sslcheck.url_digest }}
}
connect_timeout {{ sslcheck.connect_timeout | default('3') }}
nb_get_retry {{ sslcheck.nb_get_retry | default('3') }}
Expand Down
1 change: 0 additions & 1 deletion tests/keepalived_haproxy_master_example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,3 @@ keepalived_instances:
# connect_timeout: 3
# nb_get_retry: 3
# delay_before_retry: 2

0 comments on commit 3659644

Please sign in to comment.