harbr 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6403e6f31e693d85891c96c75d6d388db414b2043f6e1e54448e21979e53324
-  data.tar.gz: 30f7b53039791666793e383cdb79b3744d8017cb04ff82e44ff9c49947fb3fb0
+  metadata.gz: c3b7fa88e79e3aacebe05805dffd35ddb90b46208cbf11dfc75c14ab0e9be2ed
+  data.tar.gz: fe47d47fcb32a979fd13727fe99b87def6b7a2fe5cfd262c5b22ff4305ac6700
 SHA512:
-  metadata.gz: b0bd8ca385781dcf3b36094f731de874a031e00eabbf97af7e4b220ad40b1f1324e2e789643fbf1ef48467ff52cb7f982b9a25892c53297a19b2905e5227080d
-  data.tar.gz: 2e0ff891cb6e26fbcb3f97f902da8f769752d6c7c67e683af9118e1eb47688b16516de5150bf6fe20c37a1724e321413f83058d473d77b749d7baaae44f73802
+  metadata.gz: 051e22a069c3685557e2728447488e19594526f8abd32ccf67525a383bcd85b9b7fefc6a50a1c031a63d8a2b9cea20c11014079ff9ee13d2ffdc810082915c19
+  data.tar.gz: b5da151591c407020b096dd9c4cdaa089e3f05d3db511f3aae72a5f90ddf44078b3adab3c6a9096d909ed3cefe14b7550cf38ab4f508d89e6f86f265f8012b3d

data/!

@@ -0,0 +1,177 @@
+require 'harbr'
+module Harbr
+  class Job
+    include SuckerPunch::Job
+
+    def highest_numbered_directory(path)
+      directories = Dir.glob("#{path}/*").select { |entry| File.directory?(entry) }
+      directories.max_by { |entry| entry[/\d+/].to_i }
+    end
+
+    def get_container_name(path)
+      File.basename(path)
+    end
+
+
+    def create_traefik_config(containers)
+      config = {
+        "http" => {
+          "routers" => {
+            "traefik-dashboard" => {
+              "rule" => "Host(`traefik.harbr.zero2one.ee`)",
+              "service" => "api@internal",
+              "tls" => {}  # Enable TLS for the dashboard
+            }
+          },
+          "services" => {}
+        }
+      }
+
+      containers.each do |container|
+        container.ip = "127.0.0.1"
+        name = container.name.gsub(".", "-")
+
+        # Create the router with TLS enabled
+        config["http"]["routers"]["#{name}-router"] = {
+          "rule" => "Host(`#{container.host_header}`)",
+          "service" => "#{name}-service",
+          "tls" => {
+            "certResolver" => "letsencrypt"  # Specify the certificate resolver for TLS
+          }
+        }
+
+        # Create the service
+        config["http"]["services"]["#{name}-service"] = {
+          "loadBalancer" => {
+            "servers" => [{"url" => "http://#{container.ip}:#{container.port}"}]
+          }
+        }
+      end
+
+
+      File.write("/etc/traefik/harbr.toml", TomlRB.dump(config))
+      puts "Traefik configuration written to /etc/traefik/harbr.toml"
+    end
+
+    def collate_containers(name,host,port)
+
+      containers = Harbr::Container::Repository.new
+      container = containers.find_by_header(host)
+
+      if container.nil?
+        container = Harbr::Container.new
+        container.name = name
+        container.host_header =host
+        container.ip = "127.0.0.1"
+        container.port = port
+        containers.create(container)
+      else
+        container.port = port
+        containers.update(container)
+      end
+      containers.all
+    end
+
+
+    module Runit
+
+      class Run
+        def initialize(container, port)
+          @container_name = container
+          @port = port
+        end
+
+        def to_s
+          script_template = <<~SCRIPT
+          #!/bin/sh
+          exec 2>&1    
+          cd /var/harbr/containers/#{@container_name}/current
+          exec ./exe/run #{@port} live 
+          SCRIPT
+        end
+
+        def link
+          "ln -s /etc/sv/harbr/#{@container_name} /etc/service/#{@container_name}"
+        end
+      end
+
+
+      class Finish
+        def initialize(port)
+          @port = port
+        end
+
+        def to_s
+          script_template = <<~SCRIPT
+          #!/bin/sh
+          sleep 3
+          `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
+          SCRIPT
+        end
+      end
+
+      class Log
+        def initialize(container)
+          @container_name = container
+        end
+
+        def to_s
+          script_template = <<~SCRIPT
+          #!/bin/sh
+          exec svlogd -tt /var/log/harbr/#{@container_name}
+          SCRIPT
+        end
+
+      end
+
+    end
+
+    def write_to_file(path, contents)
+      File.open(path, 'w') do |file|
+        file.write(contents)
+      end
+    end
+
+    def load_manifest(container, version)
+      manifest_path = "/var/harbr/containers/#{container}/versions/#{version}/config/manifest.yml"
+      raise "Manifest not found at #{manifest_path}" unless File.exist?(manifest_path)
+      manifest_data = YAML.load_file(manifest_path)
+      OpenStruct.new(manifest_data)
+    end
+
+    def perform(name,version)
+
+      Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
+
+        `bundle config set --local path 'vendor/bundle'`
+        manifest = load_manifest(name, version)
+        port = `port assign #{manifest.port}`.strip
+        system "sv stop #{name}" if File.exist?("/etc/service/#{name}")
+        system 'bundle install'
+
+
+        `mkdir -p /etc/sv/harbr/#{name}`
+        `mkdir -p /etc/sv/harbr/#{name}/log`
+        `mkdir -p /var/log/harbr/#{name}`
+
+        write_to_file "/etc/sv/harbr/#{name}/run", Runit::Run.new(name, port).to_s
+        write_to_file "/etc/sv/harbr/#{name}/finish", Runit::Finish.new(port).to_s
+        write_to_file "/etc/sv/harbr/#{name}/log/run", Runit::Log.new(name).to_s
+
+        `chmod +x /etc/sv/harbr/#{name}/run`
+        `chmod +x /etc/sv/harbr/#{name}/log/run`
+        `chmod +x /etc/sv/harbr/#{name}/finish`
+
+        system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/current"
+        system "ln -sf /etc/sv/harbr/#{name} /etc/service/#{name}"
+
+        containers = collate_containers(name, manifest.host, port)
+        create_traefik_config(containers)
+        puts "process #{version} of #{name}"
+      end
+
+    end
+
+  end
+
+end

data/exe/harbr

@@ -193,8 +193,6 @@ desc "peek CONTAINER", "Peek in a given container"
       /(?<next>. * -> (?<path>.*))/.match(`ls -l /var/harbr/containers/#{name}/next`)
       `rm -r current`
       `ln -sf #{$2} current`
-      `rsync -av /var/dddr/#{name}/live  /var/dddr/#{name}/next`
-      puts "sync live data to next"
       `sv restart #{name}`
     end 
   end

data/lib/harbr/job.rb

@@ -31,12 +31,14 @@ module Harbr
         container.ip = "127.0.0.1"
         name = container.name.gsub(".", "-")
 
-        # Create the router with TLS enabled
-        config["http"]["routers"]["#{name}-router"] = {
+        # Create the router with TLS enabled and specific format
+        router_key = "#{name}-router-secure"
+        config["http"]["routers"][router_key] = {
           "rule" => "Host(`#{container.host_header}`)",
           "service" => "#{name}-service",
+          "entryPoints" => ["https"],
           "tls" => {
-            "certResolver" => "letsencrypt"  # Specify the certificate resolver for TLS
+            "certResolver" => "myresolver"  # Use a custom certificate resolver
           }
         }
 
@@ -48,7 +50,7 @@ module Harbr
         }
       end
 
-
+      # Write the configuration to a TOML file
       File.write("/etc/traefik/harbr.toml", TomlRB.dump(config))
       puts "Traefik configuration written to /etc/traefik/harbr.toml"
     end

data/lib/harbr/next/job.rb

@@ -51,7 +51,7 @@ module Harbr
         end
 
         puts config 
-        
+
         File.write("/etc/traefik/harbr.toml", TomlRB.dump(config))
         puts "Traefik configuration written to /etc/traefik/harbr.toml"
 
@@ -206,6 +206,10 @@ module Harbr
 
           system "ln -sf /var/harbr/containers/#{name}/versions/#{version} /var/harbr/containers/#{name}/next"
           system "ln -sf /etc/sv/harbr/#{name}/next /etc/service/next.#{name}"
+
+          `rsync -av /var/dddr/#{name}/live  /var/dddr/#{name}/next`
+          puts "sync live data to next"
+
           system "sv restart next.#{name}"
         end
 

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
- VERSION = "0.1.14"
+ VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -118,6 +118,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "!"
 - ".data/development/Harbr::Port.dir"
 - ".data/development/Harbr::Port.pag"
 - ".rspec"