11 Commits
tls ... main

Author SHA1 Message Date
Михаил Капелько
5258bb012e Revert "highlight client scripgts"
This reverts commit 8a64ccaa3f.
2025-12-06 06:55:24 +03:00
Михаил Капелько
ec554a2aa9 Revert "rename better"
This reverts commit e2a09dcaaf.
2025-12-06 06:55:02 +03:00
Михаил Капелько
e86a5b0989 Revert "add some steps"
This reverts commit d9d691db1d.
2025-12-06 06:54:40 +03:00
Михаил Капелько
3b173d32fb Revert "rename cfg"
This reverts commit bc380a60a4.
2025-12-06 06:54:17 +03:00
Михаил Капелько
bc380a60a4 rename cfg 2025-12-06 06:51:13 +03:00
Михаил Капелько
d9d691db1d add some steps 2025-12-05 22:58:48 +03:00
Михаил Капелько
e2a09dcaaf rename better 2025-12-05 22:39:48 +03:00
Михаил Капелько
8a64ccaa3f highlight client scripgts 2025-12-05 22:38:33 +03:00
9b2731ea9c Ввести регулярную публикацию отладочной версии (#6) 2025-11-12 04:39:19 +01:00
8e8442a2e7 Заменить src IP (#5) 2025-11-08 19:35:06 +01:00
27d3d1a7e7 Configure TLS with Lets Encrypt (#4) 2025-10-09 22:19:16 +02:00
8 changed files with 90 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
#!/bin/bash
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

3
cert.renew Executable file
View 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
View File

@@ -0,0 +1,3 @@
#!/bin/bash
# https://habr.com/ru/articles/735712/
brew install certbot

View File

@@ -1,11 +1,17 @@
# Redirect HTTP to HTTPS
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 80;
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.
# See: https://bugs.debian.org/773332
@@ -20,7 +26,6 @@ server {
root /var/www/html;
# Add index.php to the list if you are using PHP
index index.html;
server_name _;
@@ -30,6 +35,7 @@ server {
# as directory, then fall back to displaying a 404.
try_files $uri $uri/ =404;
add_header "Access-Control-Allow-Origin" "*";
add_header "Cache-Control" "max-age=43200";
# Remove CORS.
if ($request_method = "OPTIONS") {
add_header "Access-Control-Allow-Origin" "*";

50
publish.dbg Executable file
View 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
View 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
View 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

View File

@@ -2,3 +2,4 @@ acl tul src 83.221.16.86
http_access allow tul
http_access deny all
http_port 3128