sct 1.8.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041e64c6310b4ce739c06b8ca0453cdbb592c84289064db309b4c4e9c2ddb424
-  data.tar.gz: f85efceffaacf59ee0f41c59c1394da10385227456023ac0da0f65814b7a0abe
+  metadata.gz: c662a27967c4ce64e04d081bcc5f5809e8cb593d5d83908657515c20c94c7ccf
+  data.tar.gz: 0c6fcea918a56fe65e3d49dc21be0bce93b794721157e3880d4d7215b9cc7785
 SHA512:
-  metadata.gz: 303312f14a3b1043a896a57c04c60c76013450235e9b33be8ffc3859d30903147c6c7d287001cf7c566df79c62d90ea98f51337f94d4bdf821c751e0445825f9
-  data.tar.gz: bad689abe47eb800ea876bcc1136f546152fb49d4bd762f1b0ed8e6969028f9f690ae7f5da61164b71459b9e146033103aa17400c8141e96f1f4d9369f9610c8
+  metadata.gz: e228362189fdff909fbb6c6b332e0b82ea9af721c418ff859ac89e2b8f4517aa97cf70d854112f679ed40449b154e6a30bb7a9db1aa586f6ac4fa66e0b2e883c
+  data.tar.gz: 54b46912915b24e7bdefcbe406246020f9dbefd5d42786425de5f6873fdb14e15ec700c5aa05060d5ff61e34f2f21f7e2ca5da3fd11b6be6efa55a5f5bc4da86

data/cluster/lib/cluster/commands_generator.rb

@@ -21,6 +21,7 @@ module Cluster
         c.description = "(re)start the cluster"
         c.option '--build', '(re)build images before starting'
         c.option '--pull', 'pull latest images before starting'
+        c.option '--nuxt', 'use nuxt instead of ui'
 
         c.action do |args, options|
           Cluster::Runner.new.start args, options

data/cluster/lib/cluster/runner.rb

@@ -1,5 +1,6 @@
 module Cluster
   class Runner
+    KEY_CADDYFILE_PATH = "CADDYFILE_PATH"
 
     @@dc = system("docker compose version", out: "/dev/null", err: "/dev/null") ? "docker compose" : "docker-compose"
 
@@ -18,6 +19,12 @@ module Cluster
     end
 
     def start args, options
+      ENV.delete(KEY_CADDYFILE_PATH)
+
+      if (options.nuxt) 
+        ENV[KEY_CADDYFILE_PATH] = './docker/caddy/Caddyfile-nuxt'
+      end  
+
       if options.pull
         dc "pull"
       end

data/henk/lib/henk/runner.rb

@@ -56,8 +56,8 @@ module Henk
 
             connected_to_network = `docker network inspect spend-cloud | jq '.[0] | .Containers | map(select((.Name | test("^#{required_containers.join('|^')}")))) | length'`
 
-            if connected_to_network.to_s.strip! != "5"
-                puts "Error: ".red + "Not all required services are running or connected to the cluster (#{connected_to_network}/5)"
+            if connected_to_network.to_s.strip! != "3"
+                puts "Error: ".red + "Not all required services are running or connected to the cluster (#{connected_to_network}/3)"
                 exit(1)
             end
 
@@ -88,7 +88,7 @@ module Henk
         def encrypt_config_data domain
             puts "Manually encrypting config data for #{domain}".green
             php_command = "php /var/www/scripts/encryptConfigData.php -c='#{domain}' --execute"
-            command = 'docker exec -it proactive-config-php bash -c "#{php_command}"'
+            command = 'docker exec -it proactive-config bash -c "#{php_command}"'
             self.run command
         end
 
@@ -223,10 +223,10 @@ module Henk
         end
 
         def copy_db_encryption_key customer, dir
-            run "docker exec proactive-config-php mkdir /data/#{customer}"
-            run "docker cp #{dir}/db_encryption.key proactive-config-php:/data/#{customer}/"
+            run "docker exec proactive-config mkdir /data/#{customer}"
+            run "docker cp #{dir}/db_encryption.key proactive-config:/data/#{customer}/"
 
-            puts "Copied db_encryption.key to proactive-config-php:/data/#{customer}/".green
+            puts "Copied db_encryption.key to proactive-config:/data/#{customer}/".green
         end
 
         def run_sql_files dir
@@ -249,7 +249,7 @@ module Henk
         def add_customer_account customer, customer_database
             account_data = "\n[#{customer}]\ndatabase = #{customer_database}\ndomain = NULL\nrewrite = #{customer}\nimport_planning = 1\njobs = 1\nscan_upload = 0\nfiatteren_mailbox = 1\ncontracten_mailbox = 1"
 
-            run "docker exec proactive-config-php sh -c 'echo \"#{account_data}\" >> /data/proactive_accounts.ini'"
+            run "docker exec proactive-config sh -c 'echo \"#{account_data}\" >> /data/proactive_accounts.ini'"
 
             puts "Added account to proactive_accounts.ini".green
         end
@@ -269,7 +269,7 @@ module Henk
 
             puts "Updated config values".green
 
-            run "docker exec proactive-config-php php /var/www/scripts/encryptConfigData.php -c='#{customer}' --execute"
+            run "docker exec proactive-config php /var/www/scripts/encryptConfigData.php -c='#{customer}' --execute"
 
             puts "Encrypted config values".green
         end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.8.2"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -253,9 +253,9 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- henk/lib
-- sct/lib
 - sct_core/lib
+- sct/lib
+- henk/lib
 - cluster/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: