diff --git a/.env b/.env index 0d5a644..5a25ec6 100755 --- a/.env +++ b/.env @@ -13,31 +13,6 @@ TZ=America/Chicago ADMIN_USERNAME=akanealw ADMIN_PASSWORD=8ung1e1! -#KUTT -PORT=3000 -DEFAULT_DOMAIN=aknlw.com -SITE_NAME=Kutt -DISALLOW_REGISTRATION=true -DISALLOW_ANONYMOUS_LINKS=true -USER_LIMIT_PER_DAY=50 -CUSTOM_DOMAIN_USE_HTTPS=true -JWT_SECRET=%5qCnXx%My^W6tXQCSz4 -ADMIN_EMAILS=akanealw@gmail.com -MAIL_HOST=smtp.gmail.com -MAIL_PORT=587 -MAIL_SECURE=false -MAIL_requireTLS=true -MAIL_USER=akanealw@gmail.com -MAIL_FROM=akanealw@gmail.com -MAIL_PASSWORD=bzslssyiffjqgdwm - -#OWNCLOUD -OWNCLOUD_VERSION=10.11 -OWNCLOUD_DOMAIN=192.168.1.4:8092 -OWNCLOUD_TRUSTED_DOMAINS=192.168.1.4,owncloud.akanealw.com -ADMIN_USERNAME=akanealw -ADMIN_PASSWORD=pknFeqRqFc3RA5N6!rDL - #PIHOLE FTLCONF_LOCAL_IPV4=162.222.10.80 REV_SERVER=false diff --git a/docker-compose.yml b/docker-compose.yml index da9afa1..a08e94b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,43 +80,6 @@ services: - ${DOCKERCONFIGS}/nginxproxymanager/data/logs:/opt/log - ${DOCKERCONFIGS}/goaccess/custom/logs:/opt/custom - kutt: - container_name: kutt - image: kutt/kutt:latest - environment: - DB_HOST: kutt-postgres - DB_NAME: kutt - DB_USER: kutt - DB_PASSWORD: kutt - REDIS_HOST: kutt-redis - env_file: - - .env - command: ["./wait-for-it.sh", "kutt-postgres:5432", "--", "npm", "start"] - depends_on: - - kutt-postgres - - kutt-redis - ports: - - 3000:3000/tcp - restart: always - - kutt-redis: - container_name: kutt-redis - image: redis:6.0-alpine - restart: always - volumes: - - ${DOCKERCONFIGS}/kutt/redis_data:/data - - kutt-postgres: - container_name: kutt-postgres - image: postgres:12-alpine - environment: - - POSTGRES_USER=kutt - - POSTGRES_PASSWORD=kutt - - POSTGRES_DB=kutt - restart: always - volumes: - - ${DOCKERCONFIGS}/kutt/postgres_data:/var/lib/postgresql/data - nginxproxymanager: container_name: nginxproxymanager image: jc21/nginx-proxy-manager:2.9.22 @@ -134,67 +97,6 @@ services: - ${DOCKERCONFIGS}/nginxproxymanager/snippets:/snippets:ro - /etc/localtime:/etc/localtime:ro - owncloud: - container_name: owncloud - image: owncloud/server:${OWNCLOUD_VERSION} - environment: - - OWNCLOUD_DOMAIN=${OWNCLOUD_DOMAIN} - - OWNCLOUD_TRUSTED_DOMAINS=${OWNCLOUD_TRUSTED_DOMAINS} - - OWNCLOUD_DB_TYPE=mysql - - OWNCLOUD_DB_NAME=owncloud - - OWNCLOUD_DB_USERNAME=owncloud - - OWNCLOUD_DB_PASSWORD=owncloud - - OWNCLOUD_DB_HOST=owncloud-mariadb - - OWNCLOUD_ADMIN_USERNAME=${ADMIN_USERNAME} - - OWNCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD} - - OWNCLOUD_MYSQL_UTF8MB4=true - - OWNCLOUD_REDIS_ENABLED=true - - OWNCLOUD_REDIS_HOST=owncloud-redis - healthcheck: - test: ["CMD", "/usr/bin/healthcheck"] - interval: 30s - timeout: 10s - retries: 5 - depends_on: - - owncloud-mariadb - - owncloud-redis - ports: - - 8092:8080 - restart: always - volumes: - - ${DOCKERCONFIGS}/owncloud/files:/mnt/data - - owncloud-mariadb: - container_name: owncloud-mariadb - image: mariadb:10.6 - environment: - - MYSQL_ROOT_PASSWORD=owncloud - - MYSQL_USER=owncloud - - MYSQL_PASSWORD=owncloud - - MYSQL_DATABASE=owncloud - command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"] - healthcheck: - test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=owncloud"] - interval: 10s - timeout: 5s - retries: 5 - restart: always - volumes: - - ${DOCKERCONFIGS}/owncloud-mariadb/mysql:/var/lib/mysql - - owncloud-redis: - image: redis:6 - container_name: owncloud-redis - command: ["--databases", "1"] - healthcheck: - test: ["CMD", "redis-cli", "ping"] - interval: 10s - timeout: 5s - retries: 5 - restart: always - volumes: - - ${DOCKERCONFIGS}/owncloud-redis:/data - pihole: container_name: pihole image: cbcrowe/pihole-unbound:latest