popov/mwitnessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert & tweak deployment settings

Browse Source
This commit is contained in:
Dobromir Popov
2024-04-06 16:34:19 +03:00
parent 1e9b7088d9
commit 0717433acb
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_deploy/deoloy.azure.demo.yml
View File

@ -9,7 +9,7 @@ services:
- APP_ENV=test - APP_ENV=test
- NODE_ENV=test - NODE_ENV=test
- TZ=Europe/Sofia - TZ=Europe/Sofia
- DATABASE_URL=mysql://jwpwsofia_demo:dwxhns9p9vp248@mariadb-demo:3306/jwpwsofia_demo - DATABASE=mysql://jwpwsofia_demo:dwxhns9p9vp248@mariadb-demo:3306/jwpwsofia_demo
- UPDATE_CODE_FROM_GIT=true # Set to true to pull latest code from Git - UPDATE_CODE_FROM_GIT=true # Set to true to pull latest code from Git
- GIT_BRANCH=main - GIT_BRANCH=main
- GIT_USERNAME=deploy - GIT_USERNAME=deploy

10
_deploy/deoloy.azure.production.yml
View File

@ -1,6 +1,6 @@
version: "3" version: "3"
services: services:
nextjs-app: # https://sofia.mwhitnessing.com/ nextjs-app: # https://sofia.mwitnessing.com/
hostname: jwpw-app # jwpw-nextjs-app-1 hostname: jwpw-app # jwpw-nextjs-app-1
image: docker.d-popov.com/jwpw:latest image: docker.d-popov.com/jwpw:latest
deploy: deploy:
@ -12,8 +12,8 @@ services:
environment: environment:
- NODE_ENV=production - NODE_ENV=production
- TZ=Europe/Sofia - TZ=Europe/Sofia
- DATABASE_URL=mysql://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia - DATABASE=mysql://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia
#- DATABASE_URL=postgres://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia #- DATABASE=postgres://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia
- UPDATE_CODE_FROM_GIT=true # Set to true to pull latest code from Git - UPDATE_CODE_FROM_GIT=true # Set to true to pull latest code from Git
- GIT_BRANCH=production - GIT_BRANCH=production
- GIT_USERNAME=deploy - GIT_USERNAME=deploy
@ -59,6 +59,10 @@ services:
apk add --no-cache mariadb-client mariadb-connector-c && \ apk add --no-cache mariadb-client mariadb-connector-c && \
echo '0 2 * * * mysqldump -h $$MYSQL_HOST -P 3306 -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE > /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql' > /etc/crontabs/root && \ echo '0 2 * * * mysqldump -h $$MYSQL_HOST -P 3306 -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE > /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql' > /etc/crontabs/root && \
crond -f -d 8" crond -f -d 8"
# wget -q https://github.com/prasmussen/gdrive/releases/download/2.1.0/gdrive-linux-x64 -O /usr/bin/gdrive && \
# chmod +x /usr/bin/gdrive && \
# gdrive about --service-account /root/.gdrive_service_account.json && \
# echo '0 * * * * /usr/bin/mysqldump -h $$MYSQL_HOST -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE | gzip > /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql.gz && gdrive upload --parent $$GOOGLE_DRIVE_FOLDER_ID --service-account /root/.gdrive_service_account.json /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql.gz' > /etc/crontabs/root && crond -f -d 8"
networks: networks:
infrastructure_default: infrastructure_default:
external: true external: true

6
src/templates/emails/coverMeAccepted.hbs
View File

@ -3,7 +3,7 @@
<section> <section>
<h2>Промяна твоята смяна на {{placeName}} {{dateStr}} </h2> <h2>Промяна твоята смяна на {{placeName}} {{dateStr}} </h2>
<p>Здравейте {{firstName}}, </p> <p>Здравейте {{firstName}}, </p>
<p>{{firstName}} {{lastName}} ще замести {{oldPubName}} на смяната ви на {{dateStr}} от {{time}}</p> <p>{{firstName}} {{lastName}} ще замести {{oldPubName}} на смяната ви в {{dateStr}} от {{time}}</p>
<p>Новаия списък с участници за тази смяна е:</p> <p>Новаия списък с участници за тази смяна е:</p>
<ul> <ul>
{{#each newPubs}} {{#each newPubs}}
@ -14,6 +14,6 @@
</div> </div>
</section> </section>
<footer class="footer"> {{!-- <footer class="footer">
Изпратено на: {{sentDate}} Изпратено на: {{sentDate}}
</footer> </footer> --}}