Skip to content

Commit

Permalink
expose ftps_pasv_ports in generator as discussed in relation to docke…
Browse files Browse the repository at this point in the history
…r-migrid PR ucphhpc#21

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@5785 b75ad72c-e7d7-11dd-a971-7dbc132099af
  • Loading branch information
jonasbardino committed Aug 15, 2023
1 parent 589ee61 commit f48dcb2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mig/install/MiGserver-template.conf
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ user_davs_alias = __ALIAS_FIELD__
# empty address means listen on all interfaces
user_ftps_address = __FTPS_ADDRESS__
user_ftps_ctrl_port = __FTPS_CTRL_PORT__
#user_ftps_pasv_ports = 8100:8400
user_ftps_pasv_ports = __FTPS_PASV_PORTS__
# If ftps is exposed on another address/port (e.g. with port forward for
# firewall-friendly access) it can be set here for display on Settings page.
__SHOW_ADDRESS_COMMENTED__ user_ftps_show_address = __DAEMON_SHOW_ADDRESS__
Expand Down
1 change: 1 addition & 0 deletions mig/install/generateconfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def usage(options):
'sftp_address',
'sftp_subsys_address',
'ftps_address',
'ftps_pasv_ports',
'davs_address',
'jupyter_services',
'jupyter_services_desc',
Expand Down
2 changes: 2 additions & 0 deletions mig/shared/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ def generate_confs(
davs_show_port=443,
ftps_ctrl_port=8021,
ftps_ctrl_show_port=21,
ftps_pasv_ports='8100:8400',
openid_port=8443,
openid_show_port=443,
openid_session_lifetime=43200,
Expand Down Expand Up @@ -583,6 +584,7 @@ def generate_confs(
user_dict['__DAVS_SHOW_PORT__'] = "%s" % davs_show_port
user_dict['__FTPS_CTRL_PORT__'] = "%s" % ftps_ctrl_port
user_dict['__FTPS_CTRL_SHOW_PORT__'] = "%s" % ftps_ctrl_show_port
user_dict['__FTPS_PASV_PORTS__'] = ftps_pasv_ports
user_dict['__OPENID_PORT__'] = "%s" % openid_port
user_dict['__OPENID_SHOW_PORT__'] = "%s" % openid_show_port
user_dict['__OPENID_SESSION_LIFETIME__'] = "%s" % openid_session_lifetime
Expand Down

0 comments on commit f48dcb2

Please sign in to comment.