Compare commits
11 Commits
tls
...
5258bb012e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5258bb012e | ||
|
|
ec554a2aa9 | ||
|
|
e86a5b0989 | ||
|
|
3b173d32fb | ||
|
|
bc380a60a4 | ||
|
|
d9d691db1d | ||
|
|
e2a09dcaaf | ||
|
|
8a64ccaa3f | ||
| 9b2731ea9c | |||
| 8e8442a2e7 | |||
| 27d3d1a7e7 |
2
cbr.get
2
cbr.get
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
URL=https://www.cbr.ru/scripts/XML_daily.asp
|
URL=https://www.cbr.ru/scripts/XML_daily.asp
|
||||||
OUT=/var/www/html/cbr.xml
|
OUT=/var/www/html/cbr/cur.xml
|
||||||
wget $URL -O $OUT
|
wget $URL -O $OUT
|
||||||
|
|||||||
3
cert.renew
Executable file
3
cert.renew
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# https://habr.com/ru/articles/735712/
|
||||||
|
certbot certonly --manual --preferred-challenges http -d "kornerr.ru"
|
||||||
3
cert.setup
Executable file
3
cert.setup
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# https://habr.com/ru/articles/735712/
|
||||||
|
brew install certbot
|
||||||
20
nginx/cfg
20
nginx/cfg
@@ -1,11 +1,17 @@
|
|||||||
|
# Redirect HTTP to HTTPS
|
||||||
server {
|
server {
|
||||||
listen 80 default_server;
|
listen 80;
|
||||||
listen [::]:80 default_server;
|
server_name kornerr.ru;
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name kornerr.ru;
|
||||||
|
|
||||||
|
ssl_certificate /etc/encrypt/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/encrypt/privkey.pem;
|
||||||
|
|
||||||
# SSL configuration
|
|
||||||
#
|
|
||||||
# listen 443 ssl default_server;
|
|
||||||
# listen [::]:443 ssl default_server;
|
|
||||||
#
|
#
|
||||||
# Note: You should disable gzip for SSL traffic.
|
# Note: You should disable gzip for SSL traffic.
|
||||||
# See: https://bugs.debian.org/773332
|
# See: https://bugs.debian.org/773332
|
||||||
@@ -20,7 +26,6 @@ server {
|
|||||||
|
|
||||||
root /var/www/html;
|
root /var/www/html;
|
||||||
|
|
||||||
# Add index.php to the list if you are using PHP
|
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
server_name _;
|
server_name _;
|
||||||
@@ -30,6 +35,7 @@ server {
|
|||||||
# as directory, then fall back to displaying a 404.
|
# as directory, then fall back to displaying a 404.
|
||||||
try_files $uri $uri/ =404;
|
try_files $uri $uri/ =404;
|
||||||
add_header "Access-Control-Allow-Origin" "*";
|
add_header "Access-Control-Allow-Origin" "*";
|
||||||
|
add_header "Cache-Control" "max-age=43200";
|
||||||
# Remove CORS.
|
# Remove CORS.
|
||||||
if ($request_method = "OPTIONS") {
|
if ($request_method = "OPTIONS") {
|
||||||
add_header "Access-Control-Allow-Origin" "*";
|
add_header "Access-Control-Allow-Origin" "*";
|
||||||
|
|||||||
50
publish.dbg
Executable file
50
publish.dbg
Executable file
@@ -0,0 +1,50 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
DST_DIR=/var/www/dbg
|
||||||
|
KMP_FILE=kornerr-ver-browser
|
||||||
|
KMP_FILE_EXT=js
|
||||||
|
MAIN_BRANCH=main
|
||||||
|
REPO_DIR=/home/kornerr/repo-ru
|
||||||
|
REPO_URL=https://github.com/kornerr/ru
|
||||||
|
|
||||||
|
# Clone if the directory does not exist
|
||||||
|
if [ ! -d "$REPO_DIR" ]; then
|
||||||
|
git clone $REPO_URL $REPO_DIR
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Get the latest changes
|
||||||
|
cd $REPO_DIR
|
||||||
|
git checkout -f $MAIN_BRANCH
|
||||||
|
git fetch --all
|
||||||
|
|
||||||
|
# Find out the latest commit in the whole repo
|
||||||
|
#git branch -av --sort=-committerdate
|
||||||
|
#git branch -av --sort=-committerdate | tr -s ' ' | head -n1
|
||||||
|
cmt=`git branch -av --sort=-committerdate | tr -s ' ' | head -n1 | cut -d' ' -f3`
|
||||||
|
echo "Latest commit: $cmt"
|
||||||
|
|
||||||
|
# Switch to the latest commit
|
||||||
|
git checkout -f $cmt
|
||||||
|
|
||||||
|
# Copy dist
|
||||||
|
mkdir -p $DST_DIR
|
||||||
|
rm -fR $DST_DIR/*
|
||||||
|
cp -R dist/* $DST_DIR
|
||||||
|
|
||||||
|
# Rename kornerr-ver-browser.js to work around caching
|
||||||
|
kmpWas=$KMP_FILE.$KMP_FILE_EXT
|
||||||
|
kmpNow=${KMP_FILE}_`uuidgen`.$KMP_FILE_EXT
|
||||||
|
mv $DST_DIR/$kmpWas $DST_DIR/$kmpNow
|
||||||
|
|
||||||
|
# Replace text in a file
|
||||||
|
function replace {
|
||||||
|
file=$1
|
||||||
|
was=$2
|
||||||
|
now=$3
|
||||||
|
cmd="sed -i 's|$was|$now|g' $file"
|
||||||
|
eval "$cmd"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Rename references
|
||||||
|
replace $DST_DIR/bank.html "$kmpWas" "$kmpNow"
|
||||||
|
replace $DST_DIR/quiz.html "$kmpWas" "$kmpNow"
|
||||||
15
publish.prod
Executable file
15
publish.prod
Executable file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
DBG_DIR=/var/www/dbg
|
||||||
|
DST_DIR=/var/www/html
|
||||||
|
|
||||||
|
# Remove current prod
|
||||||
|
rm -fR $DST_DIR
|
||||||
|
|
||||||
|
# Copy dbg to prod
|
||||||
|
rsync -aivc --delete $DBG_DIR/ $DST_DIR
|
||||||
|
|
||||||
|
# Symlink
|
||||||
|
cd $DST_DIR
|
||||||
|
ln -s ../cbr
|
||||||
|
ln -s ../dbg
|
||||||
4
publish.setup
Executable file
4
publish.setup
Executable file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
CMD="0 20 * * * kornerr /home/kornerr/vps/publish.dbg"
|
||||||
|
CRON_FILE=/etc/cron.d/dbg
|
||||||
|
echo "$CMD" > $CRON_FILE
|
||||||
Reference in New Issue
Block a user