saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove trailing white spaces in files under salt/ dir

Browse source
This commit is contained in:
Denys Havrysh 2016-03-01 17:38:39 +02:00
parent fbfc3abccf
commit 776b2ea9a6
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cloud/deploy/Ubuntu-git.sh
View file

@ -15,7 +15,7 @@ EOF
# add-apt-repository requires an additional dep and is in different packages
# on different systems. Although seemingly ubiquitous it is not a standard,
# and is only a convenience script intended to accomplish the below two steps
# and is only a convenience script intended to accomplish the below two steps
# doing it this way is universal across all debian and ubuntu systems.
echo deb http://ppa.launchpad.net/saltstack/salt/ubuntu `lsb_release -sc` main | tee /etc/apt/sources.list.d/saltstack.list
wget -q -O- "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4759FA960E27C0A6" | apt-key add -

2
salt/cloud/deploy/Ubuntu.sh
View file

@ -15,7 +15,7 @@ EOF
# add-apt-repository requires an additional dep and is in different packages
# on different systems. Although seemingly ubiquitous it is not a standard,
# and is only a convenience script intended to accomplish the below two steps
# and is only a convenience script intended to accomplish the below two steps
# doing it this way is universal across all debian and ubuntu systems.
echo deb http://ppa.launchpad.net/saltstack/salt/ubuntu `lsb_release -sc` main | tee /etc/apt/sources.list.d/saltstack.list
wget -q -O- "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4759FA960E27C0A6" | apt-key add -

2
salt/cloud/deploy/curl-bootstrap-git.sh
View file

@ -4,7 +4,7 @@
# This is a generic wrapper for the salt-bootstrap script at:
#
# https://github.com/saltstack/salt-bootstrap
#
#
# It has been designed as an example, to be customized for your own needs.
curl -L https://bootstrap.saltstack.com | sudo sh -s -- "$@" git develop

2
salt/cloud/deploy/curl-bootstrap.sh
View file

@ -4,7 +4,7 @@
# This is a generic wrapper for the salt-bootstrap script at:
#
# https://github.com/saltstack/salt-bootstrap
#
#
# It has been designed as an example, to be customized for your own needs.
curl -L https://bootstrap.saltstack.com | sudo sh -s -- "$@"

2
salt/cloud/deploy/python-bootstrap.sh
View file

@ -4,7 +4,7 @@
# This is a generic wrapper for the salt-bootstrap script at:
#
# https://github.com/saltstack/salt-bootstrap
#
#
# It has been designed as an example, to be customized for your own needs.
python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' | sudo sh -s -- "$@"

2
salt/cloud/deploy/wget-bootstrap-nocert.sh
View file

@ -4,7 +4,7 @@
# This is a generic wrapper for the salt-bootstrap script at:
#
# https://github.com/saltstack/salt-bootstrap
#
#
# It has been designed as an example, to be customized for your own needs.
wget --no-check-certificate -O - https://bootstrap.saltstack.com | sudo sh -s -- "$@"

2
salt/cloud/deploy/wget-bootstrap.sh
View file

@ -4,7 +4,7 @@
# This is a generic wrapper for the salt-bootstrap script at:
#
# https://github.com/saltstack/salt-bootstrap
#
#
# It has been designed as an example, to be customized for your own needs.
wget -O - https://bootstrap.saltstack.com | sudo sh -s -- "$@"

16
salt/templates/debian_ip/debian_ppp_eth.jinja
View file

@ -1,24 +1,24 @@
{%- set iface = data.data.inet -%}
{% if iface['user'] %}user {{ iface['user']}}
{% if iface['password']%}password {{ iface['password'] }} {% endif %}
plugin rp-pppoe.so {{iface['pppoe_iface']|default('eth0')}}
plugin rp-pppoe.so {{iface['pppoe_iface']|default('eth0')}}
{% if iface['noipdefault']!="False"|default("True") %}noipdefault{% endif %}
{% if iface['usepeerdns']!="False"|default("True") %}usepeerdns {% endif %}
{% if iface['noipdefault']!="False"|default("True") %}noipdefault{% endif %}
{% if iface['usepeerdns']!="False"|default("True") %}usepeerdns {% endif %}
{% if iface['defaultroute']!="False"|default("True") %}defaultroute{% endif %}
{% if iface['holdoff']!=""|default('15') %}holdoff {{iface['holdoff']|default('15')}}{% endif %}
{% if iface['maxfail']!=""|default('0') %}maxfail {{iface['maxfail']|default('0')}}{% endif %}
{% if iface['hide-password']!="False"|default("True") %}hide-password{% endif %}
{% if iface['lcp-echo-interval']!=""|default('20') %}lcp-echo-interval {{ iface['lcp-echo-interval']|default('20')}} {% endif %}
{% if iface['lcp-echo-interval']!=""|default('20') %}lcp-echo-interval {{ iface['lcp-echo-interval']|default('20')}} {% endif %}
{% if iface['lcp-echo-failure']!=""|default('3') %}lcp-echo-failure {{iface['lcp-echo-failure']|default('3')}} {% endif %}
{% if iface['noauth']!="False"|default("True") %}noauth{% endif %}
{% if iface['persist']!="False"|default("True") %}persist{% endif %}
{% if iface['mtu']!=""|default('1492') %}mtu {{iface['mtu']|default('1492')}} {% endif %}
{% if iface['noaccomp']!="False"|default("True") %}noaccomp{% endif %}
{% if iface['default-asyncmap'] %}default-asyncmap{% endif %}
{% if iface['persist']!="False"|default("True") %}persist{% endif %}
{% if iface['mtu']!=""|default('1492') %}mtu {{iface['mtu']|default('1492')}} {% endif %}
{% if iface['noaccomp']!="False"|default("True") %}noaccomp{% endif %}
{% if iface['default-asyncmap'] %}default-asyncmap{% endif %}
{% if iface['linkname'] is defined %}
linkname {{ iface['linkname'] }}
{% endif %}