diff --git a/README.md b/README.md index 740ac1c..5799f41 100644 --- a/README.md +++ b/README.md @@ -87,9 +87,9 @@ cd silver - Enter your domain name. -- Run `bash ../scripts/setup/setup.sh` to set up the configs. +- Run `bash scripts/setup/setup.sh` to set up the configs. -- Run `bash ../scripts/service/start-silver.sh` to start the mail server. +- Run `bash scripts/service/start-silver.sh` to start the mail server. - Replace the dkim record below with the output you get after running the `setup.sh` script diff --git a/services/clam-updater/clam/Dockerfile b/services/clam-updater/clam/Dockerfile deleted file mode 100644 index 942d728..0000000 --- a/services/clam-updater/clam/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM alpine:latest -RUN apk add --no-cache wget -COPY ./scripts/update.sh /update.sh -RUN chmod +x /update.sh - -CMD while true; do /update.sh; sleep 7200; done \ No newline at end of file diff --git a/services/clam-updater/clam/scripts/update.sh b/services/clam-updater/clam/scripts/update.sh deleted file mode 100644 index 95ab793..0000000 --- a/services/clam-updater/clam/scripts/update.sh +++ /dev/null @@ -1,11 +0,0 @@ -// TODO, need to remove this file once we have a proper clamav update server. -SERVER="http://:8800" -DEST="/var/lib/clamav" - -echo "Downloading signatures from $SERVER..." - -wget -O $DEST/main.cld $SERVER/main.cld -wget -O $DEST/daily.cld $SERVER/daily.cld -wget -O $DEST/bytecode.cvd $SERVER/bytecode.cvd - -echo "Download complete at $(date)" \ No newline at end of file diff --git a/services/clam-updater/compose.yaml b/services/clam-updater/compose.yaml deleted file mode 100644 index 5900463..0000000 --- a/services/clam-updater/compose.yaml +++ /dev/null @@ -1,33 +0,0 @@ -services: - clamav-server: - image: clamav/clamav:latest - platform: linux/amd64 - container_name: clamav-server - volumes: - - clamsock:/var/run/clamav - - clamav_db:/var/lib/clamav - - clamav_logs:/var/log/clamav - restart: always - environment: - - CLAMAV_NO_FRESHCLAMD=false - deploy: - resources: - limits: - memory: 2.8G - reservations: - memory: 1G - - nginx: - image: nginx:alpine - container_name: clamav-nginx - ports: - - "8800:80" - volumes: - - clamav_db:/usr/share/nginx/html:ro - - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro - restart: always - -volumes: - clamsock: - clamav_db: - clamav_logs: diff --git a/services/clam-updater/nginx.conf b/services/clam-updater/nginx.conf deleted file mode 100644 index f0845a3..0000000 --- a/services/clam-updater/nginx.conf +++ /dev/null @@ -1,7 +0,0 @@ -server { - listen 80; - root /usr/share/nginx/html; - autoindex on; - autoindex_exact_size off; - autoindex_localtime on; -} diff --git a/services/docker-compose.yaml b/services/docker-compose.yaml index 0ed4aca..1b27d5f 100644 --- a/services/docker-compose.yaml +++ b/services/docker-compose.yaml @@ -97,7 +97,7 @@ services: # - ./unbound:/opt/unbound/etc/unbound clamav-server: - image: clamav/clamav:latest # Official ClamAV image + image: clamav/clamav:latest container_name: clamav-server volumes: - clamav_db:/var/lib/clamav @@ -108,7 +108,7 @@ services: depends_on: - rspamd-server environment: - - CLAMAV_NO_FRESHCLAMD=true + - CLAMAV_NO_FRESHCLAMD=false deploy: resources: limits: @@ -116,17 +116,6 @@ services: reservations: memory: 1G - clam-updater: - build: - context: ./clam-updater/clam - dockerfile: Dockerfile - container_name: clam-updater - volumes: - - clamav_db:/var/lib/clamav - networks: - - mail-network - restart: always - clamav-exporter: build: context: ./silver-config/clamav-exporter