From 7eaf778695a0e0bc4b892d23c63ec93259b0b8da Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Tue, 1 Mar 2016 17:35:34 +0200 Subject: [PATCH] Remove trailing white spaces in conf dir file --- conf/cloud | 2 +- conf/cloud.profiles.d/EC2-us-east-1.profiles | 2 +- conf/cloud.profiles.d/EC2-us-west-1.profiles | 4 ++-- conf/cloud.profiles.d/EC2-us-west-2.profiles | 4 ++-- conf/master | 14 +++++++------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/cloud b/conf/cloud index a44517cd2c11..80fe5e345389 100644 --- a/conf/cloud +++ b/conf/cloud @@ -1,4 +1,4 @@ -# This file should normally be installed at: /etc/salt/cloud +# This file should normally be installed at: /etc/salt/cloud ########################################## diff --git a/conf/cloud.profiles.d/EC2-us-east-1.profiles b/conf/cloud.profiles.d/EC2-us-east-1.profiles index 8f3e4175d204..c348543cf08f 100644 --- a/conf/cloud.profiles.d/EC2-us-east-1.profiles +++ b/conf/cloud.profiles.d/EC2-us-east-1.profiles @@ -1,4 +1,4 @@ -# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu +# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu # Arch Linux # https://wiki.archlinux.org/index.php/Arch_Linux_AMIs_for_Amazon_Web_Services diff --git a/conf/cloud.profiles.d/EC2-us-west-1.profiles b/conf/cloud.profiles.d/EC2-us-west-1.profiles index 978ac010ea13..fc29501e3a64 100644 --- a/conf/cloud.profiles.d/EC2-us-west-1.profiles +++ b/conf/cloud.profiles.d/EC2-us-west-1.profiles @@ -1,4 +1,4 @@ -# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu +# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu # Arch Linux # https://wiki.archlinux.org/index.php/Arch_Linux_AMIs_for_Amazon_Web_Services @@ -96,7 +96,7 @@ ubuntu_lucid_ec2: ubuntu_precise_ec2: provider: my-ec2-config - image: ami-3ed8fb7b + image: ami-3ed8fb7b size: t1.micro ssh_username: ubuntu location: us-west-1 diff --git a/conf/cloud.profiles.d/EC2-us-west-2.profiles b/conf/cloud.profiles.d/EC2-us-west-2.profiles index d8aad61272d6..e7d7ba8ce6f0 100644 --- a/conf/cloud.profiles.d/EC2-us-west-2.profiles +++ b/conf/cloud.profiles.d/EC2-us-west-2.profiles @@ -1,4 +1,4 @@ -# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu +# Official distro images for Arch, Centos, Debian, Fedora, FreeBSD, Ubuntu # Arch Linux # https://wiki.archlinux.org/index.php/Arch_Linux_AMIs_for_Amazon_Web_Services @@ -50,7 +50,7 @@ debian_squeeze_ec2: # https://fedoraproject.org/wiki/Cloud_images fedora_17_ec2: provider: my-ec2-config - image: ami-8e69e5be + image: ami-8e69e5be size: t1.micro ssh_username: ec2-user location: us-west-2 diff --git a/conf/master b/conf/master index 9718cc5dbf05..eb4daa8dc84e 100644 --- a/conf/master +++ b/conf/master @@ -44,7 +44,7 @@ # Directory to store job and cache data: # This directory may contain sensitive data and should be protected accordingly. -# +# #cachedir: /var/cache/salt/master # Directory for custom modules. This directory can contain subdirectories for @@ -106,7 +106,7 @@ #minion_data_cache: True # Store all returns in the given returner. -# Setting this option requires that any returner-specific configuration also +# Setting this option requires that any returner-specific configuration also # be set. See various returners in salt/returners for details on required # configuration values. (See also, event_return_queue below.) # @@ -145,12 +145,12 @@ # the key rotation event as minions reconnect. Consider this carefully if this # salt master is managing a large number of minions. # -# If disabled, it is recommended to handle this event by listening for the +# If disabled, it is recommended to handle this event by listening for the # 'aes_key_rotate' event with the 'key' tag and acting appropriately. # ping_on_rotate: False # By default, the master deletes its cache of minion data when the key for that -# minion is removed. To preserve the cache after key deletion, set +# minion is removed. To preserve the cache after key deletion, set # 'preserve_minion_cache' to True. # # WARNING: This may have security implications if compromised minions auth with @@ -291,7 +291,7 @@ # - cmd # Enforce client_acl & client_acl_blacklist when users have sudo -# access to the salt command. +# access to the salt command. # #sudo_acl: False @@ -451,7 +451,7 @@ # When using multiple environments, each with their own top file, the # default behaviour is an unordered merge. To prevent top files from # being merged together and instead to only use the top file from the -# requested environment, set this value to 'same'. +# requested environment, set this value to 'same'. #top_file_merging_strategy: merge # To specify the order in which environments are merged, set the ordering @@ -468,7 +468,7 @@ # the master server. The default is md5, but sha1, sha224, sha256, sha384 # and sha512 are also supported. # -# Prior to changing this value, the master should be stopped and all Salt +# Prior to changing this value, the master should be stopped and all Salt # caches should be cleared. #hash_type: md5