diff --git a/_modules/ferm.py b/_modules/ferm.py
index f3f4f7f5ddbbfa83fc13f7d34fb6a34448cc9bbd..4423b8eabedd268b04c494603a3d62b2f1a593f7 100644
--- a/_modules/ferm.py
+++ b/_modules/ferm.py
@@ -5,6 +5,6 @@ LOG = logging.getLogger(__name__)
def resolve(hostname):
try:
- return {x[4][0] for x in socket.getaddrinfo(hostname, 80)}
+ return {x[4][0] for x in socket.getaddrinfo(hostname, 80)}
except:
return ()
diff --git a/_modules/nextnode.py b/_modules/nextnode.py
index 4c33cb02aee05264043957706ec7b6c66546e0f6..d54e7093a2c55f596abb42f39800ff7c519596e7 100644
--- a/_modules/nextnode.py
+++ b/_modules/nextnode.py
@@ -4,14 +4,14 @@ import logging
"""Expected output as an array for
nextnode.ffffm.net:
- - net: 2a06:8187:fbc0::/48
- A: [ 10.176.15.254 ]
- AAAA: [ fd06:8187:fbc0::1:1 ]
+ - net: 2a06:8187:fbc0::/48
+ A: [ 10.176.15.254 ]
+ AAAA: [ fd06:8187:fbc0::1:1 ]
so we need:
- - net: domains.dom0.global_prefix6
- A: [domains.dom0.nextnode4]
- AAAA: [domains.dom0.nextnode6]
+ - net: domains.dom0.global_prefix6
+ A: [domains.dom0.nextnode4]
+ AAAA: [domains.dom0.nextnode6]
"""
diff --git a/api/init.sls b/api/init.sls
index 27d586a0b968023c3b0cb1907c3a10a3a490b2af..55d7725beaa455eec942460f8350670424ec3500 100644
--- a/api/init.sls
+++ b/api/init.sls
@@ -36,8 +36,8 @@ api_symlink_community_json:
- target: {{ api_community_json }}/ff-frankfurt.json
- force: True
- require:
- - git: api_update_community_repository
- - file: api_create_srv_www_community_api
+ - git: api_update_community_repository
+ - file: api_create_srv_www_community_api
api_place_community_updater_script:
file.managed:
diff --git a/batman_adv/files/prometheus-batadv-txtexport.sh b/batman_adv/files/prometheus-batadv-txtexport.sh
index d9a7905c5da7f58fab5c351dbcaf4e215d8d59ff..51709fcb8e13854fe9b2fa98351ad76030f89c5c 100644
--- a/batman_adv/files/prometheus-batadv-txtexport.sh
+++ b/batman_adv/files/prometheus-batadv-txtexport.sh
@@ -4,17 +4,17 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
BATCTL=$(which batctl)
for batdev in /sys/class/net/dom*-bat; do
- test -d ${batdev} || exit 0
- batdev=$(basename $batdev)
- /sbin/ethtool -S ${batdev} | awk -v batdev=${batdev} '
- /^ .*:/ {
- gsub(":", "");
- print "batman_" $1 "{batdev=\"" batdev "\"} " $2
- }
- '
+ test -d ${batdev} || exit 0
+ batdev=$(basename $batdev)
+ /sbin/ethtool -S ${batdev} | awk -v batdev=${batdev} '
+ /^ .*:/ {
+ gsub(":", "");
+ print "batman_" $1 "{batdev=\"" batdev "\"} " $2
+ }
+ '
- echo "batman_originator_count{batdev=\"${batdev}\",selected=\"false\"}" $($BATCTL meshif ${batdev} o | egrep '^ ' | wc -l)
- echo "batman_originator_count{batdev=\"${batdev}\",selected=\"true\"}" $($BATCTL meshif ${batdev} o | egrep '^ \*' | wc -l)
- echo "batman_tg_count{batdev=\"${batdev}\",type=\"multicast\"}" $(($($BATCTL meshif ${batdev} tg -m | wc -l)-2))
- echo "batman_tg_count{batdev=\"${batdev}\",type=\"unicast\"}" $(($($BATCTL meshif ${batdev} tg -u | wc -l)-2))
+ echo "batman_originator_count{batdev=\"${batdev}\",selected=\"false\"}" $($BATCTL meshif ${batdev} o | egrep '^ ' | wc -l)
+ echo "batman_originator_count{batdev=\"${batdev}\",selected=\"true\"}" $($BATCTL meshif ${batdev} o | egrep '^ \*' | wc -l)
+ echo "batman_tg_count{batdev=\"${batdev}\",type=\"multicast\"}" $(($($BATCTL meshif ${batdev} tg -m | wc -l)-2))
+ echo "batman_tg_count{batdev=\"${batdev}\",type=\"unicast\"}" $(($($BATCTL meshif ${batdev} tg -u | wc -l)-2))
done
diff --git a/bird/files/bgp/google_more_specific4.conf b/bird/files/bgp/google_more_specific4.conf
index 30029c31bfc6bf4a0fbab5daab93c907659ba5cd..e9b879ab6c5751777d20eddd4a699511c832a20e 100644
--- a/bird/files/bgp/google_more_specific4.conf
+++ b/bird/files/bgp/google_more_specific4.conf
@@ -1,70 +1,70 @@
function reject_google_more_specific()
prefix set google;
{
- google = [
- 8.34.208.0/21{22,32},
- 8.34.216.0/21{22,32},
- 8.35.192.0/21{22,32},
- 8.35.200.0/21{22,32},
- 23.236.48.0/20{21,32},
- 23.251.128.0/19{20,32},
- 34.64.0.0/11{12,32},
- 34.96.0.0/12{13,32},
- 34.116.0.0/14{15,32},
- 34.120.0.0/13{14,32},
- 35.184.0.0/13{14,32},
- 35.192.0.0/14{15,32},
- 35.196.0.0/15{16,32},
- 35.198.0.0/16{17,32},
- 35.199.0.0/17{18,32},
- 35.199.128.0/18{19,32},
- 35.200.0.0/14{15,32},
- 35.204.0.0/15{16,32},
- 35.220.0.0/14{15,32},
- 35.224.0.0/14{15,32},
- 35.228.0.0/14{15,32},
- 35.232.0.0/14{15,32},
- 35.236.0.0/14{15,32},
- 35.240.0.0/14{15,32},
- 35.244.0.0/14{15,32},
- 64.233.160.0/19{20,32},
- 66.102.0.0/20{21,32},
- 66.249.64.0/19{20,32},
- 70.32.128.0/19{20,32},
- 72.14.192.0/18{19,32},
- 74.114.24.0/21{22,32},
- 74.125.0.0/16{17,32},
- 104.154.0.0/15{16,32},
- 104.196.0.0/14{15,32},
- 107.167.160.0/19{20,32},
- 107.178.192.0/18{19,32},
- 108.59.80.0/20{21,32},
- 108.170.192.0/18{19,32},
- 108.177.0.0/17{18,32},
- 130.211.0.0/16{17,32},
- 136.112.0.0/12{13,32},
- 142.250.0.0/15{16,32},
- 146.148.0.0/17{18,32},
- 162.216.148.0/22{23,32},
- 162.222.176.0/21{22,32},
- 172.110.32.0/21{22,32},
- 172.217.0.0/16{17,32},
- 172.253.0.0/16{17,32},
- 173.194.0.0/16{17,32},
- 173.255.112.0/20{21,32},
- 192.158.28.0/22{23,32},
- 192.178.0.0/15{16,32},
- 199.192.112.0/22{23,32},
- 199.223.232.0/21{22,32},
- 207.223.160.0/20{21,32},
- 208.68.108.0/22{23,32},
- 208.81.188.0/22{23,32},
- 209.85.128.0/17{18,32},
- 216.58.192.0/19{20,32},
- 216.73.80.0/20{21,32},
- 216.239.32.0/19{20,32}
- ];
+ google = [
+ 8.34.208.0/21{22,32},
+ 8.34.216.0/21{22,32},
+ 8.35.192.0/21{22,32},
+ 8.35.200.0/21{22,32},
+ 23.236.48.0/20{21,32},
+ 23.251.128.0/19{20,32},
+ 34.64.0.0/11{12,32},
+ 34.96.0.0/12{13,32},
+ 34.116.0.0/14{15,32},
+ 34.120.0.0/13{14,32},
+ 35.184.0.0/13{14,32},
+ 35.192.0.0/14{15,32},
+ 35.196.0.0/15{16,32},
+ 35.198.0.0/16{17,32},
+ 35.199.0.0/17{18,32},
+ 35.199.128.0/18{19,32},
+ 35.200.0.0/14{15,32},
+ 35.204.0.0/15{16,32},
+ 35.220.0.0/14{15,32},
+ 35.224.0.0/14{15,32},
+ 35.228.0.0/14{15,32},
+ 35.232.0.0/14{15,32},
+ 35.236.0.0/14{15,32},
+ 35.240.0.0/14{15,32},
+ 35.244.0.0/14{15,32},
+ 64.233.160.0/19{20,32},
+ 66.102.0.0/20{21,32},
+ 66.249.64.0/19{20,32},
+ 70.32.128.0/19{20,32},
+ 72.14.192.0/18{19,32},
+ 74.114.24.0/21{22,32},
+ 74.125.0.0/16{17,32},
+ 104.154.0.0/15{16,32},
+ 104.196.0.0/14{15,32},
+ 107.167.160.0/19{20,32},
+ 107.178.192.0/18{19,32},
+ 108.59.80.0/20{21,32},
+ 108.170.192.0/18{19,32},
+ 108.177.0.0/17{18,32},
+ 130.211.0.0/16{17,32},
+ 136.112.0.0/12{13,32},
+ 142.250.0.0/15{16,32},
+ 146.148.0.0/17{18,32},
+ 162.216.148.0/22{23,32},
+ 162.222.176.0/21{22,32},
+ 172.110.32.0/21{22,32},
+ 172.217.0.0/16{17,32},
+ 172.253.0.0/16{17,32},
+ 173.194.0.0/16{17,32},
+ 173.255.112.0/20{21,32},
+ 192.158.28.0/22{23,32},
+ 192.178.0.0/15{16,32},
+ 199.192.112.0/22{23,32},
+ 199.223.232.0/21{22,32},
+ 207.223.160.0/20{21,32},
+ 208.68.108.0/22{23,32},
+ 208.81.188.0/22{23,32},
+ 209.85.128.0/17{18,32},
+ 216.58.192.0/19{20,32},
+ 216.73.80.0/20{21,32},
+ 216.239.32.0/19{20,32}
+ ];
if ( net ~ google ) then {
reject;
}
-}
\ No newline at end of file
+}
diff --git a/bird/radv.sls b/bird/radv.sls
index ee40a581a4f1b994623ce0c064625b895f85d401..00c2bc094d716cd34b1e84aa884b37b4499989a0 100644
--- a/bird/radv.sls
+++ b/bird/radv.sls
@@ -14,6 +14,6 @@ include:
domain: {{ domain_key }}
domain_id: {{ domain_val['domain_id'] }}
- require:
- - file: /etc/bird/bird6.d
+ - file: /etc/bird/bird6.d
{% endfor %}
diff --git a/common/dhparam.sls b/common/dhparam.sls
index d10b6f06548716c8b189bdd5236c149ac98133ec..da193e8d68c7bd0032b2af22b75cb88b2b61c2fe 100644
--- a/common/dhparam.sls
+++ b/common/dhparam.sls
@@ -1,19 +1,19 @@
/etc/ssl/ffdhe4096.pem:
file.managed:
- - user: root
- - group: root
- - mode: '0644'
- - contents: |
- -----BEGIN DH PARAMETERS-----
- MIICCAKCAgEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
- +8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
- 87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
- YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
- 7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
- ssbzSibBsu/6iGtCOGEfz9zeNVs7ZRkDW7w09N75nAI4YbRvydbmyQd62R0mkff3
- 7lmMsPrBhtkcrv4TCYUTknC0EwyTvEN5RPT9RFLi103TZPLiHnH1S/9croKrnJ32
- nuhtK8UiNjoNq8Uhl5sN6todv5pC1cRITgq80Gv6U93vPBsg7j/VnXwl5B0rZp4e
- 8W5vUsMWTfT7eTDp5OWIV7asfV9C1p9tGHdjzx1VA0AEh/VbpX4xzHpxNciG77Qx
- iu1qHgEtnmgyqQdgCpGBMMRtx3j5ca0AOAkpmaMzy4t6Gh25PXFAADwqTs6p+Y0K
- zAqCkc3OyX3Pjsm1Wn+IpGtNtahR9EGC4caKAH5eZV9q//////////8CAQI=
- -----END DH PARAMETERS-----
+ - user: root
+ - group: root
+ - mode: '0644'
+ - contents: |
+ -----BEGIN DH PARAMETERS-----
+ MIICCAKCAgEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
+ +8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
+ 87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
+ YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
+ 7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
+ ssbzSibBsu/6iGtCOGEfz9zeNVs7ZRkDW7w09N75nAI4YbRvydbmyQd62R0mkff3
+ 7lmMsPrBhtkcrv4TCYUTknC0EwyTvEN5RPT9RFLi103TZPLiHnH1S/9croKrnJ32
+ nuhtK8UiNjoNq8Uhl5sN6todv5pC1cRITgq80Gv6U93vPBsg7j/VnXwl5B0rZp4e
+ 8W5vUsMWTfT7eTDp5OWIV7asfV9C1p9tGHdjzx1VA0AEh/VbpX4xzHpxNciG77Qx
+ iu1qHgEtnmgyqQdgCpGBMMRtx3j5ca0AOAkpmaMzy4t6Gh25PXFAADwqTs6p+Y0K
+ zAqCkc3OyX3Pjsm1Wn+IpGtNtahR9EGC4caKAH5eZV9q//////////8CAQI=
+ -----END DH PARAMETERS-----
diff --git a/gitlab-ci/init.sls b/gitlab-ci/init.sls
index b464dcda445ff8af38d52b0de1429d155e5362b7..fefa5eb50462849f438a7f4cdfd3f56aa9ab81ed 100644
--- a/gitlab-ci/init.sls
+++ b/gitlab-ci/init.sls
@@ -1,2 +1,2 @@
include:
- - gitlab-ci.runner
+ - gitlab-ci.runner
diff --git a/golang/init.sls b/golang/init.sls
index f6d6d9bbe5c5b07c8b66cef5731a296b1b25e10a..50ee93edb7f7788e4896279f5fbfa80d4d5c685c 100644
--- a/golang/init.sls
+++ b/golang/init.sls
@@ -19,7 +19,7 @@ golang-go:
golang-env:
file.managed:
- - name: /etc/profile.d/go
- - contents:
- export GOPATH={{ salt['pillar.get']('golang:gopath', '/usr/local/go') }}
- export PATH=$PATH:$GOPATH/bin
+ - name: /etc/profile.d/go
+ - contents:
+ export GOPATH={{ salt['pillar.get']('golang:gopath', '/usr/local/go') }}
+ export PATH=$PATH:$GOPATH/bin
diff --git a/grafana/files/grafana-server-default b/grafana/files/grafana-server-default
index 88cdf7e3008a3f8880adbef1074bf781c0eb7176..eaa75830d44747b0a349b579662b313062f17701 100644
--- a/grafana/files/grafana-server-default
+++ b/grafana/files/grafana-server-default
@@ -19,4 +19,4 @@ RESTART_ON_UPGRADE=true
PLUGINS_DIR=/var/lib/grafana/plugins
# Only used on systemd systems
-PID_FILE_DIR=/var/run/grafana
\ No newline at end of file
+PID_FILE_DIR=/var/run/grafana
diff --git a/icvpn/init.sls b/icvpn/init.sls
index 7511cdfc278883d3bc54262d4704ecf112225998..19fbc25c083c5a001764fc4c4482854c9dc91173 100644
--- a/icvpn/init.sls
+++ b/icvpn/init.sls
@@ -54,7 +54,7 @@ icvpn-scripts:
- group: root
- mode: '0644'
- require:
- - pkg: ferm
+ - pkg: ferm
include:
- tinc
diff --git a/mesh-announce/init.sls b/mesh-announce/init.sls
index 08f7357e1218b8badec7e33a925e3d2658d2902c..4a3006e9e3ab4a59c7d258691be1955967941b64 100644
--- a/mesh-announce/init.sls
+++ b/mesh-announce/init.sls
@@ -18,10 +18,10 @@ include:
mesh-announce_deps:
pkg.installed:
- - pkgs:
- - ethtool
- - lsb-release
- - python3-netifaces
+ - pkgs:
+ - ethtool
+ - lsb-release
+ - python3-netifaces
/etc/mesh-announce:
file.directory
diff --git a/network/files/ferm-vxlan.conf.j2 b/network/files/ferm-vxlan.conf.j2
index eae4d3da34a6b11f847fdceb277bbe8c57254df2..10ef65a5b226a2e8e8a9f9a01ea173bd4b234f09 100644
--- a/network/files/ferm-vxlan.conf.j2
+++ b/network/files/ferm-vxlan.conf.j2
@@ -4,4 +4,4 @@ domain ip6 {
interface {{ name }} proto udp dport 4789 ACCEPT;
}
}
-}
\ No newline at end of file
+}
diff --git a/nginx/files/sites/tiles.ffm.freifunk.net.conf.j2 b/nginx/files/sites/tiles.ffm.freifunk.net.conf.j2
index 4d19ad4a4e8668083961c01524f49695491ec75a..72af3010890a48fd245e68fd0f5c714d508f422a 100644
--- a/nginx/files/sites/tiles.ffm.freifunk.net.conf.j2
+++ b/nginx/files/sites/tiles.ffm.freifunk.net.conf.j2
@@ -35,13 +35,13 @@ server {
access_log "{{ access_log }}" main;
error_log "{{ error_log }}";
-
+
root /srv/www/tiles.ffm.freifunk.net/htdocs;
location / {
try_files $uri @osm;
}
-
+
location @osm {
proxy_pass http://osm_tiles;
proxy_http_version 1.1;
diff --git a/nginx/init.sls b/nginx/init.sls
index acb96ab12709ba7127d96b60a21bb7218847dbb7..1816fead911459f606296d9a84725c7b1137a7e8 100644
--- a/nginx/init.sls
+++ b/nginx/init.sls
@@ -78,7 +78,7 @@ nginx:
- file: /etc/nginx/sites-available/{{ grains['fqdn'] }}.conf
/etc/nginx/snippets/gzip.conf:
- file.managed:
+ file.managed:
- user: root
- group: root
- mode: '0644'
@@ -135,7 +135,7 @@ nginx_config_cleanup_tcp_nodelay:
/etc/logrotate.d/nginx-custom:
- file.managed:
+ file.managed:
- user: root
- group: root
- mode: '0644'
diff --git a/prometheus/README.md b/prometheus/README.md
index d0ba0366183e6e01d14009584fbcf7e294bdd0ec..b101025e7019560b1797ccd81c766161f0bc486f 100644
--- a/prometheus/README.md
+++ b/prometheus/README.md
@@ -1,3 +1,3 @@
# Update
-Neuste SHAs und Versions Nummer aus sha256sums.txt von https://github.com/prometheus/prometheus/releases und https://github.com/prometheus/alertmanager/releases in map.jinja eintragen
\ No newline at end of file
+Neuste SHAs und Versions Nummer aus sha256sums.txt von https://github.com/prometheus/prometheus/releases und https://github.com/prometheus/alertmanager/releases in map.jinja eintragen
diff --git a/prometheus/alertmanager.sls b/prometheus/alertmanager.sls
index 2851deda0ce39accffe7d626edd83fa27414023c..d8d92af7f1c7365d94f70b97bbff2512e58b87f7 100644
--- a/prometheus/alertmanager.sls
+++ b/prometheus/alertmanager.sls
@@ -35,13 +35,13 @@ alertmanager tarball:
/etc/default/prometheus-alertmanager:
file.managed:
- - source: salt://prometheus/files/alertmanager/prometheus-alertmanager
- - user: root
- - group: root
- - mode: '0644'
- - template: jinja
- - watch_in:
- - service: prometheus-alertmanager.service
+ - source: salt://prometheus/files/alertmanager/prometheus-alertmanager
+ - user: root
+ - group: root
+ - mode: '0644'
+ - template: jinja
+ - watch_in:
+ - service: prometheus-alertmanager.service
prometheus-alertmanager.service:
service.running:
diff --git a/prometheus/checkrestart.sls b/prometheus/checkrestart.sls
index 362e982a319f9dec823a29538e3e42e215d8714d..0e0eb68e69e1b92987bc8714565ddec0defb5f05 100644
--- a/prometheus/checkrestart.sls
+++ b/prometheus/checkrestart.sls
@@ -27,13 +27,13 @@
- file: /usr/local/sbin/checkrestart_exporter.sh
/etc/systemd/system/checkrestart_exporter.timer:
- file.managed:
- - source: salt://prometheus/files/checkrestart/checkrestart_exporter.timer
- - user: root
- - group: root
- - mode: '0644'
- - require:
- - file: /usr/local/sbin/checkrestart_exporter.sh
+ file.managed:
+ - source: salt://prometheus/files/checkrestart/checkrestart_exporter.timer
+ - user: root
+ - group: root
+ - mode: '0644'
+ - require:
+ - file: /usr/local/sbin/checkrestart_exporter.sh
checkrestart_exporter.timer:
service.running:
diff --git a/prometheus/exporter.sls b/prometheus/exporter.sls
index bd07b1d4729838d6683b339372e6fb02d8d4ec4d..17c7d10942ea8ab1da33616cc463fda61e92f3ca 100644
--- a/prometheus/exporter.sls
+++ b/prometheus/exporter.sls
@@ -33,18 +33,18 @@ prometheus-node-exporter:
- group: root
- mode: '0644'
- require:
- - pkg: prometheus-node-exporter
+ - pkg: prometheus-node-exporter
/etc/tmpfiles.d/prometheus-node-exporter-textfiles.conf:
file.managed:
- - contents: |
- #Type Path Mode UID GID Age Argument
- d /run/prometheus-node-exporter/textfiles/ 0755 root root - -
- - user: root
- - group: root
- - mode: '0644'
- - require:
- - pkg: prometheus-node-exporter
+ - contents: |
+ #Type Path Mode UID GID Age Argument
+ d /run/prometheus-node-exporter/textfiles/ 0755 root root - -
+ - user: root
+ - group: root
+ - mode: '0644'
+ - require:
+ - pkg: prometheus-node-exporter
reload tmpfiles:
cmd.run:
diff --git a/prometheus/files/checkrestart/checkrestart_exporter.sh b/prometheus/files/checkrestart/checkrestart_exporter.sh
index 3e6efc790c9cd4b919c90e79390cbd29e14c174e..03aa8f2c13c1810288d2acc85bf52e44acb54ea3 100644
--- a/prometheus/files/checkrestart/checkrestart_exporter.sh
+++ b/prometheus/files/checkrestart/checkrestart_exporter.sh
@@ -2,9 +2,8 @@
FILENAME="/run/prometheus-node-exporter/textfiles/checkrestart.prom"
COUNT=$(checkrestart -p 2>/dev/null | head -n1 | awk '{ print $2 }')
-cat - <<EOF > $FILENAME
+cat - <<EOF > $FILENAME
# HELP checkrestart_process_count checkrestart count of processes with old libraries
# TYPE checkrestart_process_count gauge
checkrestart_process_count ${COUNT:-0}
EOF
-
diff --git a/ssh/files/ssh_config b/ssh/files/ssh_config
index 7b767032202ad6230c2af63901b65f23de8e6678..232f152f00f91ecd2bc101ce2b7dd3ee7e403a2d 100644
--- a/ssh/files/ssh_config
+++ b/ssh/files/ssh_config
@@ -4,7 +4,7 @@ HashKnownHosts yes
Host github.com
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
# MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-128-etm@openssh.com,hmac-sha2-512
-
+
Host *
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
PasswordAuthentication no
@@ -17,5 +17,3 @@ Host *
ControlPersist yes
ControlPath ~/.ssh/socket-%r@%h:%p
# SendEnv: LANG LC_*
-
-
diff --git a/ssh/files/sshd_config b/ssh/files/sshd_config
index a08c060d66cd2d521e981eca951e36e8f3024006..16f223f8c34be2b22a8b2a30c73e9b8ef27ba446 100644
--- a/ssh/files/sshd_config
+++ b/ssh/files/sshd_config
@@ -23,7 +23,7 @@ MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@op
LogLevel VERBOSE
Subsystem sftp /usr/lib/openssh/sftp-server
-UsePAM yes
+UsePAM yes
PrintMotd yes
PrintLastLog yes
TCPKeepAlive yes