wait #7296 @4

diff --git a/.docker/config/wireguard/wg0.conf b/.docker/config/wireguard/wg0.conf
new file mode 100644 (file)
index 0000000..a6bdc3e
--- /dev/null
+++ b/.docker/config/wireguard/wg0.conf
@@ -0,0 +1,11 @@
+[Interface]
+Address = 10.13.13.7
+PrivateKey = MO/lA/rCVwT87s47Z17OKzDuZdP0GP3PEm1AZv4GFn4=
+ListenPort = 51820
+DNS = 10.13.13.1, 1.1.1.1
+
+[Peer]
+PublicKey = fLe8zDGbY78GH3MJpytrbIX8uKsx03t7yZ5s1pnhfl0=
+PresharedKey = SUKvrBR6LoBmK5701Bvm29B3r+Pphv6slYq1DAji+XM=
+Endpoint = 130.180.213.67:51820
+AllowedIPs = 192.168.10.0/24, 192.168.10.1/32

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index db90fd137fad793642717f87f4cc7d872246f1aa..f90856d5fffde91cc342d73970d62b39355062a1 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -66,6 +66,8 @@ services:
       # PHP
       - '/home/toolbox/www/.docker/config/php/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
       - '/home/toolbox/www/.docker/config/php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf'
+      # Wireguard
+      - '/home/toolbox/www/.docker/config/wireguard/wg0.conf:/etc/wireguard/wg0.conf'
       # PROD
       - '/home/toolbox/dev/:/application/dev/'
       - '/data/toolbox/dev/storage/:/application/dev/storage/'

diff --git a/.docker/update.sh b/.docker/update.sh
index 1be15cd4a83a88d7488def77906e29114af84b84..bf9f32b7a5dbaa5a3c83061361e6cd966e3e24db 100644 (file)
--- a/.docker/update.sh
+++ b/.docker/update.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 cd /docker/fluidbook-toolbox
+apt install wireguard -y
+mkdir -p /etc/wireguard;cp /home/toolbox/www/.docker/config/wireguard/wg0.conf /etc/wireguard/cubedesigners.conf
+wg-quick down cubedesigners
+wg-quick up cubedesigners
 docker plugin install ucphhpc/sshfs --grant-all-permissions
 chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/www/.docker/config/cron/host /etc/cron.d/toolbox
 chown root:root /home/toolbox/www/.docker/config/sudoers

diff --git a/app/Fluidbook/Packager/WindowsInstaller.php b/app/Fluidbook/Packager/WindowsInstaller.php
index bb43b71161e3e50005a3d7ae4a03cb19cd5dc808..bd7430054c5395b2966d0049ead84be24aa9c594 100644 (file)
--- a/app/Fluidbook/Packager/WindowsInstaller.php
+++ b/app/Fluidbook/Packager/WindowsInstaller.php
@@ -60,6 +60,7 @@ class WindowsInstaller extends WindowsZIP
         $makensis->setArg(null, '-V4');
         $makensis->setArg(null, $tmp);
         $makensis->execute();
+        $makensis->debug();
 
         $out=$this->getPathBase('exe');
 

diff --git a/app/Fluidbook/Packager/WindowsZIP.php b/app/Fluidbook/Packager/WindowsZIP.php
index 2ed65c7c95bc9b0aae7d49e7b72941f092f418f1..5d67601e58cc90b2d38b6983910bd9dc3c61a8ef 100644 (file)
--- a/app/Fluidbook/Packager/WindowsZIP.php
+++ b/app/Fluidbook/Packager/WindowsZIP.php
@@ -142,20 +142,23 @@ class WindowsZIP extends Packager
         $cli = new CommandLine('/application/bin/mount.sh');
         $cli->setSudo(true);
         $cli->execute();
+        $cli->debug();
 
         $rand = 'sign-' . hash_file('sha256', $source) . '.exe';
         $remote = '/mnt/sign/' . $rand;
 
         $local = $this->book->protected_path('signedexe/' . $rand);
-        if (!file_exists($local)) {
+        if (true || !file_exists($local)) {
+            debug('Copy ' . $source . ' to ' . $remote);
             $ssh = new SSH2('192.168.10.176', 'vince', 'Y@mUC9mY2DOYWXkN');
             copy($source, $remote);
 
             // $sectigo_cert = 'Cubedesigners.cer';
             $sectigo_cert = 'Cubedesigners2024-2027.cer';
 
-            $cli = new CommandLine('C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe');
-            $cli->setManualArg("sign /f C:/Users/vince/OneDrive/Documents/" . $sectigo_cert . " /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /a C:/Sign/$rand");
+            $cli = new CommandLine('C:/Program Files (x86)/Windows Kits/10/bin/10.0.26100.0/x64/signtool.exe');
+            // https://stackoverflow.com/a/54439759
+            $cli->setManualArg("sign /debug /f C:/Users/vince/OneDrive/Documents/" . $sectigo_cert . " /csp \"eToken Base Cryptographic Provider\" /k \"[SafeNet Token JC 0{{^!wBa^pc82&UyfU8}}]=Sectigo_20241122100836\" /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /a C:/Sign/$rand");
             $cli->execute($ssh);
             $cli->debug();
             if (!stristr($cli->getOutput(), 'Successfully signed')) {

diff --git a/app/Fluidbook/Packager/WorkshopPackager.php b/app/Fluidbook/Packager/WorkshopPackager.php
deleted file mode 100644 (file)
index bec9ac7..0000000
--- a/app/Fluidbook/Packager/WorkshopPackager.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Fluidbook\Packager;
-
-use App\Services\WorkshopV2;
-
-class WorkshopPackager extends Packager
-{
-    protected $version;
-
-    protected static $_versionMap = [
-        'online' => 'html',
-    ];
-
-    public function __construct($book_id, $version, $vdir = null, $options = [])
-    {
-        parent::__construct($book_id, $vdir, $options);
-        $this->version = $version;
-    }
-
-    public function makePackage($zip)
-    {
-
-        $ws = new WorkshopV2();
-        $ws->login($this->getUser()->email, $this->getUser()->api_token);
-        $version = self::$_versionMap[$this->version] ?? $this->version;
-        $this->setFinalURL($ws->getDownloadBookURL($this->book_id, $version));
-    }
-}