Skip to content

Commit 3ce3ae4

Browse files
author
Ryan Lovett
committed
Assume rstudio server >= 1.4ish.
1 parent 80c1db1 commit 3ce3ae4

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

jupyter_rsession_proxy/__init__.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,10 @@ def _get_cmd(port):
6565
'--www-verify-user-agent=0',
6666
'--secure-cookie-key-file=' + ntf.name,
6767
'--server-user=' + getpass.getuser(),
68+
'--www-root-path={base_url}rstudio/',
69+
f'--database-config-file={db_config()}'
6870
]
6971

70-
# Add additional options for RStudio >= 1.4.x. Since we cannot
71-
# determine rserver's version from the executable, we must use
72-
# explicit configuration. In this case the environment variable
73-
# RSESSION_PROXY_RSTUDIO_1_4 must be set.
74-
if os.environ.get('RSESSION_PROXY_RSTUDIO_1_4', False):
75-
# base_url has a trailing slash
76-
cmd.append('--www-root-path={base_url}rstudio/')
77-
cmd.append(f'--database-config-file={db_config()}')
78-
7972
return cmd
8073

8174
server_process = {
@@ -86,8 +79,6 @@ def _get_cmd(port):
8679
'icon_path': get_icon_path()
8780
}
8881
}
89-
if os.environ.get('RSESSION_PROXY_RSTUDIO_1_4', False):
90-
server_process['launcher_entry']['path_info'] = 'rstudio/auth-sign-in?appUrl=%2F'
9182
return server_process
9283

9384
def setup_rsession():

0 commit comments

Comments
 (0)