summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/templates/rsyslog/logrotate.j26
-rw-r--r--data/templates/ssh/sshd_config.j25
2 files changed, 5 insertions, 6 deletions
diff --git a/data/templates/rsyslog/logrotate.j2 b/data/templates/rsyslog/logrotate.j2
index ea33fea4f..b9689a1cf 100644
--- a/data/templates/rsyslog/logrotate.j2
+++ b/data/templates/rsyslog/logrotate.j2
@@ -5,9 +5,6 @@
create
rotate 5
size=256k
- postrotate
- invoke-rc.d rsyslog rotate > /dev/null
- endscript
}
{% if file is vyos_defined %}
@@ -18,9 +15,6 @@
create
rotate {{ file_options.archive.file }}
size={{ file_options.archive.size | int // 1024 }}k
- postrotate
- invoke-rc.d rsyslog rotate > /dev/null
- endscript
}
{% endfor %}
diff --git a/data/templates/ssh/sshd_config.j2 b/data/templates/ssh/sshd_config.j2
index 650fd25e6..2cf0494c4 100644
--- a/data/templates/ssh/sshd_config.j2
+++ b/data/templates/ssh/sshd_config.j2
@@ -67,6 +67,11 @@ Ciphers {{ ciphers | join(',') }}
HostKeyAlgorithms {{ hostkey_algorithm | join(',') }}
{% endif %}
+{% if pubkey_accepted_algorithm is vyos_defined %}
+# Specifies the available PubKey signature algorithms
+PubkeyAcceptedAlgorithms {{ pubkey_accepted_algorithm | join(',') }}
+{% endif %}
+
{% if mac is vyos_defined %}
# Specifies the available MAC (message authentication code) algorithms
MACs {{ mac | join(',') }}