Pārlūkot izejas kodu

Rebuild vorsprung on Ubuntu20.04

larry 4 gadi atpakaļ
vecāks
revīzija
be2c05e116

+ 1 - 1
nc/docker-compose.yml

@@ -54,7 +54,7 @@ volumes:
 
 
 services:
 services:
   db:
   db:
-    image: mariadb
+    image: mariadb:10.4.11
     container_name: ${CONTAINER_NAME}_db
     container_name: ${CONTAINER_NAME}_db
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
     restart: "no" 
     restart: "no" 

+ 20 - 0
scripts/rescue/unlock_qnap_seagate.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#LV_NAME1=/dev/sdd1
+LV_NAME1=0a551422-727b-43ac-bd0b-917193b2db77
+LUKS_MNT1=luks-0a551422-727b-43ac-bd0b-917193b2db77
+UNLOCK_MNT1=/media/luks-0a551422-727b-43ac-bd0b-917193b2db77
+#
+#
+sudo umount $UNLOCK_MNT1
+sudo cryptsetup luksClose $LUKS_MNT1
+
+#
+# open device
+echo "unlock qnap disk /dev/sdd1..."
+sudo cryptsetup luksOpen UUID=$LV_NAME1 $LUKS_MNT1 
+echo "mounting ..."
+sudo mount /dev/mapper/$LUKS_MNT1 $UNLOCK_MNT1
+#sudo mount -o rw, remount /dev/mapper/$LUKS_MNT1 $UNLOCK_MNT1
+
+

+ 30 - 21
sslwp/docker-compose.yml

@@ -44,31 +44,40 @@ services:
 #	        algometic.com->http://vsu-dolphin:80 #staging'
 #	        algometic.com->http://vsu-dolphin:80 #staging'
 #      DOMAINS: '
 #      DOMAINS: '
 #                algometic.com=>www.algometic.com,
 #                algometic.com=>www.algometic.com,
-#                www.algometic.com->http://vorsprung:8280 #production,
-#                mango.algometic.com->http://vorsprung:8111 #production,
-#	        ocd.algometic.com->http://vorsprung:1234 #production,
-#	        code.algometic.com->http://vorsprung:9980 #production,
-#	        58985620.algometic.com->http://vorsprung:8055 #production,
-#	        melody.algometic.com->http://vorsprung:9045 #production,
-#	        metrics.algometic.com->http://vorsprung:3000 #production,
-#	        books.algometic.com->http://vorsprung:8783 #production,
-#                syn.algometic.com->http://vorsprung:9081 #production,
-#                slot.algometic.com->http://vorsprung:9981 #production,
-#                slot1234.algometic.com->http://vorsprung:1235 #production,
+#                www.algometic.com->http://vorsprung.local:8280 #production,
+#                mango.algometic.com->http://vorsprung.local:8111 #production,
+#	        ocd.algometic.com->http://vorsprung.local:1234 #production,
+#	        code.algometic.com->http://vorsprung.local:9980 #production,
+#	        58985620.algometic.com->http://vorsprung.local:8055 #production,
+#	        melody.algometic.com->http://vorsprung.local:9045 #production,
+#	        metrics.algometic.com->http://vorsprung.local:3000 #production,
+#	        books.algometic.com->http://vorsprung.local:8783 #production,
+#                syn.algometic.com->http://vorsprung.local:9081 #production,
+#                slot.algometic.com->http://vorsprung.local:9981 #production,
+#                slot1234.algometic.com->http://vorsprung.local:1235 #production,
 #                '
 #                '
+#
+#     if you are getting a 502 bad gateway error (111:connection refused) while
+#     connecting to upstream, verify the redirection actually is accessible from
+#     within https-portal to the destination. 
+#     For instance, specifying the hostname vorsprung without the .local 
+#     domain name resolves to 127.0.0.1, which of course wouldn't work because
+#     the service is not running on https-portal. The proper fix is to 
+#     use vorspurng.local which resolves to 192.168.1.124    
+#       
 
 
       DOMAINS: '
       DOMAINS: '
                 algometic.com=>www.algometic.com,
                 algometic.com=>www.algometic.com,
-                www.algometic.com->http://vorsprung:8280 #production,
-                mango.algometic.com->http://vorsprung:8111 #production,
-	        ocd.algometic.com->http://vorsprung:1235 #production,
-	        code.algometic.com->http://vorsprung:9981 #production,
-	        58985620.algometic.com->http://vorsprung:8055 #production,
-	        melody.algometic.com->http://vorsprung:9045 #production,
-	        metrics.algometic.com->http://vorsprung:3000 #production,
-	        books.algometic.com->http://vorsprung:8783 #production,
-                syn.algometic.com->http://vorsprung:9081 #production,
-                git.algometic.com->http://vorsprung:3079 #production,
+                www.algometic.com->http://vorsprung.local:8280 #production,
+                mango.algometic.com->http://vorsprung.local:8111 #production,
+	        ocd.algometic.com->http://vorsprung.local:1235 #production,
+	        code.algometic.com->http://vorsprung.local:9981 #production,
+	        58985620.algometic.com->http://vorsprung.local:8055 #production,
+	        melody.algometic.com->http://vorsprung.local:9045 #production,
+	        metrics.algometic.com->http://vorsprung.local:3000 #production,
+	        books.algometic.com->http://vorsprung.local:8783 #production,
+                syn.algometic.com->http://vorsprung.local:9081 #production,
+                git.algometic.com->http://vorsprung.local:3079 #production,
                 '
                 '