From a0dd73f90ea827d6501ccba5d258f3b95bd1f952 Mon Sep 17 00:00:00 2001 From: noname0443 Date: Fri, 13 Sep 2024 17:28:24 +0300 Subject: [PATCH] move sshd_config to jepsen_common --- tests/images/jepsen_common/Dockerfile | 1 + tests/images/jepsen_common/sshd_config | 10 ++++++++++ tests/images/mysql_jepsen/Dockerfile | 1 - tests/images/zookeeper_jepsen/Dockerfile | 2 -- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 tests/images/jepsen_common/sshd_config diff --git a/tests/images/jepsen_common/Dockerfile b/tests/images/jepsen_common/Dockerfile index dd309799..759111d6 100644 --- 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 new file mode 100644 index 00000000..9bf6cd33 --- /dev/null +++ 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 index e2c31423..b11d1dd2 100644 --- 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 index 1035a821..db615e29 100644 --- 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