@ossy/deployment-tools 0.0.15 → 0.0.17

package/dist/index.js

@@ -26272,8 +26272,6 @@ var __webpack_exports__ = {};
 
 ;// CONCATENATED MODULE: external "os"
 const external_os_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("os");
-// EXTERNAL MODULE: external "fs"
-var external_fs_ = __nccwpck_require__(7147);
 ;// CONCATENATED MODULE: external "child_process"
 const external_child_process_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("child_process");
 // EXTERNAL MODULE: ./node_modules/arg/index.js
@@ -28421,6 +28419,10 @@ const Handlers = {
 
 class CaddyClient {
 
+  static new(serverName) {
+    return new CaddyClient(serverName)
+  }
+
   constructor(serverName = 'ci-client') {
     this.serverName = serverName
   }
@@ -28498,8 +28500,8 @@ class CaddyClient {
 
 }
 
-const createCaddyClient = serverName => new CaddyClient(serverName)
-
+// EXTERNAL MODULE: external "fs"
+var external_fs_ = __nccwpck_require__(7147);
 // EXTERNAL MODULE: external "crypto"
 var external_crypto_ = __nccwpck_require__(6113);
 ;// CONCATENATED MODULE: ./node_modules/nanoid/url-alphabet/index.js
@@ -28569,6 +28571,10 @@ const docker_client_dirname = external_path_.dirname(docker_client_filename)
 
 class DockerClient {
 
+  static new() {
+    return new DockerClient()
+  }
+
   constructor() {
     this.networkName = 'deployment-tools'
     ;(0,external_child_process_namespaceObject.exec)(`sudo docker network create ${this.networkName}`)
@@ -28635,8 +28641,6 @@ ${this.startContainer({ image, containerPort, hostPort, registry, env })}`
 
 }
 
-const createDockerClient = () => new DockerClient()
-
 ;// CONCATENATED MODULE: ./src/container-manager-server.js
 
 
@@ -28650,8 +28654,8 @@ class ContainerManagerServer {
   }
 
   constructor() {
-    this.dockerClient = createDockerClient()
-    this.caddyClient = createCaddyClient()
+    this.dockerClient = DockerClient["new"]()
+    this.caddyClient = CaddyClient["new"]()
     this.server = express()
 
     this.server.use(express.json())
@@ -28832,6 +28836,119 @@ class ContainerManagerCommands {
 
 }
 
+;// CONCATENATED MODULE: ./src/deployment-tools.service.js
+
+
+
+
+
+const systemdServiceFile = `
+[Unit]
+Description=D
+After=network.target caddy-route53.service
+
+[Service]
+Environment=DEPLOYMENT_TOOLS_DOMAIN=${domain}
+Environment=DEPLOYMENT_TOOLS_ENVIRONMENT_NAME=${environmentName}
+Environment=DEPLOYMENT_TOOLS_CI_SUB_DOMAIN=${ciSubDomain}
+Environment=DEPLOYMENT_TOOLS_PORT=${port}
+User=caddy
+Group=caddy
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/npx @ossy/deployment-tools start-container-manager
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+`
+
+class DeploymentToolsService {
+
+  static install() {
+    ;(0,external_fs_.writeFileSync)('/etc/systemd/system/deployment-tools.service', systemdServiceFile)
+  }
+
+  static enable() {
+    (0,external_child_process_namespaceObject.exec)('systemctl enable deployment-tools.service')
+  }
+
+  static start() {
+    (0,external_child_process_namespaceObject.exec)('systemctl start deployment-tools.service')
+  }
+
+}
+
+;// CONCATENATED MODULE: ./src/caddy.service.js
+
+
+
+const caddy_service_systemdServiceFile = `
+# caddy-api.service
+#
+# For using Caddy with its API.
+#
+# This unit is "durable" in that it will automatically resume
+# the last active configuration if the service is restarted.
+#
+# See https://caddyserver.com/docs/install for instructions.
+
+[Unit]
+Description=Caddy
+Documentation=https://caddyserver.com/docs/
+After=network.target network-online.target
+Requires=network-online.target
+
+[Service]
+Type=notify
+User=caddy
+Group=caddy
+ExecStart=/usr/bin/caddy.route53 run --environ --resume
+TimeoutStopSec=5s
+LimitNOFILE=1048576
+LimitNPROC=512
+PrivateTmp=true
+ProtectSystem=full
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
+`
+
+class CaddyService {
+
+  static install() {
+    ;(0,external_fs_.writeFileSync)('/etc/systemd/system/caddy-route53.service', caddy_service_systemdServiceFile)
+
+      [
+        'apt install -y debian-keyring debian-archive-keyring apt-transport-https',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/stable/gpg.key\' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt\' | sudo tee /etc/apt/sources.list.d/caddy-stable.list',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/xcaddy/gpg.key\' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-xcaddy-archive-keyring.gpg',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/xcaddy/debian.deb.txt\' | sudo tee /etc/apt/sources.list.d/caddy-xcaddy.list',
+        'add-apt-repository ppa:longsleep/golang-backports -y',
+        'apt update',
+        'apt install caddy xcaddy golang-go -y',
+
+        // xcaddy custom build with route53 integration
+        'xcaddy build --with github.com/caddy-dns/route53',
+        // 'sudo dpkg-divert --divert /usr/bin/caddy.default --rename /usr/bin/caddy',
+        'mv ./caddy /usr/bin/caddy.route53'
+        // 'update-alternatives --install /usr/bin/caddy caddy /usr/bin/caddy.default 10',
+        // 'update-alternatives --install /usr/bin/caddy caddy /usr/bin/caddy.custom 50',
+      ].forEach(command => (0,external_child_process_namespaceObject.exec)(command))
+  }
+
+  static enable() {
+    (0,external_child_process_namespaceObject.exec)('systemctl enable caddy-route53.service')
+  }
+
+  static start() {
+    (0,external_child_process_namespaceObject.exec)('systemctl start caddy-route53.service')
+  }
+
+}
+
 ;// CONCATENATED MODULE: ./src/index.js
 
 
@@ -28855,28 +28972,16 @@ const startHandler = () => {
     return console.error('Deployment tools do not support this os')
   }
 
-  (0,external_fs_.writeFileSync)('/etc/systemd/system/deployment-tools.service', `
-[Unit]
-Description=D
-After=network.target
+  CaddyService.install()
+  DeploymentToolsService.install()
 
-[Service]
-Environment=DEPLOYMENT_TOOLS_DOMAIN=${domain}
-Environment=DEPLOYMENT_TOOLS_ENVIRONMENT_NAME=${environmentName}
-Environment=DEPLOYMENT_TOOLS_CI_SUB_DOMAIN=${ciSubDomain}
-Environment=DEPLOYMENT_TOOLS_PORT=${port}
-User=caddy
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/npx @ossy/deployment-tools start-container-manager
-Restart=on-failure
+  ;(0,external_child_process_namespaceObject.exec)('systemctl daemon-reload')
 
-[Install]
-WantedBy=multi-user.target
-`)
+  CaddyService.enable()
+  DeploymentToolsService.enable()
 
-  ;(0,external_child_process_namespaceObject.exec)('systemctl daemon-reload')
-  ;(0,external_child_process_namespaceObject.exec)('systemctl start deployment-tools.service')
+  CaddyService.start()
+  DeploymentToolsService.start()
 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Collection of scripts and tools to aid deployment of containers and static files",
   "main": "dist/index.js",
   "type": "module",

package/src/caddy-client.js

@@ -17,7 +17,11 @@ const Handlers = {
   })
 }
 
-class CaddyClient {
+export class CaddyClient {
+
+  static new(serverName) {
+    return new CaddyClient(serverName)
+  }
 
   constructor(serverName = 'ci-client') {
     this.serverName = serverName
@@ -95,5 +99,3 @@ class CaddyClient {
   }
 
 }
-
-export const createCaddyClient = serverName => new CaddyClient(serverName)

package/src/caddy.service.js

@@ -0,0 +1,68 @@
+import { exec } from 'child_process'
+import { writeFileSync } from 'fs'
+
+export const systemdServiceFile = `
+# caddy-api.service
+#
+# For using Caddy with its API.
+#
+# This unit is "durable" in that it will automatically resume
+# the last active configuration if the service is restarted.
+#
+# See https://caddyserver.com/docs/install for instructions.
+
+[Unit]
+Description=Caddy
+Documentation=https://caddyserver.com/docs/
+After=network.target network-online.target
+Requires=network-online.target
+
+[Service]
+Type=notify
+User=caddy
+Group=caddy
+ExecStart=/usr/bin/caddy.route53 run --environ --resume
+TimeoutStopSec=5s
+LimitNOFILE=1048576
+LimitNPROC=512
+PrivateTmp=true
+ProtectSystem=full
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
+`
+
+export class CaddyService {
+
+  static install() {
+    writeFileSync('/etc/systemd/system/caddy-route53.service', systemdServiceFile)
+
+      [
+        'apt install -y debian-keyring debian-archive-keyring apt-transport-https',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/stable/gpg.key\' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt\' | sudo tee /etc/apt/sources.list.d/caddy-stable.list',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/xcaddy/gpg.key\' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-xcaddy-archive-keyring.gpg',
+        'curl -1sLf \'https://dl.cloudsmith.io/public/caddy/xcaddy/debian.deb.txt\' | sudo tee /etc/apt/sources.list.d/caddy-xcaddy.list',
+        'add-apt-repository ppa:longsleep/golang-backports -y',
+        'apt update',
+        'apt install caddy xcaddy golang-go -y',
+
+        // xcaddy custom build with route53 integration
+        'xcaddy build --with github.com/caddy-dns/route53',
+        // 'sudo dpkg-divert --divert /usr/bin/caddy.default --rename /usr/bin/caddy',
+        'mv ./caddy /usr/bin/caddy.route53'
+        // 'update-alternatives --install /usr/bin/caddy caddy /usr/bin/caddy.default 10',
+        // 'update-alternatives --install /usr/bin/caddy caddy /usr/bin/caddy.custom 50',
+      ].forEach(command => exec(command))
+  }
+
+  static enable() {
+    exec('systemctl enable caddy-route53.service')
+  }
+
+  static start() {
+    exec('systemctl start caddy-route53.service')
+  }
+
+}

package/src/container-manager-server.js

@@ -1,6 +1,6 @@
 import express from 'express'
-import { createCaddyClient } from './caddy-client.js'
-import { createDockerClient } from './docker-client.js'
+import { CaddyClient } from './caddy-client.js'
+import { DockerClient } from './docker-client.js'
 import * as config from './config.js'
 
 export class ContainerManagerServer {
@@ -10,8 +10,8 @@ export class ContainerManagerServer {
   }
 
   constructor() {
-    this.dockerClient = createDockerClient()
-    this.caddyClient = createCaddyClient()
+    this.dockerClient = DockerClient.new()
+    this.caddyClient = CaddyClient.new()
     this.server = express()
 
     this.server.use(express.json())

package/src/deployment-tools.service.js

@@ -0,0 +1,41 @@
+import { exec } from 'child_process'
+import { writeFileSync } from 'fs'
+
+import * as config from './config.js'
+
+export const systemdServiceFile = `
+[Unit]
+Description=D
+After=network.target caddy-route53.service
+
+[Service]
+Environment=DEPLOYMENT_TOOLS_DOMAIN=${config.domain}
+Environment=DEPLOYMENT_TOOLS_ENVIRONMENT_NAME=${config.environmentName}
+Environment=DEPLOYMENT_TOOLS_CI_SUB_DOMAIN=${config.ciSubDomain}
+Environment=DEPLOYMENT_TOOLS_PORT=${config.port}
+User=caddy
+Group=caddy
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/npx @ossy/deployment-tools start-container-manager
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+`
+
+export class DeploymentToolsService {
+
+  static install() {
+    writeFileSync('/etc/systemd/system/deployment-tools.service', systemdServiceFile)
+  }
+
+  static enable() {
+    exec('systemctl enable deployment-tools.service')
+  }
+
+  static start() {
+    exec('systemctl start deployment-tools.service')
+  }
+
+}

package/src/docker-client.js

@@ -7,7 +7,11 @@ import { fileURLToPath } from 'url'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
-class DockerClient {
+export class DockerClient {
+
+  static new() {
+    return new DockerClient()
+  }
 
   constructor() {
     this.networkName = 'deployment-tools'
@@ -74,5 +78,3 @@ ${this.startContainer({ image, containerPort, hostPort, registry, env })}`
   }
 
 }
-
-export const createDockerClient = () => new DockerClient()

package/src/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import { platform } from 'os'
-import { writeFileSync } from 'fs'
 import { exec } from 'child_process'
 import arg from 'arg'
 import { ContainerManagerServer } from './container-manager-server.js'
 import { ContainerManagerCommands } from './container-manager-commands.js'
-import * as config from './config.js'
+import { DeploymentToolsService } from './deployment-tools.service.js'
+import { CaddyService } from './caddy.service.js'
 
 const [_, __, command, ...restArgs] = process.argv
 
@@ -21,28 +21,16 @@ const startHandler = () => {
     return console.error('Deployment tools do not support this os')
   }
 
-  writeFileSync('/etc/systemd/system/deployment-tools.service', `
-[Unit]
-Description=D
-After=network.target
-
-[Service]
-Environment=DEPLOYMENT_TOOLS_DOMAIN=${config.domain}
-Environment=DEPLOYMENT_TOOLS_ENVIRONMENT_NAME=${config.environmentName}
-Environment=DEPLOYMENT_TOOLS_CI_SUB_DOMAIN=${config.ciSubDomain}
-Environment=DEPLOYMENT_TOOLS_PORT=${config.port}
-User=caddy
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/npx @ossy/deployment-tools start-container-manager
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-`)
+  CaddyService.install()
+  DeploymentToolsService.install()
 
   exec('systemctl daemon-reload')
-  exec('systemctl start deployment-tools.service')
+
+  CaddyService.enable()
+  DeploymentToolsService.enable()
+
+  CaddyService.start()
+  DeploymentToolsService.start()
 
 }
 

package/Caddfyle

@@ -1,9 +0,0 @@
-*.qa.ossy.se {
-
-  tls {
-    dns route53 {
-      max_retries 10
-    }
-  }
-
-}

package/caddyfile.json

@@ -1,114 +0,0 @@
-{
-   "apps":{
-      "http":{
-         "servers":{
-            "srv0":{
-               "listen":[
-                  ":443"
-               ],
-               "routes":[
-                  {
-                     "match":[
-                        {
-                           "host":[
-                              "*.qa.ossy.com"
-                           ]
-                        }
-                     ],
-                     "handle":[
-                        {
-                           "handler":"subroute",
-                           "routes":[
-                              {
-                                 "group":"group2",
-                                 "handle":[
-                                    {
-                                       "handler":"subroute",
-                                       "routes":[
-                                          {
-                                             "handle":[
-                                                {
-                                                   "handler":"reverse_proxy",
-                                                   "upstreams":[
-                                                      {
-                                                         "dial":"localhost:3005"
-                                                      }
-                                                   ]
-                                                }
-                                             ]
-                                          }
-                                       ]
-                                    }
-                                 ],
-                                 "match":[
-                                    {
-                                       "host":[
-                                          "ci.qa.example.com"
-                                       ]
-                                    }
-                                 ]
-                              },
-                              {
-                                 "group":"group2",
-                                 "handle":[
-                                    {
-                                       "handler":"subroute",
-                                       "routes":[
-                                          {
-                                             "handle":[
-                                                {
-                                                   "body":"Wrong turn!",
-                                                   "handler":"static_response"
-                                                }
-                                             ]
-                                          }
-                                       ]
-                                    }
-                                 ]
-                              }
-                           ]
-                        }
-                     ],
-                     "terminal":true
-                  }
-               ]
-            }
-         }
-      },
-      "tls":{
-         "automation":{
-            "policies":[
-               {
-                  "subjects":[
-                     "*.qa.ossy.com"
-                  ],
-                  "issuers":[
-                     {
-                        "challenges":{
-                           "dns":{
-                              "provider":{
-                                 "max_retries":10,
-                                 "name":"route53"
-                              }
-                           }
-                        },
-                        "module":"acme"
-                     },
-                     {
-                        "challenges":{
-                           "dns":{
-                              "provider":{
-                                 "max_retries":10,
-                                 "name":"route53"
-                              }
-                           }
-                        },
-                        "module":"zerossl"
-                     }
-                  ]
-               }
-            ]
-         }
-      }
-   }
-}