Skip to content

Commit 6fb94ba

Browse files
remove collabora and antivirus
1 parent 470fa9d commit 6fb94ba

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

.env.template

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ PHP_MEMORY_LIMIT=3458M
3131

3232
RUN_CONFIGURATION=True
3333

34-
NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.localhost nginx localhost:3100 hydra.localhost:9000 collabora.localhost
34+
NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.localhost nginx localhost:3100 hydra.localhost:9000
3535
POST_CONFIG_COMMAND='sudo -u www-data PHP_MEMORY_LIMIT=512M php occ user_oidc:provider SchulcloudNextcloud --clientid="Nextcloud" --clientsecret="Nextcloud" --check-bearer="1" --unique-uid="0" --scope="openid offline profile email groups" --discoveryuri="http://hydra.localhost:9000/.well-known/openid-configuration"'
3636

3737
## Plugins
38-
INSTALL_PLUGINS="groupfolders files_antivirus theming_customcss richdocuments user_oidc"
38+
INSTALL_PLUGINS="groupfolders theming_customcss user_oidc"
3939
EXTERNAL_GIT_PLUGINS="https://github.com/hpi-schul-cloud/NextcloudExtract.git:extract:master https://github.com/hpi-schul-cloud/schulcloud-nextcloud-app.git:schulcloud:main"
4040
#EXTERNAL_ARCHIVE_PLUGINS="https://github.com/hpi-schul-cloud/user_oidc/releases/download/v1.3.0-alpha/user_oidc-v1.3.0-alpha.tar.gz:user_oidc"
4141
ENABLE_PLUGINS="schulcloud extract theming"
@@ -134,16 +134,6 @@ CONFIG_JSON='{
134134
"provider-1-groupProvisioning":"1",
135135
"provider-1-providerBasedId":"1",
136136
"id4me_enabled":"0"
137-
},
138-
"richdocuments": {
139-
"wopi_url": "http:\/\/collabora.localhost:9090\/",
140-
"public_wopi_url": "http:\/\/collabora.localhost:9090",
141-
"types": "prevent_group_restriction",
142-
"enabled": "yes",
143-
"disable_certificate_verification": "",
144-
"doc_format": "",
145-
"use_groups": "",
146-
"wopi_allowlist": ""
147137
}
148138
}
149139
}'

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN git clone https://github.com/remicollet/php-rar.git \
1414
# php
1515
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-ftp.ini
1616
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini
17-
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-redis.ini
17+
# RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-redis.ini
1818
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini
1919
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-gmp.ini
2020
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-sysvsem.ini

compose.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
- db
2727
- storage
2828
- cache
29-
- antivirus
29+
# - antivirus
3030

3131
storage:
3232
image: minio/minio:latest
@@ -84,15 +84,15 @@ services:
8484
- cache:/data
8585
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}
8686

87-
antivirus:
88-
container_name: antivirus
89-
image: clamav/clamav:stable_base
90-
restart: unless-stopped
91-
ports:
92-
- 3310:3310
93-
volumes:
94-
# Socket
95-
- antivirus:/var/lib/clamav
87+
# antivirus:
88+
# container_name: antivirus
89+
# image: clamav/clamav:stable_base
90+
# restart: unless-stopped
91+
# ports:
92+
# - 3310:3310
93+
# volumes:
94+
# # Socket
95+
# - antivirus:/var/lib/clamav
9696

9797
# nginx here for simulate a ingress like in kubernetes
9898
nginx:
@@ -112,7 +112,7 @@ volumes:
112112
db:
113113
nextcloud:
114114
storage:
115-
antivirus:
115+
# antivirus:
116116
cache:
117117

118118
networks:

0 commit comments

Comments
 (0)