Parcourir la source

many changes: baidu,backup,kindle,nc2022

larry il y a 3 ans
Parent
commit
c675463ff2

+ 8 - 1
baidu/docker-compose.yml

@@ -1,8 +1,15 @@
 version: "2.1"
 services:
   baidupan:
-    image: hubreg.algometic.com/baidupan:0.4
+    image: hubreg.algometic.com/baidupan:0.5
     container_name: ${CONTAINER_NAME} 
+    cap_add:
+      - SYS_ADMIN
+    privileged: true
+    security_opt:
+      - apparmor:unconfined
+    devices:
+      - /dev/fuse:/dev/fuse:rwm
     volumes:
       - ${BAIDU_USERDAT}/data:/root/baidunetdisk
       - ${BAIDU_DATAPATH}/data:/root/Downloads

+ 3 - 3
calibre/recipe/upkindle.sh

@@ -12,13 +12,13 @@ ebook-convert "$RECIPEPATH/oriental_daily_pure.recipe" $MOBIPATH/$TODAY-orient.e
 #
 #  convert epub to mobi 
 #
-ebook-convert $MOBIPATH/$TODAY-orient.epub $MOBIPATH/$TODAY-orient.mobi $OPTIONS
+#ebook-convert $MOBIPATH/$TODAY-orient.epub $MOBIPATH/$TODAY-orient.mobi $OPTIONS
 #
 #  send book to kindle
 #
 #calibre-smtp  --attachment $MOBIPATH/$TODAY-orient.mobi --relay smtp.gmail.com --port 587 --username cigarbar@gmail.com --password "on2next1" --encryption-method TLS cigarbar@gmail.com larry1chan@kindle.cn ""
-calibre-smtp  --attachment $MOBIPATH/$TODAY-orient.mobi --relay hwsmtp.exmail.qq.com --port 465 --username sales@algometic.com --password "y6t8Fk^" --encryption-method SSL sales@algometic.com larry1chan@kindle.cn ""
+calibre-smtp  --attachment $MOBIPATH/$TODAY-orient.epub --relay hwsmtp.exmail.qq.com --port 465 --username sales@algometic.com --password "y6t8Fk^" --encryption-method SSL sales@algometic.com larry1chan@kindle.cn ""
 #
 #  rm mobi file
 #
-rm $MOBIPATH/$TODAY-orient.mobi
+#rm $MOBIPATH/$TODAY-orient.mobi

+ 1 - 1
jellyfin/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "2.3"
 services:
   jellyfin:
-    image: jellyfin/jellyfin:20210911.11-unstable-amd64
+    image: jellyfin/jellyfin:latest
     container_name: ${CONTAINER_NAME} 
     network_mode: host # Enable DLNA and Wake-on-Lan
     user: 1000:1000

+ 7 - 0
nc2022/.env

@@ -0,0 +1,7 @@
+DATA_VOLUME_ROOT=/media/luks-0a551422-727b-43ac-bd0b-917193b2db77/backup/qnap_20210206
+REDIS_VOLUME_ROOT=/home/laxaurus/docker/nc2022
+DB_VOLUME_ROOT=/home/laxaurus/docker/nc2022
+ELASTIC_SEARCH_ROOT=/home/laxaurus/docker/nc2022/elasticsearch
+MYSQL_ROOT_PASSWORD=2eqQ6Rqs
+MYSQL_PASSWORD=VT2cL4Zg
+CONTAINER_NAME=nc2022

+ 129 - 0
nc2022/docker-compose.yml

@@ -0,0 +1,129 @@
+version: '2.1'
+#version: '3'
+
+volumes:
+  files:
+    driver: local
+    driver_opts: 
+      type: volume 
+      o: 'bind'
+      device: "${DATA_VOLUME_ROOT}/data/files"
+  db:
+    driver: local
+    driver_opts: 
+      type: volume 
+      o: 'bind'
+      device: "${DB_VOLUME_ROOT}/db"
+
+  redis:
+    driver: local
+    driver_opts: 
+      type: volume 
+      o: 'bind'
+      device: "${REDIS_VOLUME_ROOT}/redis"
+
+  es_index:
+    driver: local
+    driver_opts:
+      type: volume 
+      o: 'bind'
+      device: "${ELASTIC_SEARCH_ROOT}/es"
+
+  es_root:
+    driver: local
+    driver_opts:
+      type: volume 
+      o: 'bind'
+      device: "${ELASTIC_SEARCH_ROOT}/es_root"
+
+
+  oo_data:
+    driver: local
+    driver_opts: 
+      type: volume 
+      o: 'bind'
+      device: "${DATA_VOLUME_ROOT}/data/oo_data"
+ 
+
+services:
+  db:
+    image: mariadb:10.4.11
+    container_name: ${CONTAINER_NAME}_db
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    restart: "no" 
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+
+
+  redis:
+    image: redis:alpine
+    container_name: ${CONTAINER_NAME}_redis
+    restart: "no"
+    volumes:
+      - redis:/var/lib/redis
+
+
+  app:
+    image: nextcloud:20.0.6
+    container_name: ${CONTAINER_NAME}
+    ports:
+      - 1236:80
+    links:
+      - av
+      - db
+      - redis
+    volumes:
+      - files:/var/www/html
+    restart: "no" 
+    environment:
+      - REDIS_HOST=redis
+      - REDIS_PASSWORD=
+
+
+  es01:
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.8.1
+    container_name: ${CONTAINER_NAME}_es 
+    environment:
+      - node.name=es01
+      - discovery.type=single-node
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    volumes:
+      #- es_index:/usr/share/elasticsearch/data
+      - es_index:/usr/share/elasticsearch/data
+      #- es_root:/usr/share/elasticsearch
+      - es_root:/usr/share/elasticsearch
+    restart: "no" 
+    ports:
+      - 9202:9200
+
+  onlyoffice:
+    container_name: ${CONTAINER_NAME}_onlyoffice
+    image: onlyoffice/documentserver:6.0.2
+    stdin_open: true
+    tty: true
+    restart: "no" 
+    #restart: always
+    ports:
+      - 9982:80
+    volumes:
+      - oo_data:/var/www/onlyoffice/Data
+      #- oo_log:/var/log/onlyoffice
+
+
+  av:
+    image: mkodockx/docker-clamav:1.0.3-buster
+    container_name: ${CONTAINER_NAME}_clamav 
+    restart: "no" 
+    ports:
+      - 3312:3310
+    volumes:
+#      - clamav:/etc/clamav
+      - ./clamav:/var/lib/clamav

+ 3 - 0
nc2022/elasticsearch/es_root/config/elasticsearch.yml

@@ -0,0 +1,3 @@
+cluster.name: "docker-cluster"
+network.host: 0.0.0.0
+xpack.security.enabled: false

+ 14 - 0
nc2022/elasticsearch/es_root/config/role_mapping.yml

@@ -0,0 +1,14 @@
+# Role mapping configuration file which has elasticsearch roles as keys
+# that map to one or more user or group distinguished names
+
+#roleA:   this is an elasticsearch role
+#  - groupA-DN  this is a group distinguished name
+#  - groupB-DN
+#  - user1-DN   this is the full user distinguished name
+
+#power_user:
+#  - "cn=admins,dc=example,dc=com"
+#user:
+#  - "cn=users,dc=example,dc=com"
+#  - "cn=admins,dc=example,dc=com"
+#  - "cn=John Doe,cn=other users,dc=example,dc=com"

+ 3 - 0
nc2022/elasticsearch/es_root/config/roles.yml

@@ -0,0 +1,3 @@
+# The default roles file is empty as the preferred method of defining roles is
+# through the API/UI. File based roles are useful in error scenarios when the
+# API based roles may not be available.

+ 35 - 0
scripts/dockers_init_tmp.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+echo "Mount encrypted filesystems before running this script."
+echo "Unlock scripts is located at nextcloud directory."
+
+CONTAINER_ROOT="/home/laxaurus/docker"
+#
+#
+CONTAINERS_UP=(jupyter gogs sslwp ftp squid transmission transmission-sbt transmission-gm minidlna calibre prometheus guacamole mediawiki torproxy6 samba synapse element jellyfin wireguard stackedit docker-registry baidu)
+CONTAINERS_DOWN=(jupyter gogs ftpd squid transmission transmission-sbt transmission-gm minidlna calibre calibre-web ampache prometheus nu_nc nu_nc_db nu_nc_redis nu_nc_onlyoffice nu_nc_clamav nu_nc_es monitoring_grafana cadvisor redis node-exporter sslwp_https-portal sslwp_web sslwp_php mwiki mwiki_mysql mwiki_parsoid mwiki_es guaca guaca_db guaca_cd torproxy6 samba element synapse_app_1 synapse_ma1sd_1 jellyfin openvpn openvpn-admin downloader-exporter-bt wireguard stackedit stackedit_couchdb_1 docker-registry docker-registry-ui baidupan) 
+
+
+if [[ $1 == "up" ]]
+then
+	for i in "${CONTAINERS_UP[@]}"
+		do
+			CONTAINER_DIR="$CONTAINER_ROOT/${i}" 
+		        echo "starting container ${i} at $CONTAINER_DIR..."
+			env $(cat $CONTAINER_DIR/.env | grep "#" -v) docker-compose -f $CONTAINER_DIR/docker-compose.yml up -d 
+
+		done
+elif [[ $1 == "down" ]]
+then
+
+	for i in "${CONTAINERS_DOWN[@]}"
+		do
+			echo "stopping container ${i}..."
+			docker stop "${i}"
+                        
+		done
+else
+	echo "$0: allowed options: {up|down}"
+	exit -1
+
+fi
+

+ 4 - 0
scripts/jobs/backup_all.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 /home/laxaurus/docker/scripts/jobs/backup_backups.sh
 /home/laxaurus/docker/scripts/jobs/backup_books.sh
+/home/laxaurus/docker/scripts/jobs/backup_docker_registry_data.sh
 /home/laxaurus/docker/scripts/jobs/backup_ftp-scans.sh  
 /home/laxaurus/docker/scripts/jobs/backup_git-repo.sh  
 /home/laxaurus/docker/scripts/jobs/backup_jupyter_notebook_projects.sh  
@@ -8,6 +9,9 @@
 /home/laxaurus/docker/scripts/jobs/backup_michelle.sh  
 /home/laxaurus/docker/scripts/jobs/backup_mediawiki.sh  
 /home/laxaurus/docker/scripts/jobs/backup_music.sh  
+/home/laxaurus/docker/scripts/jobs/backup_openvpn-data.sh  
 /home/laxaurus/docker/scripts/jobs/backup_nu_nc.sh
+/home/laxaurus/docker/scripts/jobs/backup_stackedit.sh  
+/home/laxaurus/docker/scripts/jobs/backup_wireguard.sh  
 
 

+ 2 - 0
scripts/jobs/backup_docker_registry_data.sh

@@ -0,0 +1,2 @@
+sudo rsync -vapr  /media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/docker_registry_data /media/luks-0a551422-727b-43ac-bd0b-917193b2db77/backup
+

+ 2 - 0
scripts/jobs/backup_openvpn-data.sh

@@ -0,0 +1,2 @@
+sudo rsync -vapr  /media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/openvpn-data /media/luks-0a551422-727b-43ac-bd0b-917193b2db77/backup
+

+ 2 - 0
scripts/jobs/backup_stackedit.sh

@@ -0,0 +1,2 @@
+sudo rsync -vapr  /media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/stackedit /media/luks-0a551422-727b-43ac-bd0b-917193b2db77/backup
+

+ 2 - 0
scripts/jobs/backup_wireguard.sh

@@ -0,0 +1,2 @@
+sudo rsync -vapr  /media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/wireguard /media/luks-0a551422-727b-43ac-bd0b-917193b2db77/backup
+

+ 2 - 2
scripts/unlock_qnap_toshiba.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-#LV_NAME1=/dev/sdd1
-LV_NAME1=53d827ad-9c21-4312-ab46-f76f5ce57d03
+#LV_NAME1=/dev/sde1
+LV_NAME1=01cf1174-2f42-45d2-b206-c146c4f42f49
 LUKS_MNT1=luks-53d827ad-9c21-4312-ab46-f76f5ce57d03
 UNLOCK_MNT1=/media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03
 #

+ 2 - 0
sslwp/docker-compose.yml

@@ -94,6 +94,8 @@ services:
                 secouch.algometic.com->http://vorsprung.local:5123 #production,
                 hub.algometic.com->http://vorsprung.local:8255 #production,
                 hubreg.algometic.com->http://vorsprung.local:8256 #production,
+                nc2022code.algometic.com->http://vorsprung.local:9982 #production,
+                nc2022.algometic.com->http://vorsprung.local:1236 #production,
                 '
 
               

+ 1 - 1
transmission-gm/config/settings.json

@@ -45,7 +45,7 @@
     "rpc-enabled": true,
     "rpc-host-whitelist": "",
     "rpc-host-whitelist-enabled": false,
-    "rpc-password": "{118c6eda5aab84eda1627291537aa5b08dba09d9Igu0qr9B",
+    "rpc-password": "{8a7790b7c69d182edc3d0f68264cf416bd82f5d3PPQ6U.bQ",
     "rpc-port": 9091,
     "rpc-url": "/transmission/",
     "rpc-username": "",

+ 5 - 5
transmission-gm/config/stats.json

@@ -1,7 +1,7 @@
 {
-    "downloaded-bytes": 1836387070283,
-    "files-added": 52746,
-    "seconds-active": 70870097,
-    "session-count": 42,
-    "uploaded-bytes": 223976914760
+    "downloaded-bytes": 1838668457348,
+    "files-added": 53432,
+    "seconds-active": 73066108,
+    "session-count": 43,
+    "uploaded-bytes": 224691212047
 }

+ 1 - 1
transmission-sbt/config/settings.json

@@ -45,7 +45,7 @@
     "rpc-enabled": true,
     "rpc-host-whitelist": "",
     "rpc-host-whitelist-enabled": false,
-    "rpc-password": "{6f562de971c84bf757bcb0fe61993f75bdc49b7c31O2oc/l",
+    "rpc-password": "{62e885f22daa8853ff6cf893b5dca5779c64e7c1ycuK3dwU",
     "rpc-port": 9091,
     "rpc-url": "/transmission/",
     "rpc-username": "",

+ 5 - 5
transmission-sbt/config/stats.json

@@ -1,7 +1,7 @@
 {
-    "downloaded-bytes": 748426828385,
-    "files-added": 13448,
-    "seconds-active": 70345079,
-    "session-count": 46,
-    "uploaded-bytes": 563661529095
+    "downloaded-bytes": 751613058628,
+    "files-added": 13505,
+    "seconds-active": 72462251,
+    "session-count": 47,
+    "uploaded-bytes": 565036755550
 }

+ 1 - 1
transmission/config/settings.json

@@ -45,7 +45,7 @@
     "rpc-enabled": true,
     "rpc-host-whitelist": "",
     "rpc-host-whitelist-enabled": false,
-    "rpc-password": "{4696ba09c5102a13d69bc54a37497cac16b47659ces9cB4Q",
+    "rpc-password": "{ff8e0f440575a189229c65fafebf44bb1c1a625fNecKbW7L",
     "rpc-port": 9091,
     "rpc-url": "/transmission/",
     "rpc-username": "",

+ 5 - 5
transmission/config/stats.json

@@ -1,7 +1,7 @@
 {
-    "downloaded-bytes": 1478308989063,
-    "files-added": 8609,
-    "seconds-active": 76619327,
-    "session-count": 40,
-    "uploaded-bytes": 91282693382
+    "downloaded-bytes": 1496766376858,
+    "files-added": 8625,
+    "seconds-active": 78270656,
+    "session-count": 41,
+    "uploaded-bytes": 92623268663
 }