Merge branch 'master' into 47-ansible

compose/production/traefik/traefik.toml.template

@@ -61,7 +61,7 @@ defaultEntryPoints = ["http", "https"]
   
   [backends.onlyoffice]
     [backends.onlyoffice.servers.server1]
-      url = "http://onlyoffice-community-server:80"
+      url = "http://onlyoffice:80"
   
   [backends.bitwarden]
     [backends.bitwarden.servers.server1]

extra/onlyoffice.yml

@@ -1,102 +1,20 @@
 version: '3'
 
 services:
-  onlyoffice-mysql-server:
+  onlyoffice:
-    container_name: mistborn_onlyoffice_mysql_server
+    container_name: mistborn_production_onlyoffice
-    image: mysql:5.7.21
-    environment:
-      - MYSQL_ROOT_PASSWORD=my-secret-pw
-    volumes:
-      - ../../mistborn_volumes/extra/onlyoffice/mysql-conf:/etc/mysql/conf.d
-      - ../../mistborn_volumes/extra/onlyoffice/mysql-entrypoint:/docker-entrypoint-initdb.d
-      - ../../mistborn_volumes/extra/onlyoffice/mysql-data:/var/lib/mysql
-    networks:
-      onlyoffice_net:
-        ipv4_address: 10.2.2.2
-    restart: unless-stopped
-
-  onlyoffice-document-server:
-    container_name: mistborn_onlyoffice_document_server
     image: onlyoffice/documentserver:latest
     volumes:
-      - ../../mistborn_volumes/extra/onlyoffice/documentserver-data:/var/www/onlyoffice/Data
+      - ../../mistborn_volumes/extra/onlyoffice/logs:/var/log/onlyoffice
-      - ../../mistborn_volumes/extra/onlyoffice/documentserver-logs:/var/log/onlyoffice
+      - ../../mistborn_volumes/extra/onlyoffice/cache:/var/lib/onlyoffice
     env_file:
       - ../.envs/.production/.onlyoffice
-    ports:
-      - "80:80/tcp"
-    networks:
-      onlyoffice_net:
-        ipv4_address: 10.2.2.3
-    restart: unless-stopped 
-
-  #onlyoffice-mail-server:
-  #  container_name: mistborn_onlyoffice_mail_server
-  #  privileged: true
-  #  image: onlyoffice/mailserver:latest
-  #  volumes:
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-data:/var/vmail
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-certs:/etc/pki/tls/mailserver
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-logs:/var/log
-  #    - ../../mistborn_volumes/extra/onlyoffice/mailserver-mysql:/var/lib/mysql
-  #  hostname: mistborn
-  #  networks:
-  #    onlyoffice_net:
-  #      ipv4_address: 10.2.2.4
-  #  ports:
-  #    - "25:25/tcp"
-  #    - "143:143/tcp"
-  #    - "587:587/tcp"
-  #  restart: unless-stopped 
-
-  onlyoffice-community-server:
-    container_name: mistborn_onlyoffice_community_server
-    image: onlyoffice/communityserver:latest
-    environment:
-      - DOCUMENT_SERVER_PORT_80_TCP_ADDR=mistborn_onlyoffice_document_server
-  #    - MAIL_SERVER_DB_HOST=mistborn_onlyoffice_mail_server
-      - ONLYOFFICE_CORE_MACHINEKEY=core_secret
-      - MYSQL_SERVER_ROOT_PASSWORD=my-secret-pw
-      - MYSQL_SERVER_DB_NAME=onlyoffice 
-      - MYSQL_SERVER_HOST=mistborn_onlyoffice_mysql_server 
-      - MYSQL_SERVER_USER=onlyoffice_user
-      - MYSQL_SERVER_PASS=onlyoffice_pass 
-  #    - MAIL_SERVER_API_PORT=8081
-  #    - MAIL_SERVER_API_HOST=onlyoffice-mail-server
-  #    - MAIL_SERVER_DB_HOST=onlyoffice-mysql-server
-  #    - MAIL_SERVER_DB_PORT=3306
-  #    - MAIL_SERVER_DB_NAME=onlyoffice_mailserver
-  #    - MAIL_SERVER_DB_USER=onlyoffice_mailserver_user
-  #    - MAIL_SERVER_DB_PASS=onlyoffice_mailserver_user_pass
-    depends_on:
-      - onlyoffice-mysql-server
-      - onlyoffice-document-server 
-  #    - onlyoffice-mail-server 
-    volumes:
-      - ../../mistborn_volumes/extra/onlyoffice/communityserver-data:/var/www/onlyoffice/Data
-      - ../../mistborn_volumes/extra/onlyoffice/communityserver-mysql:/var/lib/mysql
-      - ../../mistborn_volumes/extra/onlyoffice/communityserver-logs:/var/log/onlyoffice
-      - ../../mistborn_volumes/extra/onlyoffice/documentserver-data:/var/www/onlyoffice/DocumentServerData
     labels:
       - "traefik.enable=true"
       - "traefik.port=80"
-    networks:
-      default:
-      onlyoffice_net:
-        ipv4_address: 10.2.2.5
-    ports:
-      #- "10.2.2.5:80:80/tcp"
-      - "5222:5222/tcp"
     restart: unless-stopped 
 
-
 networks:
   default:
     external:
       name: mistborn_default
-
-  onlyoffice_net:
-    driver: overlay
-    ipam:
-      config:
-        - subnet: 10.2.2.0/24

scripts/services/Mistborn-onlyoffice.service

@@ -10,21 +10,12 @@ Group=docker
 PermissionsStartOnly=true
 # Shutdown container (if running) when unit is stopped
 ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml down
-ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/base.yml build
-#ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 25 -j MISTBORN_LOG_DROP
-#ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 143 -j MISTBORN_LOG_DROP
-#ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 587 -j MISTBORN_LOG_DROP
-ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 5222 -j MISTBORN_LOG_DROP
 
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml up
+ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml up --build
 # Stop container when unit is stopped
 ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/onlyoffice.yml down
 # Post stop
-#ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 25 -j MISTBORN_LOG_DROP
-#ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 143 -j MISTBORN_LOG_DROP
-#ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 587 -j MISTBORN_LOG_DROP
-ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 5222 -j MISTBORN_LOG_DROP
 
 [Install]
 WantedBy=multi-user.target