From 36596446504151efc9939dc5ece73a2a4411ac65 Mon Sep 17 00:00:00 2001 From: John Dewey Date: Sat, 13 Jul 2019 09:53:31 -0700 Subject: [PATCH] Pre-commit fixups 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/ --- LICENSE | 1 - defaults/main.yml | 4 ++-- templates/keepalived.conf.j2 | 2 +- tests/keepalived_haproxy_master_example.yml | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 8f71f43..8dada3e 100644 --- a/LICENSE +++ b/LICENSE @@ -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. - diff --git a/defaults/main.yml b/defaults/main.yml index af00dad..a20da11 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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: [] diff --git a/templates/keepalived.conf.j2 b/templates/keepalived.conf.j2 index ea0968f..4cd6815 100644 --- a/templates/keepalived.conf.j2 +++ b/templates/keepalived.conf.j2 @@ -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') }} diff --git a/tests/keepalived_haproxy_master_example.yml b/tests/keepalived_haproxy_master_example.yml index 75dba44..baf59da 100644 --- a/tests/keepalived_haproxy_master_example.yml +++ b/tests/keepalived_haproxy_master_example.yml @@ -135,4 +135,3 @@ keepalived_instances: # connect_timeout: 3 # nb_get_retry: 3 # delay_before_retry: 2 -