larry 2 년 전
부모
커밋
46275d7e0f
5개의 변경된 파일26개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      calibre/recipe/upkindle.sh
  2. 4 2
      scripts/dockers_init.sh
  3. 2 0
      sslwp/docker-compose.yml
  4. 8 0
      wol2/config/config.json
  5. 10 0
      wol2/docker-compose.yml

+ 2 - 2
calibre/recipe/upkindle.sh

@@ -8,7 +8,7 @@ echo $RECIPEPATH
 #
 #  download news and save output to epub
 #
-ebook-convert "$RECIPEPATH/oriental_daily_pure.recipe" $MOBIPATH/$TODAY-orient.epub 
+#ebook-convert "$RECIPEPATH/oriental_daily_pure.recipe" $MOBIPATH/$TODAY-orient.epub 
 #
 #  convert epub to mobi 
 #
@@ -17,7 +17,7 @@ ebook-convert "$RECIPEPATH/oriental_daily_pure.recipe" $MOBIPATH/$TODAY-orient.e
 #  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.epub --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
 #

+ 4 - 2
scripts/dockers_init.sh

@@ -5,8 +5,10 @@ echo "Unlock scripts is located at nextcloud directory."
 CONTAINER_ROOT="/home/laxaurus/docker"
 #
 #
-CONTAINERS_UP=(jupyter gogs sslwp ftp nu_nc squid transmission transmission-sbt transmission-gm minidlna calibre ampache prometheus guacamole mediawiki torproxy6 samba synapse element jellyfin openvpn 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) 
+#### 2023-07-29 disabled synapse and matrix
+#CONTAINERS_UP=(jupyter gogs sslwp ftp nu_nc squid transmission transmission-sbt transmission-gm minidlna calibre ampache prometheus guacamole mediawiki torproxy6 samba synapse element jellyfin openvpn wireguard stackedit docker-registry baidu syncthing)
+CONTAINERS_UP=(jupyter gogs sslwp ftp nu_nc squid transmission transmission-sbt transmission-gm minidlna calibre ampache prometheus guacamole mediawiki torproxy6 samba jellyfin openvpn wireguard stackedit docker-registry baidu syncthing)
+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 syncthing) 
 
 
 if [[ $1 == "up" ]]

+ 2 - 0
sslwp/docker-compose.yml

@@ -96,6 +96,8 @@ services:
                 hubreg.algometic.com->http://vorsprung.local:8256 #production,
                 nc2022code.algometic.com->http://vorsprung.local:9982 #production,
                 nc2022.algometic.com->http://vorsprung.local:1236 #production,
+                wake.algometic.com->http://vorsprung.local:8081 #production,
+                1984.algometic.com->http://192.168.1.121:8081 #production,
                 '
 
               

+ 8 - 0
wol2/config/config.json

@@ -0,0 +1,8 @@
+{"devices": 
+    {
+        "Game Server": {"mac": "84:FF:00:00:00:00", "ip": "192.168.1.107"}, 
+        "I5-9600 RX580": {"mac": "A8:A1:59:E2:E5:1A", "ip": "192.168.1.109"}, 
+        "Algometic": {"mac": "00:00:00:00:00:03", "ip": "192.168.1.124"}
+    }
+}
+

+ 10 - 0
wol2/docker-compose.yml

@@ -0,0 +1,10 @@
+version: "2.1"
+services:
+  wol-app:
+    container_name: wol-app 
+    image: laxaurus/wol-repo:0.1 
+    restart: "no" 
+    network_mode: host
+    volumes:
+      - ./config/config.json:/app/config/config.json
+