harbr 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e26de07f3df5247209a87712d8d58a8672ae4e176d8362bda79fa1dcbe6ea0a1
-  data.tar.gz: f82eb0f740990b33ba3c7d86ef315d807b06d99fa19cb1b1e53484733749e490
+  metadata.gz: 0ed38a4498af70d36cfd5442fc1fb1d77ae2de56466a0d2998a031090986c39d
+  data.tar.gz: 5cc03945ce54b81bf6f9dff07182906892e34b6338a1aa107452e766cb4357ee
 SHA512:
-  metadata.gz: c37c0e01f7dbdbf121f0a0e2ac56ce5fc250e7e2771671026961c4808749dc69adea3d79624424ae897023df89990d4d1edd844e9956f2a4832ff5bedce82a27
-  data.tar.gz: fb0301af387b4f7bb3fbe128156a9a53e5966c881d7781b59b96cc0db13b9a4069239dfdf1beb91f781ef30b79f2c83aa1f5a97838a05d39b173d99ce1150a73
+  metadata.gz: 7aa54b35eeaaa6e3740a3d5eab5da75dca9ec8da8948041f85cb0048799777fa3beb157b63942f53b4dd19583c59dd434b396c45a72949c79b72d398940121b7
+  data.tar.gz: 1872036214b4260836cb321291a6fa8575c8267a51ce16a04a800c51ec140b5dfa12f7add532a810d5d7edae26c5deb1465cd831130a0f7fc0e919775a83d8bb

data/lib/harbr/job.rb

@@ -7,11 +7,11 @@ module Harbr
       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 = {
@@ -19,37 +19,45 @@ module Harbr
           "routers" => {
             "traefik-dashboard" => {
               "rule" => "Host(`traefik.harbr.zero2one.ee`)",
-              "service" => "api@internal"
+              "service" => "api@internal",
+              "tls" => {}  # Enable TLS for the dashboard
             }
           },
           "services" => {}
         }
       }
-    
+
       containers.each do |container|
         container.ip = "127.0.0.1"
-        name = container.name.gsub(".","-")
-    
+        name = container.name.gsub(".", "-")
+
+        # Create the router with TLS enabled
         config["http"]["routers"]["#{name}-router"] = {
           "rule" => "Host(`#{container.host_header}`)",
-          "service" => "#{name}-service"
+          "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
@@ -63,67 +71,67 @@ module Harbr
       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 
+          #!/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`
+          #!/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}
+          #!/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)
@@ -132,7 +140,7 @@ module Harbr
     end
 
     def perform(name,version)
-      
+
       Dir.chdir "/var/harbr/containers/#{name}/versions/#{version}" do
 
         `bundle config set --local path 'vendor/bundle'`
@@ -141,11 +149,11 @@ module Harbr
         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

data/lib/harbr/next/job.rb

@@ -16,45 +16,54 @@ module Harbr
       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"
+                "service" => "api@internal",
+                "tls" => {}  # Enable TLS for the dashboard
               }
             },
             "services" => {}
           }
         }
-      
+
         containers.each do |container|
           container.ip = "127.0.0.1"
-          name = container.name.gsub(".","-")
-      
+          name = container.name.gsub(".", "-")
+
+          # Create the router with TLS enabled
           config["http"]["routers"]["#{name}-router"] = {
             "rule" => "Host(`#{container.host_header}`)",
-            "service" => "#{name}-service"
+            "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
@@ -68,99 +77,99 @@ module Harbr
         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/#{@container_name}/current
-                exec ./exe/run #{@port} live
+            #!/bin/sh
+            exec 2>&1
+            cd /var/harbr/#{@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`
+            #!/bin/sh
+            sleep 3
+            `lsof -i :#{@port} | awk 'NR!=1 {print $2}' | xargs kill`
             SCRIPT
           end
         end
-      
+
         class Log
           def initialize(container, port)
             @container_name = container
           end
-      
+
           def to_s
             script_template = <<~SCRIPT
-                #!/bin/sh
-                exec svlogd -tt /var/log/harbr/#{@container_name}/next/
+            #!/bin/sh
+            exec svlogd -tt /var/log/harbr/#{@container_name}/next/
             SCRIPT
           end
-      
+
         end
-      
+
         module Next
-      
+
           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}/next
-                  exec ./exe/run #{@port} next
+              #!/bin/sh
+              exec 2>&1
+              cd /var/harbr/containers/#{@container_name}/next
+              exec ./exe/run #{@port} next
               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}/next/
+              #!/bin/sh
+              exec svlogd -tt /var/log/harbr/#{@container_name}/next/
               SCRIPT
             end
           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)
@@ -170,46 +179,46 @@ module Harbr
 
       def perform(name, version)
         `bundle config set --local path 'vendor/bundle'`
-        
+
         manifest = load_manifest(name,version)
         current_path = "/var/harbr/containers/#{name}/versions/#{version}"
-      
+
         port = `port assign next.#{manifest.port}`.strip
-    
+
         Dir.chdir current_path do
-    
+
           system "sv stop next.#{name}"
           system "bundle install" 
-    
+
           `mkdir -p /etc/sv/harbr/#{name}/next`
           `mkdir -p /etc/sv/harbr/#{name}/next/log`
           `mkdir -p /var/log/harbr/#{name}/next/log`
-    
+
           write_to_file "/etc/sv/harbr/#{name}/next/run", Runit::Next::Run.new(name,port).to_s
           write_to_file "/etc/sv/harbr/#{name}/next/finish", Runit::Finish.new(port).to_s
           write_to_file "/etc/sv/harbr/#{name}/next/log/run", Runit::Next::Log.new(name).to_s
-          
+
           `chmod +x /etc/sv/harbr/#{name}/next/run`
           `chmod +x /etc/sv/harbr/#{name}/next/log/run`
           `chmod +x /etc/sv/harbr/#{name}/next/finish`
-          
-          
+
+
           system "rm /etc/service/next.#{name}"
           system "rm /var/harbr/containers/#{name}/next"
-          
+
           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}"
           system "sv restart next.#{name}"
-          
+
           containers = collate_containers("next.#{name}","next.#{manifest.host}",port)
           create_traefik_config(containers)
         end
-      
+
         puts "process #{version} of #{name}"         
-        
+
       end
 
     end
-    
+
   end
 end

data/lib/harbr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen