Skip to content

Commit 2108494

Browse files
committed
change setupssl.py to setup_ssl.py
1 parent cc25328 commit 2108494

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

irods/test/login_auth_test_must_run_manually.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from re import compile as regex
2424
from typing import Dict, Optional
2525
import gc
26-
from irods.test.setupssl import create_ssl_dir
26+
from irods.test.setup_ssl import create_ssl_dir
2727

2828
#
2929
# Allow override to specify the PAM password in effect for the test rodsuser.
@@ -160,7 +160,7 @@ class TestLogins(unittest.TestCase):
160160
single-node iRODS system, by the service account user. This ensures
161161
the /etc/irods directory is local and writable.
162162
163-
2. ./setupssl.py (sets up SSL keys etc. in /etc/irods/ssl) should be run
163+
2. ./setup_ssl.py (sets up SSL keys etc. in /etc/irods/ssl) should be run
164164
first to create (or overwrite, if appropriate) the /etc/irods/ssl directory
165165
and its contents.
166166
@@ -619,7 +619,7 @@ def setUp(self):
619619
self.skipTest("TestWithSSL may not be run by user irods")
620620
if not os.path.exists("/etc/irods/ssl"):
621621
self.skipTest(
622-
"Running setupssl.py as irods user is prerequisite for this test."
622+
"Running setup_ssl.py as irods user is prerequisite for this test."
623623
)
624624
with helpers.make_session() as session:
625625
if not session.host in ("localhost", socket.gethostname()):

irods/test/scripts/test_support_functions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ up_from_script_dir() {
1717
set_up_ssl() {
1818
local SUDO=${1:-""}
1919
local OPTS=${2:-""}
20-
$SUDO su - irods -c "python3 $(up_from_script_dir 1)/setupssl.py $OPTS"
20+
$SUDO su - irods -c "python3 $(up_from_script_dir 1)/setup_ssl.py $OPTS"
2121
}
2222

2323
# Clears out environment and resets to rodsadmin 'rods'.
File renamed without changes.

irods/test/test_ssl_context.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ if [ "`cat /tmp/run`" != "$RUN" ]; then
8282
sudo $REPO_SCRIPTS/json_config --clear-store ${ABBREVIATIONS[*]}
8383

8484
# Set up the basic server cert, key, and DH params file.
85-
[ -e /etc/irods/ssl ] || sudo su irods -c "$REPO_SCRIPTS/setupssl.py -f"
85+
[ -e /etc/irods/ssl ] || sudo su irods -c "$REPO_SCRIPTS/setup_ssl.py -f"
8686

8787
# Set up another cert with non-matching hostname.
88-
sudo su irods -c "$REPO_SCRIPTS/setupssl.py -kf -x.localhost -hlocalhost"
88+
sudo su irods -c "$REPO_SCRIPTS/setup_ssl.py -kf -x.localhost -hlocalhost"
8989
sudo su irods -c "c_rehash /etc/irods/ssl"
9090

9191
# Change the iRODS svc account user's (and current user's) iRODS environment file for SSL.

0 commit comments

Comments
 (0)