diff --git a/helperbot b/helperbot index 907505c..319955e 100755 --- a/helperbot +++ b/helperbot @@ -242,7 +242,7 @@ function system_upgrade { update_docker_container "/srv/docker" "freshrss" "compose.yaml" update_docker_container "/srv/docker" "mailserver" "compose.yaml" update_docker_container "/srv/docker" "redlib" "compose.yaml" - update_docker_container "/srv/docker" "safetwitch" "compose.yaml" + #update_docker_container "/srv/docker" "safetwitch" "compose.yaml" update_docker_container "/srv/docker" "vaultwarden" "compose.yaml" update_docker_container "/srv/docker" "zitadel" "compose.yaml" update_docker_container "/srv/docker/forgejo" "runner" "compose.yaml" diff --git a/phosphorus/srv/docker/sharkey/compose.yaml b/phosphorus/srv/docker/sharkey/compose.yaml index 510b12c..ba2dd79 100644 --- a/phosphorus/srv/docker/sharkey/compose.yaml +++ b/phosphorus/srv/docker/sharkey/compose.yaml @@ -17,9 +17,8 @@ services: ports: - "192.168.1.73:60628:3001" networks: - - ip6net - db - - sharkey + - shonk env_file: - .env.secrets # secrets contains our db password and stuff like that environment: @@ -38,7 +37,7 @@ services: restart: always networks: - db - - sharkey + - shonk env_file: - .env.secrets environment: @@ -57,9 +56,8 @@ services: ports: - "192.168.1.73:47815:3002" networks: - - ip6net - db - - sharkey + - shonk env_file: - .env.secrets environment: @@ -80,9 +78,8 @@ services: ports: - "192.168.1.73:57378:3003" networks: - - ip6net - db - - sharkey + - shonk env_file: - .env.secrets environment: @@ -96,33 +93,12 @@ services: - ./media:/sharkey/.config - ./default.yml:/sharkey/.config/default.yml:ro - # dragonflydb (redis), as is required by misskey for a good amount of data - dragonflydb: - image: docker.dragonflydb.io/dragonflydb/dragonfly - restart: always - ulimits: - memlock: -1 - networks: - - sharkey - environment: - # these envvars are important in order for dragonflydb/misskey to interact with each other properly, and to load and save all data properly - DFLY_snapshot_cron: '* * * * *' - DFLY_version_check: false - DFLY_default_lua_flags: allow-undeclared-keys # without this, dfdb would immediately complain loading data - DFLY_dbfilename: 'dump.rdb' # misskey expects this - DFLY_df_snapshot_format: false # misskey doesn't know how to handle dfdb's format - DFLY_dir: '/data' # directory with the snapshot/data - volumes: - - ./dfdb:/data - # dragonflydb, for caching and required by *key for storing important data dfdb: image: docker.dragonflydb.io/dragonflydb/dragonfly restart: always - ulimits: - memlock: -1 networks: - - sharkey + - shonk environment: # these envvars are important in order for dragonflydb/misskey to interact with each other properly, and to load and save all data properly DFLY_snapshot_cron: '* * * * *' @@ -139,7 +115,4 @@ networks: db: name: postgres_db external: true - ip6net: - name: ip6net - external: true - sharkey: \ No newline at end of file + shonk: