@bprotsyk/aso-core 2.0.20 → 2.0.22

package/lib/templates/templates/nginx-template.conf

@@ -0,0 +1,35 @@
+server {
+    server_name {{domain}};
+    listen 80;
+
+    return 301 https://{{domain}}$request_uri;
+}
+
+server {
+    listen 443 ssl;
+
+    ssl_certificate "/etc/letsencrypt/live/{{domain}}/fullchain.pem";
+    ssl_certificate_key "/etc/letsencrypt/live/{{domain}}/privkey.pem";
+    ssl_ciphers EECDH:+AES256:-3DES:RSA+AES:!NULL:!RC4;
+    ssl_prefer_server_ciphers on;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+    ssl_stapling on;
+
+    error_log /var/log/nginx/{{domain}}.error.log error;
+
+    root {{rootPath}}{{domain}};
+    error_page 404 /policy/index.html;
+
+    server_name www.{{domain}} {{domain}};
+
+    location / {
+        root {{rootPath}}{{domain}};
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'Origin, Authorization, Accept, Content-Type, X-Requested-With';
+        if ($request_method = 'OPTIONS') {
+            return 204;
+        }
+    }
+}

package/lib/utils/server-util.js

@@ -9,7 +9,6 @@ const child_process_1 = __importDefault(require("child_process"));
 const ssh2_sftp_client_1 = __importDefault(require("ssh2-sftp-client"));
 const fs_1 = __importDefault(require("fs"));
 const mustache_1 = __importDefault(require("mustache"));
-const path_1 = __importDefault(require("path"));
 const { promisify } = require("util");
 const execPromise = promisify(child_process_1.default.exec);
 exports.IP = "185.123.53.227";
@@ -181,8 +180,7 @@ class ServerUtil {
         }
     }
     async generateNginxConfig(domain, rootPath) {
-        const templatePath = path_1.default.join(__dirname, 'templates', 'nginx-template.conf');
-        const template = fs_1.default.readFileSync(templatePath, "utf8");
+        const template = fs_1.default.readFileSync("templates/nginx-template.conf", "utf8");
         const config = mustache_1.default.render(template, { domain, rootPath });
         return config;
     }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "prod": "tsc -p ./tsconfig.json && git add . &&  git commit -m \"Stub\" && git push origin master && npm version patch && npm publish",
+    "prod": "tsc -p ./tsconfig.json && copyfiles -u 1 src/templates/**/* lib/templates && git add . && git commit -m \"Зміни до версії\" && git push origin master && npm version patch && npm publish",
     "build": "tsc",
     "test": "echo \"Error: no test specified\" && exit 1",
     "keitaro": "tsc; node lib/utils/keitaro-utils.js",
@@ -45,6 +45,7 @@
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.3.0",
     "@types/ssh2-sftp-client": "^9.0.4",
+    "copyfiles": "^2.4.1",
     "typedoc": "^0.23.28",
     "typescript": "^4.9.5"
   }

package/src/utils/server-util.ts

@@ -3,7 +3,6 @@ import ChildProcess from "child_process";
 import Client from "ssh2-sftp-client";
 import fs from "fs";
 import mustache from "mustache";
-import path from "path";
 const { promisify } = require("util");
 const execPromise = promisify(ChildProcess.exec);
 
@@ -220,8 +219,7 @@ export  class ServerUtil {
   }
 
   async generateNginxConfig(domain: string, rootPath: string): Promise<string> {
-    const templatePath = path.join(__dirname, 'templates', 'nginx-template.conf');
-    const template = fs.readFileSync(templatePath, "utf8");
+    const template = fs.readFileSync("templates/nginx-template.conf", "utf8");
     const config = mustache.render(template, { domain, rootPath });
     return config;
   }

package/tsconfig.json

@@ -15,6 +15,6 @@
 
 
   },
-  "include": ["src"],
+  "include": ["src", "templates/**/*"],
   "exclude": ["node_modules", "**/__tests__/*"]
 }