entitlement-provider 2.9.85 → 2.9.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "entitlement-provider",
-  "version": "2.9.85",
+  "version": "2.9.89",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,8 @@
   "scripts": {
     "test": "npm run test:ava",
     "test:ava": "ava --timeout 2m tests/*.mjs",
-    "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 2m && c8 report -r lcov -o build/coverage --temp-directory build/tmp"
+    "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 2m && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
+    "pkg": "npm-pkgbuild --verbose -D version=0.0.0 --publish dist"
   },
   "dependencies": {
     "@kronos-integration/interceptor-decode-json": "^2.1.56",
@@ -32,8 +33,8 @@
     "@kronos-integration/service-authenticator": "^1.6.8",
     "@kronos-integration/service-health": "^5.0.134",
     "@kronos-integration/service-http": "^10.6.91",
-    "@kronos-integration/service-ldap": "^4.0.70",
-    "@kronos-integration/service-smtp": "^1.0.58",
+    "@kronos-integration/service-ldap": "^4.0.71",
+    "@kronos-integration/service-smtp": "^1.0.60",
     "model-attributes": "^4.1.13"
   },
   "devDependencies": {
@@ -43,7 +44,7 @@
     "ava": "^4.0.1",
     "c8": "^7.1.0",
     "got": "12.0.1",
-    "npm-pkgbuild": "^6.12.96",
+    "npm-pkgbuild": "^7.23.8",
     "semantic-release": "^19.0.2"
   },
   "optionalDependencies": {
@@ -72,40 +73,37 @@
     "base": "/services/entitlements/api",
     "socket": "/run/${name}/http/socket"
   },
-  "systemd": {
-    "units": {
-      "${name}": "systemd/${name}*"
-    }
-  },
-  "pacman": {
-    "arch": [
-      "aarch64",
-      "armv7h",
-      "x86_64"
-    ],
+  "pkg": {
     "backup": "etc/${name}/config.json",
     "content": {
-      "/usr/lib/tmpfiles.d/${name}.conf": "pacman/tmpfiles.conf",
+      "/usr/lib/systemd/system/": {
+        "base": "systemd"
+      },
+      "/usr/lib/tmpfiles.d/${name}.conf": "pkg/tmpfiles.conf",
       "/etc/${name}/config.json": "config/config.json",
-      "/etc/nginx/sites/common/${name}.conf": "pacman/nginx.conf",
+      "/etc/nginx/sites/common/${name}.conf": "pkg/nginx.conf",
       "/srv/http/.well-known/openid-configuration": "config/openid-configuration",
-      "/usr/lib/sysusers.d/${name}.conf": "pacman/sysusers.conf"
+      "/usr/lib/sysusers.d/${name}.conf": "pkg/sysusers.conf",
+      "${installdir}/": [
+        {
+          "type": "npm-pack"
+        },
+        {
+          "type": "node-modules"
+        }
+      ]
+    },
+    "output": {
+      "arch": {}
     },
     "depends": {
       "systemd": ">=250.3",
       "nginx-mainline": ">=1.21.4"
     },
     "groups": "user admin",
-    "hooks": "pacman/hooks.sh",
+    "hooks": "pkg/hooks.sh",
     "installdir": "/services/${name}",
-    "group": "services",
-    "content-provider": {
-      "systemd": {
-        "units": {
-          "${name}": "systemd/${name}*"
-        }
-      }
-    }
+    "group": "services"
   },
   "release": {
     "plugins": [
@@ -115,8 +113,7 @@
       [
         "@semantic-release/exec",
         {
-          "verifyConditionsCmd": "which makepkg",
-          "publishCmd": "npx npm-pkgbuild --pkgver ${nextRelease.version} --npm-dist --npm-modules pkgbuild pacman makepkg"
+          "publishCmd": "npx npm-pkgbuild"
         }
       ],
       "@semantic-release/npm"
@@ -125,7 +122,7 @@
   "template": {
     "inheritFrom": [
       "arlac77/template-arlac77-github",
-      "arlac77/template-kronos-app"
+      "arlac77/template-kronos-app#next"
     ]
   }
 }

package/pacman/hooks.sh

@@ -1,27 +0,0 @@
-
-post_install() {
-	systemctl daemon-reload
-	systemctl enable {{name}}
-	systemctl enable {{name}}.socket
-	systemctl start {{name}}.socket
-}
-
-pre_upgrade() {
-	systemctl stop {{name}}
-}
-
-post_upgrade() {
-	systemctl daemon-reload
-	systemctl restart {{name}}.socket
-}
-
-pre_remove() {
-	systemctl stop {{name}}.socket
-	systemctl disable {{name}}.socket
-	systemctl stop {{name}}
-	systemctl disable {{name}}
-}
-
-post_remove() {
-	systemctl daemon-reload
-}

package/pacman/nginx.conf

@@ -1,10 +0,0 @@
-location {{base}} {
-    rewrite {{base}}/(.*) /$1 break;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-NginX-Proxy true;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_pass http://unix:{{socket}};
-}

package/pacman/sysusers.conf

@@ -1,2 +0,0 @@
-u {{name}} - "{{description}}" /var/lib/{{name}} /usr/bin/nologin
-

package/pacman/tmpfiles.conf

@@ -1,3 +0,0 @@
-D /run/{{name}} 0755 {{name}} {{name}} -
-D /run/{{name}}/http 2775 {{name}} http -
-d /var/lib/{{name}} 0755 {{name}} {{name}} -

package/systemd/entitlement-provider.service

@@ -1,54 +0,0 @@
-[Unit]
-Description={{description}}
-Wants=network-online.target
-After=network-online.target
-StopWhenUnneeded=true
-
-[Service]
-Type=notify
-ExecStart=/usr/bin/node --unhandled-rejections=strict --trace-uncaught --trace-warnings --title {{name}} {{installdir}}/src/{{name}}-cli.mjs
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=sleep 20
-RestartSec=40
-TimeoutStartSec=25
-TimeoutStopSec=30
-Restart=on-failure
-NotifyAccess=all
-FileDescriptorStoreMax=5
-OOMPolicy=stop
-User={{name}}
-Group={{name}}
-SupplementaryGroups=http
-CapabilityBoundingSet=~CAP_SYS_BOOT
-NoNewPrivileges=true
-UMask=0077
-ProtectSystem=full
-ProtectHome=true
-RuntimeDirectory={{name}}/http
-StateDirectory={{name}}
-CacheDirectory={{name}}
-ConfigurationDirectory={{name}}
-RuntimeDirectoryMode=755
-RuntimeDirectoryPreserve=yes
-PrivateTmp=true
-PrivateDevices=true
-PrivateUsers=true
-ProtectHostname=true
-ProtectClock=true
-ProtectKernelTunables=true
-ProtectKernelModules=true
-ProtectKernelLogs=true
-ProtectControlGroups=true
-LockPersonality=true
-RestrictRealtime=true
-RestrictSUIDSGID=true
-CPUWeight=10
-IOWeight=10
-MemoryAccounting=true
-MemoryHigh=30M
-MemoryMax=60M
-ProtectProc=noaccess
-SystemCallErrorNumber=EPERM
-
-[Install]
-WantedBy=multi-user.target

package/systemd/entitlement-provider.socket

@@ -1,9 +0,0 @@
-[Socket]
-ListenStream={{socket}}
-SocketUser=http
-SocketGroup=http
-MaxConnections=4
-FileDescriptorName=http.listen.socket
-
-[Install]
-RequiredBy={{name}}.service