@ossy/deployment-tools 0.0.17 → 0.0.19

package/dist/index.js

@@ -28471,7 +28471,8 @@ class CaddyClient {
                         dns:{
                           provider:{
                             'max_retries': 10,
-                            name: 'route53'
+                            name: 'route53',
+                            'aws_profile': 'ci-client'
                           }
                         }
                       },
@@ -28836,119 +28837,6 @@ 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
 
 
@@ -28956,8 +28844,6 @@ class CaddyService {
 
 
 
-
-
 const [_, __, command, ...restArgs] = process.argv
 
 const startHandler = () => {
@@ -28972,21 +28858,6 @@ const startHandler = () => {
     return console.error('Deployment tools do not support this os')
   }
 
-  CaddyService.install()
-  DeploymentToolsService.install()
-
-  ;(0,external_child_process_namespaceObject.exec)('systemctl daemon-reload')
-
-  CaddyService.enable()
-  DeploymentToolsService.enable()
-
-  CaddyService.start()
-  DeploymentToolsService.start()
-
-}
-
-const startContainerManagerHandler = () => {
-  console.log('Running start-container-manager command')
   ContainerManagerServer.start()
 }
 
@@ -29035,9 +28906,7 @@ const Commands = {
   start: startHandler,
   stop: stopHandler,
   status: statusHandler,
-  deploy: deployHandler,
-  // internal commands
-  'start-container-manager': startContainerManagerHandler
+  deploy: deployHandler
 }
 
 const commandHandler = Commands[command]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "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

@@ -71,7 +71,8 @@ export class CaddyClient {
                         dns:{
                           provider:{
                             'max_retries': 10,
-                            name: 'route53'
+                            name: 'route53',
+                            'aws_profile': 'ci-client'
                           }
                         }
                       },

package/src/index.js

@@ -4,8 +4,6 @@ import { exec } from 'child_process'
 import arg from 'arg'
 import { ContainerManagerServer } from './container-manager-server.js'
 import { ContainerManagerCommands } from './container-manager-commands.js'
-import { DeploymentToolsService } from './deployment-tools.service.js'
-import { CaddyService } from './caddy.service.js'
 
 const [_, __, command, ...restArgs] = process.argv
 
@@ -21,21 +19,6 @@ const startHandler = () => {
     return console.error('Deployment tools do not support this os')
   }
 
-  CaddyService.install()
-  DeploymentToolsService.install()
-
-  exec('systemctl daemon-reload')
-
-  CaddyService.enable()
-  DeploymentToolsService.enable()
-
-  CaddyService.start()
-  DeploymentToolsService.start()
-
-}
-
-const startContainerManagerHandler = () => {
-  console.log('Running start-container-manager command')
   ContainerManagerServer.start()
 }
 
@@ -84,9 +67,7 @@ const Commands = {
   start: startHandler,
   stop: stopHandler,
   status: statusHandler,
-  deploy: deployHandler,
-  // internal commands
-  'start-container-manager': startContainerManagerHandler
+  deploy: deployHandler
 }
 
 const commandHandler = Commands[command]

package/src/caddy.service.js

@@ -1,68 +0,0 @@
-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/deployment-tools.service.js

@@ -1,41 +0,0 @@
-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')
-  }
-
-}