wow. much updates. wow.
This commit is contained in:
Adrian Amaglio
parent
66e0e9a4da
commit
815965501b
18
provisioning/roles/deploy_all/files/bin/wg-genkey.sh
Normal file
18
provisioning/roles/deploy_all/files/bin/wg-genkey.sh
Normal file
@ -0,0 +1,18 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ "$#" -ne 1 ] ; then
|
||||
echo "Usage: $0 <filename>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
keyfile="$1"
|
||||
|
||||
if [ ! -f "$keyfile" ] ; then
|
||||
touch "$keyfile"
|
||||
chmod 700 "$keyfile"
|
||||
if [ -n "$(lsof "$keyfile")" ] ; then
|
||||
echo "Error, key $keyfile is red"
|
||||
exit 1
|
||||
fi
|
||||
wg genkey > "$keyfile"
|
||||
fi
|
||||
2
services/association-chahut.fr/.env
Normal file
2
services/association-chahut.fr/.env
Normal file
@ -0,0 +1,2 @@
|
||||
GIT_SOURCE_REPO="https://git.jean-cloud.net/adrian/association-chahut.fr.git"
|
||||
|
||||
0
services/association-chahut.fr/LINKS. DO NOT EDIT
Normal file
0
services/association-chahut.fr/LINKS. DO NOT EDIT
Normal file
1
services/association-chahut.fr/deploy.sh
Symbolic link
1
services/association-chahut.fr/deploy.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../hugo/deploy.sh
|
||||
20
services/association-chahut.fr/deploy_user.sh
Executable file
20
services/association-chahut.fr/deploy_user.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
# Update git repo
|
||||
git_update.sh -d "$HTTP_DIR" -b "${GIT_SOURCE_BRANCH:-main}" "$GIT_SOURCE_REPO"
|
||||
|
||||
cd "$HTTP_DIR"
|
||||
|
||||
# Get remote content files
|
||||
rclone_ncloud_publiclink.sh
|
||||
|
||||
# Invalid cache
|
||||
#rm -rf "/tmp/hugo_cache_$USER"
|
||||
|
||||
cd theme/blist
|
||||
npm install
|
||||
cd ../..
|
||||
|
||||
# Build website
|
||||
HUGO_CACHEDIR="/tmp/hugo_cache_$USER" hugo
|
||||
1
services/association-chahut.fr/nginx_server.conf
Symbolic link
1
services/association-chahut.fr/nginx_server.conf
Symbolic link
@ -0,0 +1 @@
|
||||
../hugo/nginx_server.conf
|
||||
@ -1 +1 @@
|
||||
DATA_DIR=/data/compagnienouvelle.fr
|
||||
SFTP_USER=compagnienouvelle.frRO
|
||||
|
||||
1
services/compagnienouvelle.fr/deploy.sh
Symbolic link
1
services/compagnienouvelle.fr/deploy.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../sftp_jc/deploy.sh
|
||||
1
services/compagnienouvelle.fr/deploy_user.sh
Symbolic link
1
services/compagnienouvelle.fr/deploy_user.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../sftp_jc/deploy_user.sh
|
||||
@ -1,43 +0,0 @@
|
||||
version: '3.1'
|
||||
|
||||
services:
|
||||
|
||||
wp:
|
||||
image: wordpress:5-apache
|
||||
restart: unless-stopped
|
||||
env_file: $DATA_DIR/wordpress.env
|
||||
environment:
|
||||
TZ: Europe/Paris
|
||||
volumes:
|
||||
- $DATA_DIR/wordpress:/var/www/html
|
||||
- $DATA_DIR/static:/var/www/html/static
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: $NET.100
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.50'
|
||||
memory: 100M
|
||||
db:
|
||||
image: mariadb:10.7
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
TZ: Europe/Paris
|
||||
volumes:
|
||||
- $DATA_DIR/db:/var/lib/mysql
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: $NET.101
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '0.50'
|
||||
memory: 300M
|
||||
|
||||
networks:
|
||||
default:
|
||||
ipam:
|
||||
config:
|
||||
- subnet: $NET.0/24
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
ssl_certificate $JC_CERT/fullchain.pem;
|
||||
ssl_certificate_key $JC_CERT/privkey.pem;
|
||||
server_name wordpress.compagnienouvelle.fr www.wordpress.compagnienouvelle.fr;
|
||||
location / {
|
||||
auth_basic "Mot de passe !";
|
||||
auth_basic_user_file /data/compagnienouvelle.fr/pass.txt;
|
||||
client_max_body_size 2G;
|
||||
#proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_pass http://$NET.100;
|
||||
proxy_redirect off;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
ssl_certificate $JC_CERT/fullchain.pem;
|
||||
ssl_certificate_key $JC_CERT/privkey.pem;
|
||||
server_name compagnienouvelle.fr www.compagnienouvelle.fr;
|
||||
|
||||
location / {
|
||||
root /data/compagnienouvelle.fr/static;
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
}
|
||||
1
services/compagnienouvelle.fr/nginx_server.conf
Symbolic link
1
services/compagnienouvelle.fr/nginx_server.conf
Symbolic link
@ -0,0 +1 @@
|
||||
../sftp_jc/nginx_server.conf
|
||||
@ -1,58 +0,0 @@
|
||||
[class-ss-plugin.php:232] Received request to start generating a static archive
|
||||
[class-ss-archive-creation-job.php:61] Starting a job; no job is presently running
|
||||
[class-ss-archive-creation-job.php:62] Here's our task list: setup, fetch_urls, transfer_files_locally, wrapup
|
||||
[class-ss-archive-creation-job.php:76] Pushing first task to queue: setup
|
||||
[class-ss-archive-creation-job.php:105] Current task: setup
|
||||
[class-ss-archive-creation-job.php:120] Performing task: setup
|
||||
[class-ss-task.php:38] Status message: [setup] Mise en place
|
||||
[class-ss-setup-task.php:23] Creating archive directory: /var/www/html/wp-content/plugins/simply-static/static-files/simply-static-1-1603638186/
|
||||
[class-ss-setup-task.php:57] Adding origin URL to queue: https://wordpress.mysite.com/
|
||||
[class-ss-setup-task.php:68] Adding additional URL to queue: https://wordpress.mysite.com/wp-includes/js/wp-emoji-release.min.js
|
||||
[class-ss-setup-task.php:99] Adding files from directory: /var/www/html/wp-content/uploads/
|
||||
[class-ss-archive-creation-job.php:142] We've found our next task: fetch_urls
|
||||
[class-ss-archive-creation-job.php:105] Current task: fetch_urls
|
||||
[class-ss-archive-creation-job.php:120] Performing task: fetch_urls
|
||||
[class-ss-fetch-urls-task.php:37] Total pages: 2; Pages remaining: 2
|
||||
[class-ss-fetch-urls-task.php:40] URL: https://wordpress.mysite.com/
|
||||
[class-ss-fetch-urls-task.php:50] URL is not being excluded
|
||||
[class-ss-url-fetcher.php:85] Fetching URL and saving it to: /tmp/5f9593ab13a6a-QXn1T1.tmp
|
||||
[class-ss-url-fetcher.php:89] Filesize: 26432 bytes
|
||||
[class-ss-url-fetcher.php:104] http_status_code: 200 | content_type: text/html; charset=UTF-8
|
||||
[class-ss-url-fetcher.php:180] New filename for static page: index.html
|
||||
[class-ss-url-fetcher.php:120] Renaming temp file from /tmp/5f9593ab13a6a-QXn1T1.tmp to /var/www/html/wp-content/plugins/simply-static/static-files/simply-static-1-1603638186/index.html
|
||||
[class-ss-fetch-urls-task.php:99] Extracting URLs and replacing URLs in the static file
|
||||
[class-ss-fetch-urls-task.php:106] Adding 0 URLs to the queue
|
||||
[class-ss-fetch-urls-task.php:117] We're saving this URL; keeping the static file
|
||||
[class-ss-fetch-urls-task.php:40] URL: https://wordpress.mysite.com/wp-includes/js/wp-emoji-release.min.js
|
||||
[class-ss-fetch-urls-task.php:50] URL is not being excluded
|
||||
[class-ss-url-fetcher.php:85] Fetching URL and saving it to: /tmp/5f9593ab2d225-A0zDVK.tmp
|
||||
[class-ss-url-fetcher.php:89] Filesize: 14246 bytes
|
||||
[class-ss-url-fetcher.php:104] http_status_code: 200 | content_type: application/javascript
|
||||
[class-ss-url-fetcher.php:180] New filename for static page: wp-includes/js/wp-emoji-release.min.js
|
||||
[class-ss-url-fetcher.php:120] Renaming temp file from /tmp/5f9593ab2d225-A0zDVK.tmp to /var/www/html/wp-content/plugins/simply-static/static-files/simply-static-1-1603638186/wp-includes/js/wp-emoji-release.min.js
|
||||
[class-ss-fetch-urls-task.php:99] Extracting URLs and replacing URLs in the static file
|
||||
[class-ss-fetch-urls-task.php:106] Adding 0 URLs to the queue
|
||||
[class-ss-fetch-urls-task.php:117] We're saving this URL; keeping the static file
|
||||
[class-ss-task.php:38] Status message: [fetch_urls] 0 pages/fichiers sur 2 générés
|
||||
[class-ss-archive-creation-job.php:147] We're not done with the fetch_urls task yet
|
||||
[class-ss-archive-creation-job.php:105] Current task: fetch_urls
|
||||
[class-ss-archive-creation-job.php:120] Performing task: fetch_urls
|
||||
[class-ss-fetch-urls-task.php:37] Total pages: 2; Pages remaining: 0
|
||||
[class-ss-task.php:38] Status message: [fetch_urls] 2 pages/fichiers sur 2 générés
|
||||
[class-ss-archive-creation-job.php:142] We've found our next task: transfer_files_locally
|
||||
[class-ss-archive-creation-job.php:105] Current task: transfer_files_locally
|
||||
[class-ss-archive-creation-job.php:120] Performing task: transfer_files_locally
|
||||
[class-ss-transfer-files-locally-task.php:64] Total pages: 2; Pages remaining: 2
|
||||
[class-ss-archive-creation-job.php:147] We're not done with the transfer_files_locally task yet
|
||||
[class-ss-archive-creation-job.php:105] Current task: transfer_files_locally
|
||||
[class-ss-archive-creation-job.php:120] Performing task: transfer_files_locally
|
||||
[class-ss-transfer-files-locally-task.php:64] Total pages: 2; Pages remaining: 0
|
||||
[class-ss-task.php:38] Status message: [transfer_files_locally] 2 fichiers sur 2 copiés
|
||||
[class-ss-archive-creation-job.php:142] We've found our next task: wrapup
|
||||
[class-ss-archive-creation-job.php:105] Current task: wrapup
|
||||
[class-ss-archive-creation-job.php:120] Performing task: wrapup
|
||||
[class-ss-wrapup-task.php:13] Deleting temporary files
|
||||
[class-ss-task.php:38] Status message: [wrapup] Fin du processus
|
||||
[class-ss-archive-creation-job.php:138] This task is done and there are no more tasks, time to complete the job
|
||||
[class-ss-archive-creation-job.php:161] Completing the job
|
||||
[class-ss-archive-creation-job.php:271] Status message: [done] Effectué ! Fini en 00:00:01
|
||||
1
services/gaia.jean-cloud.net/.env
Normal file
1
services/gaia.jean-cloud.net/.env
Normal file
@ -0,0 +1 @@
|
||||
GIT_SOURCE_REPO=https://git.jean-cloud.net/adrian/gaia
|
||||
5
services/gaia.jean-cloud.net/deploy_user.sh
Executable file
5
services/gaia.jean-cloud.net/deploy_user.sh
Executable file
@ -0,0 +1,5 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
git_update.sh -d "$HTTP_DIR" -b "${GIT_SOURCE_BRANCH:-main}" "$GIT_SOURCE_REPO"
|
||||
|
||||
13
services/gaia.jean-cloud.net/nginx_server.conf
Executable file
13
services/gaia.jean-cloud.net/nginx_server.conf
Executable file
@ -0,0 +1,13 @@
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
ssl_certificate $JC_CERT/fullchain.pem;
|
||||
ssl_certificate_key $JC_CERT/privkey.pem;
|
||||
server_name $JC_SERVICE www.$JC_SERVICE;
|
||||
location / {
|
||||
add_header Content-language fr;
|
||||
root $HTTP_DIR/src;
|
||||
index index.html;
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user