Skip to content

Commit 1210e1d

Browse files
Martin-RehrMartin-Rehr
committed
Adjusted 'tests' to reflect removed image preview functionality
1 parent 4280233 commit 1210e1d

File tree

5 files changed

+0
-100
lines changed

5 files changed

+0
-100
lines changed

‎tests/data/MiGserver--customised-include_sections.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ freeze_tape = %(state_path)s/freeze_tape/
113113
sharelink_home = %(state_path)s/sharelink_home/
114114
seafile_mount = %(state_path)s/seafile_mount/
115115
openid_store = %(state_path)s/openid_store/
116-
paraview_home = %(state_path)s/paraview_home/
117116
sitestats_home = %(state_path)s/sitestats_home/
118117
events_home = %(state_path)s/events_home/
119118
twofactor_home = %(state_path)s/twofactor_home/
@@ -157,7 +156,6 @@ vgrid_resources = resources
157156
vgrid_triggers = triggers
158157
vgrid_settings = settings
159158
vgrid_sharelinks = sharelinks
160-
vgrid_imagesettings = imagesettings
161159
vgrid_monitor = monitor
162160

163161
# Optional shared ssh public key presented to resource owners
@@ -688,8 +686,6 @@ permanent_freeze = no
688686
# Delay before frozen archives are expected to hit tape (e.g. 5m, 4d or 2w).
689687
# Leave unset or empty if no tape archiving is available.
690688
freeze_to_tape =
691-
# Enable image preview support in file manager - requires rendering resources
692-
enable_preview = False
693689
# Enable one-click resource sandboxes - requires users with (e.g. browser) Java
694690
enable_sandboxes = False
695691
# Enable virtual machine integration handlers - still only visible if added in

‎tests/data/MiGserver--customised.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ freeze_tape = %(state_path)s/freeze_tape/
113113
sharelink_home = %(state_path)s/sharelink_home/
114114
seafile_mount = %(state_path)s/seafile_mount/
115115
openid_store = %(state_path)s/openid_store/
116-
paraview_home = %(state_path)s/paraview_home/
117116
sitestats_home = %(state_path)s/sitestats_home/
118117
events_home = %(state_path)s/events_home/
119118
twofactor_home = %(state_path)s/twofactor_home/
@@ -157,7 +156,6 @@ vgrid_resources = resources
157156
vgrid_triggers = triggers
158157
vgrid_settings = settings
159158
vgrid_sharelinks = sharelinks
160-
vgrid_imagesettings = imagesettings
161159
vgrid_monitor = monitor
162160

163161
# Optional shared ssh public key presented to resource owners
@@ -688,8 +686,6 @@ permanent_freeze = no
688686
# Delay before frozen archives are expected to hit tape (e.g. 5m, 4d or 2w).
689687
# Leave unset or empty if no tape archiving is available.
690688
freeze_to_tape =
691-
# Enable image preview support in file manager - requires rendering resources
692-
enable_preview = False
693689
# Enable one-click resource sandboxes - requires users with (e.g. browser) Java
694690
enable_sandboxes = False
695691
# Enable virtual machine integration handlers - still only visible if added in

‎tests/fixture/confs-stdlocal/MiG.conf‎

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
961961
RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR]
962962
RewriteCond %{REQUEST_URI} ^/(images|assets|public|.well-known)/ [OR]
963963
RewriteCond %{REQUEST_URI} ^/(seafmedia|seafhttp|seafile)/ [OR]
964-
RewriteCond %{REQUEST_URI} ^/paraview/
965964
RewriteRule ^ - [L]
966965

967966
# Setup jupyter forward user header
@@ -1302,22 +1301,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
13021301
#
13031302
#Include /etc/apache2/conf.extras.d/MiG-jupyter-proxy.conf
13041303

1305-
### ParaViewWeb (optional
1306-
1307-
# Have Apache pass these requests to the ParaViewWeb launcher
1308-
#ProxyPass /paraview http://localhost:8080/paraview
1309-
1310-
# This is the path of the mapping file
1311-
#RewriteMap session-to-port txt:/home/mig/state/paraview_home/launcher/proxy.txt
1312-
1313-
# This is the rewrite condition.
1314-
# Look for anything with a sessionId=
1315-
# in the query part of the URL and capture the value to use below.
1316-
#RewriteCond %{QUERY_STRING} ^sessionId=(.*)$ [NC]
1317-
1318-
# This does the rewrite using the mapping file and the sessionId
1319-
#RewriteRule ^/proxy.*$ ws://${session-to-port:%1}/ws [P]
1320-
13211304
</VirtualHost>
13221305
</IfDefine>
13231306
</IfDefine>
@@ -1420,7 +1403,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
14201403
RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR]
14211404
RewriteCond %{REQUEST_URI} ^/(images|assets|public|.well-known)/ [OR]
14221405
RewriteCond %{REQUEST_URI} ^/(seafmedia|seafhttp|seafile)/ [OR]
1423-
RewriteCond %{REQUEST_URI} ^/paraview/
14241406
RewriteRule ^ - [L]
14251407

14261408
# Setup jupyter forward user header
@@ -1761,22 +1743,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
17611743
#
17621744
#Include /etc/apache2/conf.extras.d/MiG-jupyter-proxy.conf
17631745

1764-
### ParaViewWeb (optional
1765-
1766-
# Have Apache pass these requests to the ParaViewWeb launcher
1767-
#ProxyPass /paraview http://localhost:8080/paraview
1768-
1769-
# This is the path of the mapping file
1770-
#RewriteMap session-to-port txt:/home/mig/state/paraview_home/launcher/proxy.txt
1771-
1772-
# This is the rewrite condition.
1773-
# Look for anything with a sessionId=
1774-
# in the query part of the URL and capture the value to use below.
1775-
#RewriteCond %{QUERY_STRING} ^sessionId=(.*)$ [NC]
1776-
1777-
# This does the rewrite using the mapping file and the sessionId
1778-
#RewriteRule ^/proxy.*$ ws://${session-to-port:%1}/ws [P]
1779-
17801746
</VirtualHost>
17811747
</IfDefine>
17821748
</IfDefine>
@@ -2072,7 +2038,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
20722038
RewriteCond %{REQUEST_URI} ^/(wsgi|cgi)-bin/(autocreate|autologout|logout).py$ [OR]
20732039
RewriteCond %{REQUEST_URI} ^/(images|assets|public|.well-known|openid|cgi-sid)/ [OR]
20742040
RewriteCond %{REQUEST_URI} ^/(seafmedia|seafhttp|seafile)/ [OR]
2075-
RewriteCond %{REQUEST_URI} ^/paraview/
20762041
RewriteRule ^ - [L]
20772042

20782043
# 2FA helpers based on our own 2FA helper in /home/mig/mig/cgi-auth/twofactor.py
@@ -2347,22 +2312,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
23472312
#
23482313
#Include /etc/apache2/conf.extras.d/MiG-jupyter-proxy.conf
23492314

2350-
### ParaViewWeb (optional
2351-
2352-
# Have Apache pass these requests to the ParaViewWeb launcher
2353-
#ProxyPass /paraview http://localhost:8081/paraview
2354-
2355-
# This is the path of the mapping file
2356-
#RewriteMap session-to-port txt:/home/mig/state/paraview_home/launcher/proxy.txt
2357-
2358-
# This is the rewrite condition.
2359-
# Look for anything with a sessionId=
2360-
# in the query part of the URL and capture the value to use below.
2361-
#RewriteCond %{QUERY_STRING} ^sessionId=(.*)$ [NC]
2362-
2363-
# This does the rewrite using the mapping file and the sessionId
2364-
#RewriteRule ^/proxy.*$ ws://${session-to-port:%1}/ws [P]
2365-
23662315
<Directory /home/mig/mig/cgi-auth>
23672316
AuthType OpenID
23682317
<IfVersion > 2.2>
@@ -2674,7 +2623,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
26742623
RewriteCond %{REQUEST_URI} ^/(wsgi|cgi)-bin/(autocreate|autologout|logout).py$ [OR]
26752624
RewriteCond %{REQUEST_URI} ^/(images|assets|public|.well-known|openid|cgi-sid)/ [OR]
26762625
RewriteCond %{REQUEST_URI} ^/(seafmedia|seafhttp|seafile)/ [OR]
2677-
RewriteCond %{REQUEST_URI} ^/paraview/
26782626
RewriteRule ^ - [L]
26792627

26802628
# 2FA helpers based on our own 2FA helper in /home/mig/mig/cgi-auth/twofactor.py
@@ -2926,22 +2874,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
29262874
#
29272875
#Include /etc/apache2/conf.extras.d/MiG-jupyter-proxy.conf
29282876

2929-
### ParaViewWeb (optional
2930-
2931-
# Have Apache pass these requests to the ParaViewWeb launcher
2932-
#ProxyPass /paraview http://localhost:8081/paraview
2933-
2934-
# This is the path of the mapping file
2935-
#RewriteMap session-to-port txt:/home/mig/state/paraview_home/launcher/proxy.txt
2936-
2937-
# This is the rewrite condition.
2938-
# Look for anything with a sessionId=
2939-
# in the query part of the URL and capture the value to use below.
2940-
#RewriteCond %{QUERY_STRING} ^sessionId=(.*)$ [NC]
2941-
2942-
# This does the rewrite using the mapping file and the sessionId
2943-
#RewriteRule ^/proxy.*$ ws://${session-to-port:%1}/ws [P]
2944-
29452877
<Directory /home/mig/mig/cgi-auth>
29462878
AuthType OpenID
29472879
<IfVersion > 2.2>
@@ -3587,7 +3519,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
35873519
RewriteCond %{REQUEST_URI} ^/(wsgi|cgi)-bin/(autocreate|autologout|logout).py$ [OR]
35883520
RewriteCond %{REQUEST_URI} ^/(images|assets|public|.well-known|openid|cgi-sid)/ [OR]
35893521
RewriteCond %{REQUEST_URI} ^/(seafmedia|seafhttp|seafile)/ [OR]
3590-
RewriteCond %{REQUEST_URI} ^/paraview/
35913522
RewriteRule ^ - [L]
35923523

35933524
# 2FA helpers based on our own 2FA helper in /home/mig/mig/cgi-auth/twofactor.py
@@ -3855,22 +3786,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
38553786
#
38563787
#Include /etc/apache2/conf.extras.d/MiG-jupyter-proxy.conf
38573788

3858-
### ParaViewWeb (optional
3859-
3860-
# Have Apache pass these requests to the ParaViewWeb launcher
3861-
#ProxyPass /paraview http://localhost:8081/paraview
3862-
3863-
# This is the path of the mapping file
3864-
#RewriteMap session-to-port txt:/home/mig/state/paraview_home/launcher/proxy.txt
3865-
3866-
# This is the rewrite condition.
3867-
# Look for anything with a sessionId=
3868-
# in the query part of the URL and capture the value to use below.
3869-
#RewriteCond %{QUERY_STRING} ^sessionId=(.*)$ [NC]
3870-
3871-
# This does the rewrite using the mapping file and the sessionId
3872-
#RewriteRule ^/proxy.*$ ws://${session-to-port:%1}/ws [P]
3873-
38743789
<Directory /home/mig/mig/cgi-auth>
38753790
AuthType openid-connect
38763791
<IfVersion > 2.2>
@@ -4185,7 +4100,6 @@ Alias /status-events.json "/home/mig/state/wwwpublic/status-events.json"
41854100
RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR]
41864101
RewriteCond %{REQUEST_URI} ^/(images|assets|public|.well-known)/ [OR]
41874102
RewriteCond %{REQUEST_URI} ^/(seafmedia|seafhttp|seafile)/ [OR]
4188-
RewriteCond %{REQUEST_URI} ^/paraview/
41894103
RewriteRule ^ - [L]
41904104

41914105
# Stay on wsgi-bin if user comes from that already, otherwise use cgi-sid

‎tests/fixture/confs-stdlocal/MiGserver.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ freeze_tape = %(state_path)s/freeze_tape/
119119
sharelink_home = %(state_path)s/sharelink_home/
120120
seafile_mount = %(state_path)s/seafile_mount/
121121
openid_store = %(state_path)s/openid_store/
122-
paraview_home = %(state_path)s/paraview_home/
123122
sitestats_home = %(state_path)s/sitestats_home/
124123
events_home = %(state_path)s/events_home/
125124
twofactor_home = %(state_path)s/twofactor_home/
@@ -161,7 +160,6 @@ vgrid_resources = resources
161160
vgrid_triggers = triggers
162161
vgrid_settings = settings
163162
vgrid_sharelinks = sharelinks
164-
vgrid_imagesettings = imagesettings
165163
vgrid_monitor = monitor
166164

167165
# Optional shared ssh public key presented to resource owners
@@ -696,8 +694,6 @@ permanent_freeze = no
696694
# Delay before frozen archives are expected to hit tape (e.g. 5m, 4d or 2w).
697695
# Leave unset or empty if no tape archiving is available.
698696
freeze_to_tape =
699-
# Enable image preview support in file manager - requires rendering resources
700-
enable_preview = False
701697
# Enable one-click resource sandboxes - requires users with (e.g. browser) Java
702698
enable_sandboxes = False
703699
# Enable virtual machine integration handlers - still only visible if added in

‎tests/fixture/mig_shared_configuration--new.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
"myfiles_py_location": "",
133133
"notify_home": "",
134134
"openid_store": "",
135-
"paraview_home": "",
136135
"passphrase_file": "",
137136
"peers": null,
138137
"public_key_file": "",
@@ -644,7 +643,6 @@
644643
"vgrid_files_readonly": "",
645644
"vgrid_files_writable": "",
646645
"vgrid_home": "",
647-
"vgrid_imagesettings": "imagesettings",
648646
"vgrid_members": "members",
649647
"vgrid_monitor": "monitor",
650648
"vgrid_owners": "owners",

0 commit comments

Comments
 (0)