From 93729483abb4d2f6d4298bdb54e22cc91b76164d Mon Sep 17 00:00:00 2001 From: simon987 Date: Sun, 21 Feb 2021 09:25:18 -0500 Subject: [PATCH] cleanup & update Dockerfile --- .dockerignore | 2 +- Dockerfile | 5 +++- gpg/gpg.txt | 50 ++++++++++++++++++++++++++++++++++++++++ jenkins/Jenkinsfile | 48 -------------------------------------- jenkins/deploy.sh | 6 ----- keybase/keybase.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ nginx.conf | 44 +++++++++++++++++++++++++++++++++++ 7 files changed, 155 insertions(+), 56 deletions(-) create mode 100644 gpg/gpg.txt delete mode 100644 jenkins/Jenkinsfile delete mode 100644 jenkins/deploy.sh create mode 100644 keybase/keybase.txt create mode 100644 nginx.conf diff --git a/.dockerignore b/.dockerignore index de748e1..e308934 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,5 @@ .DS_Store -node_modules/ +**/node_modules/ dist/ npm-debug.log* yarn-debug.log* diff --git a/Dockerfile b/Dockerfile index 3636916..f071d05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,7 @@ RUN npm run build FROM nginx:alpine -COPY --from=build /app/dist/ /usr/share/nginx/html \ No newline at end of file +COPY nginx.conf /etc/nginx/nginx.conf +COPY ./gpg /www/gpg/ +COPY ./keybase /www/keybase/ +COPY --from=build /app/dist/ /www/ \ No newline at end of file diff --git a/gpg/gpg.txt b/gpg/gpg.txt new file mode 100644 index 0000000..4129089 --- /dev/null +++ b/gpg/gpg.txt @@ -0,0 +1,50 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +XFa4WICgF+MPtp3XhhKI66wkVWuAgXuMdoRMQQ== +=OsYe +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile deleted file mode 100644 index 3161cd6..0000000 --- a/jenkins/Jenkinsfile +++ /dev/null @@ -1,48 +0,0 @@ -def remote = [:] -remote.name = 'remote' -remote.host = env.DEPLOY_HOST -remote.user = env.DEPLOY_USER -remote.identityFile = '/var/lib/jenkins/.ssh/id_rsa' -remote.knownHosts = '/var/lib/jenkins/.ssh/known_hosts' -remote.allowAnyHosts = true -remote.retryCount = 3 -remote.retryWaitSec = 3 -logLevel = 'FINER' -remote.port = 2299 - -pipeline { - agent none - environment { - HOME='.' - } - stages { - stage('Build') { - agent { - docker { - image 'node:10-alpine' - } - } - steps { - sh 'cd simon987/ && npm install' - sh 'cd simon987/ && npm audit fix' - sh 'cd simon987/ && npm run build' - sh 'mv simon987/dist webroot' - stash includes: 'webroot/', name: 'webdist' - } - } - stage('Deploy') { - agent none - steps { - node('master') { - unstash 'webdist' - sshCommand remote: remote, command: "cd simon987 && rm -rf webroot/* deploy.sh" - sshPut remote: remote, from: 'webroot/', into: 'simon987' - sshPut remote: remote, from: 'jenkins/deploy.sh', into: 'simon987/' - sshCommand remote: remote, command: 'chmod +x simon987/deploy.sh && ./simon987/deploy.sh' - } - } - } - } -} - - diff --git a/jenkins/deploy.sh b/jenkins/deploy.sh deleted file mode 100644 index e8cd151..0000000 --- a/jenkins/deploy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - - -export TTROOT="simon987" - -chmod 755 -R "${TTROOT}/webroot" diff --git a/keybase/keybase.txt b/keybase/keybase.txt new file mode 100644 index 0000000..e33bcfe --- /dev/null +++ b/keybase/keybase.txt @@ -0,0 +1,56 @@ +================================================================== +https://keybase.io/hexcube +-------------------------------------------------------------------- + +I hereby claim: + + * I am an admin of https://simon987.net + * I am hexcube (https://keybase.io/hexcube) on keybase. + * I have a public key ASD6lQ-L5IaMQazQFkmsjb79YSnnfy0-ajuCknBNcd9h2Ao + +To do so, I am signing this object: + +{ + "body": { + "key": { + "eldest_kid": "01204253a32d175aee0bf3146ce22c3fb82ce3fbad51a3730077b323b67b0d9637b30a", + "host": "keybase.io", + "kid": "0120fa950f8be4868c41acd01649ac8dbefd6129e77f2d3e6a3b8292704d71df61d80a", + "uid": "924ad3d3adea6574298bfb48661d0319", + "username": "hexcube" + }, + "merkle_root": { + "ctime": 1606929502, + "hash": "657ac1cbd3cb80b8a491f8a5917320cc45acfb3aef7160b145ccb62320a1ae546f3532e514908ac0cf9b36ffb64ee569b6e2c7f2b8f894cf90b4018d9ca50dd8", + "hash_meta": "c1ec196872910e19eacdd0a5d4d8596479940c187ac9bd5782953e6ee7ce8922", + "seqno": 18290718 + }, + "service": { + "entropy": "FUlB32rJkgQCYq7VuXGq/2g8", + "hostname": "simon987.net", + "protocol": "https:" + }, + "type": "web_service_binding", + "version": 2 + }, + "client": { + "name": "keybase.io go client", + "version": "5.5.1" + }, + "ctime": 1606929522, + "expire_in": 504576000, + "prev": "0d60eeb2ac76d442d7720dcc73caddf0457f4d74c7a4cec2d8ff78ba2981683c", + "seqno": 19, + "tag": "signature" +} + +which yields the signature: + +hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEg+pUPi+SGjEGs0BZJrI2+/WEp538tPmo7gpJwTXHfYdgKp3BheWxvYWTESpcCE8QgDWDusqx21ELXcg3Mc8rd8EV/TXTHpM7C2P94uimBaDzEIHEeaUjECFkr8z7I/kPhWwt6FxYbcpIoDW/2xVJ8rNCNAgHCo3NpZ8RAGyYWcwaoFsEbeQOQn5z7cwO+7ILQVbbBq2QW1X0VDVE/1Oj624m23U38NlbqaQlRJXh5Qw/aubnu2Yz1RX8HBahzaWdfdHlwZSCkaGFzaIKkdHlwZQildmFsdWXEILl6oyX4zu/vhDuPrPC7WbRunBNMFwxDpUyquB+Ey4Mno3RhZ80CAqd2ZXJzaW9uAQ== + +And finally, I am proving ownership of this host by posting or +appending to this document. + +View my publicly-auditable identity here: https://keybase.io/hexcube + +================================================================== \ No newline at end of file diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..892ab02 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,44 @@ +user nginx; +worker_processes auto; + +error_log /dev/stderr warn; + +events { + worker_connections 1024; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /dev/stdout main; + + sendfile on; + keepalive_timeout 5; + + server { + listen 80 default_server; + + location / { + root /www/; + } + + location /ip { + add_header Content-Type text/plain; + return 200 $http_x_forwarded_for; + } + + location /gpg { + index gpg.txt; + alias /www/gpg; + } + + location = /keybase.txt { + alias /www/keybase/keybase.txt; + } + } +} \ No newline at end of file