Skip to content

Commit 8ff4071

Browse files
authored
Retire sandbox and SSS resources (migrid-sync PR#495) (#154)
Remove SANDBOX and SSS setup variables retired with migrid-sync [PR #495](ucphhpc/migrid-sync#495 )
2 parents 8eee874 + 0e248f9 commit 8ff4071

7 files changed

Lines changed: 0 additions & 57 deletions

File tree

Dockerfile.rocky9

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ ARG ENABLE_DUPLICATI=True
9696
ARG ENABLE_SEAFILE=False
9797
ARG SEAFILE_FQDN=
9898
ARG SEAFILE_RO_ACCESS=False
99-
ARG ENABLE_SANDBOXES=False
10099
ARG ENABLE_CRONTAB=True
101100
ARG ENABLE_JOBS=True
102101
ARG ENABLE_RESOURCES=True
@@ -1007,7 +1006,6 @@ ARG ENABLE_DUPLICATI
10071006
ARG ENABLE_SEAFILE
10081007
ARG SEAFILE_FQDN
10091008
ARG SEAFILE_RO_ACCESS
1010-
ARG ENABLE_SANDBOXES
10111009
ARG ENABLE_CRONTAB
10121010
ARG ENABLE_JOBS
10131011
ARG ENABLE_RESOURCES
@@ -1228,7 +1226,6 @@ RUN ./generateconfs.py --source=. \
12281226
--enable_sharelinks=${ENABLE_SHARELINKS} --enable_transfers=${ENABLE_TRANSFERS} \
12291227
--enable_duplicati=${ENABLE_DUPLICATI} --enable_seafile=${ENABLE_SEAFILE} \
12301228
--seafile_fqdn=${SEAFILE_FQDN} --seafile_ro_access=${SEAFILE_RO_ACCESS} \
1231-
--enable_sandboxes=${ENABLE_SANDBOXES} \
12321229
--enable_crontab=${ENABLE_CRONTAB} --enable_jobs=${ENABLE_JOBS} \
12331230
--enable_resources=${ENABLE_RESOURCES} --enable_events=${ENABLE_EVENTS} \
12341231
--enable_gravatars=${ENABLE_GRAVATARS} --enable_sitestatus=${ENABLE_SITESTATUS} \

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ initdirs: initcomposevars
113113
mkdir -p ${PERSISTENT_ROOT}/sitestats_home
114114
mkdir -p ${PERSISTENT_ROOT}/quota_home
115115
mkdir -p ${PERSISTENT_ROOT}/accounting_home
116-
mkdir -p ${PERSISTENT_ROOT}/sandbox_home
117-
mkdir -p ${PERSISTENT_ROOT}/sss_home
118116
mkdir -p ${PERSISTENT_ROOT}/workflows_db_home
119117
mkdir -p ${PERSISTENT_ROOT}/workflows_home
120118
mkdir -p ${PERSISTENT_ROOT}/user_db_home

development.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ ENABLE_DUPLICATI=True
104104
ENABLE_SEAFILE=False
105105
SEAFILE_FQDN=
106106
SEAFILE_RO_ACCESS=False
107-
ENABLE_SANDBOXES=False
108107
ENABLE_CRONTAB=True
109108
ENABLE_JOBS=True
110109
ENABLE_RESOURCES=True

development_gdp.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ ENABLE_DUPLICATI=False
104104
ENABLE_SEAFILE=False
105105
SEAFILE_FQDN=
106106
SEAFILE_RO_ACCESS=False
107-
ENABLE_SANDBOXES=False
108107
ENABLE_CRONTAB=False
109108
ENABLE_JOBS=False
110109
ENABLE_RESOURCES=False

doc/source/sections/configuration/variables.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,6 @@ Variables
362362
* - SEAFILE_RO_ACCESS
363363
- False
364364
- Toggles integrated read-only access to any locally hosted Seafile instance.
365-
* - ENABLE_SANDBOXES
366-
- False
367-
- Enable the built-in sandbox resource feature for grid jobs
368365
* - ENABLE_CRONTAB
369366
- True
370367
- Enable the built-in Schedule Tasks feature for users

docker-compose_production.yml

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,6 @@ services:
159159
- type: volume
160160
source: accounting_home
161161
target: /home/mig/state/accounting_home
162-
- type: volume
163-
source: sandbox_home
164-
target: /home/mig/state/sandbox_home
165-
- type: volume
166-
source: sss_home
167-
target: /home/mig/state/sss_home
168162
- type: volume
169163
source: workflows_db_home
170164
target: /home/mig/state/workflows_db_home
@@ -315,12 +309,6 @@ services:
315309
# source: accounting_home
316310
# target: /home/mig/state/accounting_home
317311
#- type: volume
318-
# source: sandbox_home
319-
# target: /home/mig/state/sandbox_home
320-
#- type: volume
321-
# source: sss_home
322-
# target: /home/mig/state/sss_home
323-
#- type: volume
324312
# source: workflows_db_home
325313
# target: /home/mig/state/workflows_db_home
326314
#- type: volume
@@ -465,12 +453,6 @@ services:
465453
# source: accounting_home
466454
# target: /home/mig/state/accounting_home
467455
#- type: volume
468-
# source: sandbox_home
469-
# target: /home/mig/state/sandbox_home
470-
#- type: volume
471-
# source: sss_home
472-
# target: /home/mig/state/sss_home
473-
#- type: volume
474456
# source: workflows_db_home
475457
# target: /home/mig/state/workflows_db_home
476458
#- type: volume
@@ -614,12 +596,6 @@ services:
614596
# source: accounting_home
615597
# target: /home/mig/state/accounting_home
616598
#- type: volume
617-
# source: sandbox_home
618-
# target: /home/mig/state/sandbox_home
619-
#- type: volume
620-
# source: sss_home
621-
# target: /home/mig/state/sss_home
622-
#- type: volume
623599
# source: workflows_db_home
624600
# target: /home/mig/state/workflows_db_home
625601
#- type: volume
@@ -760,12 +736,6 @@ services:
760736
# source: quota_home
761737
# target: /home/mig/state/quota_home
762738
#- type: volume
763-
# source: sandbox_home
764-
# target: /home/mig/state/sandbox_home
765-
#- type: volume
766-
# source: sss_home
767-
# target: /home/mig/state/sss_home
768-
#- type: volume
769739
# source: workflows_db_home
770740
# target: /home/mig/state/workflows_db_home
771741
#- type: volume
@@ -1124,22 +1094,6 @@ volumes:
11241094
device: ${PERSISTENT_ROOT}/accounting_home
11251095
o: bind
11261096

1127-
sandbox_home:
1128-
# Volume used to contain the migrid sandbox_home
1129-
driver: local
1130-
driver_opts:
1131-
type: none
1132-
device: ${PERSISTENT_ROOT}/sandbox_home
1133-
o: bind
1134-
1135-
sss_home:
1136-
# Volume used to contain the migrid sss_home
1137-
driver: local
1138-
driver_opts:
1139-
type: none
1140-
device: ${PERSISTENT_ROOT}/sss_home
1141-
o: bind
1142-
11431097
workflows_db_home:
11441098
# Volume used to contain the migrid workflows_db_home
11451099
driver: local

production.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ ENABLE_DUPLICATI=True
104104
ENABLE_SEAFILE=False
105105
SEAFILE_FQDN=
106106
SEAFILE_RO_ACCESS=False
107-
ENABLE_SANDBOXES=False
108107
ENABLE_CRONTAB=True
109108
ENABLE_JOBS=True
110109
ENABLE_RESOURCES=True

0 commit comments

Comments
 (0)