move sshd_config to jepsen_common

yandex · Sep 13, 2024 · a0dd73f · a0dd73f
1 parent 24ad33f
commit a0dd73f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/tests/images/jepsen_common/Dockerfile b/tests/images/jepsen_common/Dockerfile
@@ -4,3 +4,4 @@ RUN (yes | ssh-keygen -m PEM -t rsa -b 2048 -N '' -f /root/test_ssh_key -C root@
                                 cp /root/test_ssh_key.pub /root/.ssh/id_rsa.pub && \
                                 cp /root/test_ssh_key /root/.ssh/id_rsa && ssh-add -k /root/.ssh/id_rsa
 COPY ./ssh_config /etc/ssh/ssh_config
+COPY ./sshd_config /etc/ssh/sshd_config
diff --git a/tests/images/jepsen_common/sshd_config b/tests/images/jepsen_common/sshd_config
@@ -0,0 +1,10 @@
+PubkeyAuthentication yes
+ChallengeResponseAuthentication no
+UsePAM yes
+X11Forwarding yes
+PrintMotd no
+AcceptEnv LANG LC_*
+Subsystem       sftp    /usr/lib/openssh/sftp-server
+PubkeyAcceptedAlgorithms ssh-rsa
+PermitRootLogin yes
+MaxAuthTries 1000000
diff --git a/tests/images/mysql_jepsen/Dockerfile b/tests/images/mysql_jepsen/Dockerfile
@@ -8,7 +8,6 @@ COPY ./setup.sh /usr/local/bin/setup.sh
 COPY ./my.cnf /etc/mysql/my.cnf
 COPY ./.my.cnf /root/.my.cnf
 COPY ./supervisor_mysql.conf /etc/supervisor/conf.d
-COPY ../jepsen_sshd_config /etc/sshd/sshd_config
 RUN chown mysql:root /etc/mysql
 RUN touch /etc/mysync.yaml
 RUN chown mysql:mysql /etc/mysync.yaml

diff --git a/tests/images/zookeeper_jepsen/Dockerfile b/tests/images/zookeeper_jepsen/Dockerfile
@@ -4,5 +4,3 @@ COPY ./supervisor_zookeeper.conf /etc/supervisor/conf.d
 COPY ./retriable_path_create.sh /usr/local/bin/retriable_path_create.sh
 COPY ./generate_certs_with_restart.sh /usr/local/bin/generate_certs_with_restart.sh
 RUN chmod 755 /usr/local/bin/generate_certs_with_restart.sh
-
-COPY ../jepsen_sshd_config /etc/sshd/sshd_config