diff --git a/nginx_config_maker/domains.mjs b/nginx_config_maker/domains.mjs index 79df6799..a8886317 100644 --- a/nginx_config_maker/domains.mjs +++ b/nginx_config_maker/domains.mjs @@ -25,7 +25,16 @@ export let baseDomain = { letsEncryptNumber: '-001', } -export const domainsConfig = [{ +export const domainsConfig = [ + { + LXCcontainerLocalIP, + LXCcontainerProtocol, + name: 'rtfm', + domain: 'www.free-software-academy.com', + framework: 'static', + // disableSSL: true, + }, + { LXCcontainerLocalIP, LXCcontainerProtocol, name: 'Blog cipherbliss', @@ -228,14 +237,6 @@ export const domainsConfig = [{ framework: 'static', }, - { - LXCcontainerLocalIP, - LXCcontainerProtocol, - name: 'rtfm', - domain: 'www.free-software-academy.com', - framework: 'static', - disableSSL: true, - }, { LXCcontainerLocalIP, LXCcontainerProtocol, diff --git a/nginx_config_maker/model.php-website.mjs b/nginx_config_maker/model.php-website.mjs index ddc1e33a..936d62ba 100644 --- a/nginx_config_maker/model.php-website.mjs +++ b/nginx_config_maker/model.php-website.mjs @@ -34,7 +34,8 @@ export function makeHostFileForPhpPages (domainConfig) { \t\t# redirect from non-www to www \t\tserver_name ${domainWithoutWWW}; \t\tlisten 80 http2; -\t\treturn 301 https://${domainConfig.domain}$request_uri; +${certbotChallengeAcmeRedirect} +\t\treturn 301 http://${domainConfig.domain}$request_uri; \t} `; @@ -45,7 +46,6 @@ export function makeHostFileForPhpPages (domainConfig) { \t\tserver_name ${domainWithoutWWW}; \t\tlisten 80 http2; -${certbotChallengeAcmeRedirect} \t\t# return 301 https://${domainWithoutWWW}$request_uri; \t} diff --git a/nginx_config_maker/output/certbot_renew.sh b/nginx_config_maker/output/certbot_renew.sh deleted file mode 100644 index 165d7eae..00000000 --- a/nginx_config_maker/output/certbot_renew.sh +++ /dev/null @@ -1,41 +0,0 @@ -!#/bin/bash - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.cipherbliss.com -d cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d portfolio.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d tykayn.fr - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.pucealoreille.fr -d pucealoreille.fr - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.unbecetdesailes.fr -d unbecetdesailes.fr - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.catherinefonder.fr -d catherinefonder.fr - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.lafromagerie-bsf.com -d lafromagerie-bsf.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.clairelemoine.art -d clairelemoine.art - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d qzine.fr - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d framadate-api.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d portfolio.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d caisse.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d meltingpot.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d bitwarden.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d c.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d bridge.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d calc.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d events.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d icinga.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d monit.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d music.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d nas.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d pass.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d demo.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d log.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d participalibre.cipherbliss.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.free-software-academy.com -d free-software-academy.com - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d sondages.qzine.fr - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.coussinet.org -d coussinet.org - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d panel.coussinet.org - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d source.coussinet.org - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d www.joinfediverse.org -d joinfediverse.org - certbot certonly -a webroot --webroot-path=/tmp/letsencrypt-auto -d cloud.tykayn.fr - -149.202.77.27 riseup -::1 localhost ip6-localhost ip6-loopback -# coussinet chatons -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -# ici c'est 149.202.77.27 diff --git a/nginx_config_maker/output/folders_create.sh b/nginx_config_maker/output/folders_create.sh deleted file mode 100644 index d98a2a15..00000000 --- a/nginx_config_maker/output/folders_create.sh +++ /dev/null @@ -1,171 +0,0 @@ -# --------- -mkdir -p /home/www/meltingpot.cipherbliss.com -touch /home/www/meltingpot.cipherbliss.com/index.html -echo "coucou meltingpot.cipherbliss.com" > /home/www/meltingpot.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/meltingpot.cipherbliss.com" -rm /etc/nginx/sites-available/meltingpot.cipherbliss.com" /etc/nginx/sites-enabled/meltingpot.cipherbliss.com" -ln -s /etc/nginx/sites-available/meltingpot.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/bitwarden.cipherbliss.com -touch /home/www/bitwarden.cipherbliss.com/index.html -echo "coucou bitwarden.cipherbliss.com" > /home/www/bitwarden.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/bitwarden.cipherbliss.com" -rm /etc/nginx/sites-available/bitwarden.cipherbliss.com" /etc/nginx/sites-enabled/bitwarden.cipherbliss.com" -ln -s /etc/nginx/sites-available/bitwarden.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/c.cipherbliss.com -touch /home/www/c.cipherbliss.com/index.html -echo "coucou c.cipherbliss.com" > /home/www/c.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/c.cipherbliss.com" -rm /etc/nginx/sites-available/c.cipherbliss.com" /etc/nginx/sites-enabled/c.cipherbliss.com" -ln -s /etc/nginx/sites-available/c.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/bridge.cipherbliss.com -touch /home/www/bridge.cipherbliss.com/index.html -echo "coucou bridge.cipherbliss.com" > /home/www/bridge.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/bridge.cipherbliss.com" -rm /etc/nginx/sites-available/bridge.cipherbliss.com" /etc/nginx/sites-enabled/bridge.cipherbliss.com" -ln -s /etc/nginx/sites-available/bridge.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/calc.cipherbliss.com -touch /home/www/calc.cipherbliss.com/index.html -echo "coucou calc.cipherbliss.com" > /home/www/calc.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/calc.cipherbliss.com" -rm /etc/nginx/sites-available/calc.cipherbliss.com" /etc/nginx/sites-enabled/calc.cipherbliss.com" -ln -s /etc/nginx/sites-available/calc.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/events.cipherbliss.com -touch /home/www/events.cipherbliss.com/index.html -echo "coucou events.cipherbliss.com" > /home/www/events.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/events.cipherbliss.com" -rm /etc/nginx/sites-available/events.cipherbliss.com" /etc/nginx/sites-enabled/events.cipherbliss.com" -ln -s /etc/nginx/sites-available/events.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/icinga.cipherbliss.com -touch /home/www/icinga.cipherbliss.com/index.html -echo "coucou icinga.cipherbliss.com" > /home/www/icinga.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/icinga.cipherbliss.com" -rm /etc/nginx/sites-available/icinga.cipherbliss.com" /etc/nginx/sites-enabled/icinga.cipherbliss.com" -ln -s /etc/nginx/sites-available/icinga.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/monit.cipherbliss.com -touch /home/www/monit.cipherbliss.com/index.html -echo "coucou monit.cipherbliss.com" > /home/www/monit.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/monit.cipherbliss.com" -rm /etc/nginx/sites-available/monit.cipherbliss.com" /etc/nginx/sites-enabled/monit.cipherbliss.com" -ln -s /etc/nginx/sites-available/monit.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/music.cipherbliss.com -touch /home/www/music.cipherbliss.com/index.html -echo "coucou music.cipherbliss.com" > /home/www/music.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/music.cipherbliss.com" -rm /etc/nginx/sites-available/music.cipherbliss.com" /etc/nginx/sites-enabled/music.cipherbliss.com" -ln -s /etc/nginx/sites-available/music.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/nas.cipherbliss.com -touch /home/www/nas.cipherbliss.com/index.html -echo "coucou nas.cipherbliss.com" > /home/www/nas.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/nas.cipherbliss.com" -rm /etc/nginx/sites-available/nas.cipherbliss.com" /etc/nginx/sites-enabled/nas.cipherbliss.com" -ln -s /etc/nginx/sites-available/nas.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/pass.cipherbliss.com -touch /home/www/pass.cipherbliss.com/index.html -echo "coucou pass.cipherbliss.com" > /home/www/pass.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/pass.cipherbliss.com" -rm /etc/nginx/sites-available/pass.cipherbliss.com" /etc/nginx/sites-enabled/pass.cipherbliss.com" -ln -s /etc/nginx/sites-available/pass.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/demo.cipherbliss.com -touch /home/www/demo.cipherbliss.com/index.html -echo "coucou demo.cipherbliss.com" > /home/www/demo.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/demo.cipherbliss.com" -rm /etc/nginx/sites-available/demo.cipherbliss.com" /etc/nginx/sites-enabled/demo.cipherbliss.com" -ln -s /etc/nginx/sites-available/demo.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/log.cipherbliss.com -touch /home/www/log.cipherbliss.com/index.html -echo "coucou log.cipherbliss.com" > /home/www/log.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/log.cipherbliss.com" -rm /etc/nginx/sites-available/log.cipherbliss.com" /etc/nginx/sites-enabled/log.cipherbliss.com" -ln -s /etc/nginx/sites-available/log.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/participalibre.cipherbliss.com -touch /home/www/participalibre.cipherbliss.com/index.html -echo "coucou participalibre.cipherbliss.com" > /home/www/participalibre.cipherbliss.com/index.html - -touch /etc/nginx/sites-available/participalibre.cipherbliss.com" -rm /etc/nginx/sites-available/participalibre.cipherbliss.com" /etc/nginx/sites-enabled/participalibre.cipherbliss.com" -ln -s /etc/nginx/sites-available/participalibre.cipherbliss.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/www.free-software-academy.com -touch /home/www/www.free-software-academy.com/index.html -echo "coucou www.free-software-academy.com" > /home/www/www.free-software-academy.com/index.html - -touch /etc/nginx/sites-available/www.free-software-academy.com" -rm /etc/nginx/sites-available/www.free-software-academy.com" /etc/nginx/sites-enabled/www.free-software-academy.com" -ln -s /etc/nginx/sites-available/www.free-software-academy.com" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/www.coussinet.org -touch /home/www/www.coussinet.org/index.html -echo "coucou www.coussinet.org" > /home/www/www.coussinet.org/index.html - -touch /etc/nginx/sites-available/www.coussinet.org" -rm /etc/nginx/sites-available/www.coussinet.org" /etc/nginx/sites-enabled/www.coussinet.org" -ln -s /etc/nginx/sites-available/www.coussinet.org" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/panel.coussinet.org -touch /home/www/panel.coussinet.org/index.html -echo "coucou panel.coussinet.org" > /home/www/panel.coussinet.org/index.html - -touch /etc/nginx/sites-available/panel.coussinet.org" -rm /etc/nginx/sites-available/panel.coussinet.org" /etc/nginx/sites-enabled/panel.coussinet.org" -ln -s /etc/nginx/sites-available/panel.coussinet.org" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/source.coussinet.org -touch /home/www/source.coussinet.org/index.html -echo "coucou source.coussinet.org" > /home/www/source.coussinet.org/index.html - -touch /etc/nginx/sites-available/source.coussinet.org" -rm /etc/nginx/sites-available/source.coussinet.org" /etc/nginx/sites-enabled/source.coussinet.org" -ln -s /etc/nginx/sites-available/source.coussinet.org" /etc/nginx/sites-enabled/ - -# --------- -mkdir -p /home/www/www.joinfediverse.org -touch /home/www/www.joinfediverse.org/index.html -echo "coucou www.joinfediverse.org" > /home/www/www.joinfediverse.org/index.html - -touch /etc/nginx/sites-available/www.joinfediverse.org" -rm /etc/nginx/sites-available/www.joinfediverse.org" /etc/nginx/sites-enabled/www.joinfediverse.org" -ln -s /etc/nginx/sites-available/www.joinfediverse.org" /etc/nginx/sites-enabled/ - diff --git a/nginx_config_maker/output/hosts b/nginx_config_maker/output/hosts deleted file mode 100644 index 3f73392d..00000000 --- a/nginx_config_maker/output/hosts +++ /dev/null @@ -1,33 +0,0 @@ - 127.0.0.1 www.cipherbliss.com - 127.0.0.1 portfolio.cipherbliss.com - 127.0.0.1 tykayn.fr - 127.0.0.1 www.pucealoreille.fr - 127.0.0.1 www.unbecetdesailes.fr - 127.0.0.1 www.catherinefonder.fr - 127.0.0.1 www.lafromagerie-bsf.com - 127.0.0.1 www.clairelemoine.art - 127.0.0.1 qzine.fr - 127.0.0.1 framadate-api.cipherbliss.com - 127.0.0.1 portfolio.cipherbliss.com - 127.0.0.1 caisse.cipherbliss.com - 127.0.0.1 meltingpot.cipherbliss.com - 127.0.0.1 bitwarden.cipherbliss.com - 127.0.0.1 c.cipherbliss.com - 127.0.0.1 bridge.cipherbliss.com - 127.0.0.1 calc.cipherbliss.com - 127.0.0.1 events.cipherbliss.com - 127.0.0.1 icinga.cipherbliss.com - 127.0.0.1 monit.cipherbliss.com - 127.0.0.1 music.cipherbliss.com - 127.0.0.1 nas.cipherbliss.com - 127.0.0.1 pass.cipherbliss.com - 127.0.0.1 demo.cipherbliss.com - 127.0.0.1 log.cipherbliss.com - 127.0.0.1 participalibre.cipherbliss.com - 127.0.0.1 www.free-software-academy.com - 127.0.0.1 sondages.qzine.fr - 127.0.0.1 www.coussinet.org - 127.0.0.1 panel.coussinet.org - 127.0.0.1 source.coussinet.org - 127.0.0.1 www.joinfediverse.org - 127.0.0.1 cloud.tykayn.fr