From 9fcf9fb8aededd8bf7d1d5fbcc788e8c0ed7effe Mon Sep 17 00:00:00 2001
From: peter_rabbit <pierrejarriges@gmail.com>
Date: Sun, 24 Jan 2021 16:57:55 +0100
Subject: [PATCH] wip:https
---
Makefile | 18 +++++++-----------
build.js | 9 +--------
docker-compose.yml | 16 ++++++++++------
nginx.conf | 12 +++++++++++-
public/letsencrypt | 1 -
public/main.js | 1 -
src/homepage.js | 1 -
7 files changed, 29 insertions(+), 29 deletions(-)
delete mode 160000 public/letsencrypt
diff --git a/Makefile b/Makefile
index 4da02af..709ebc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,14 @@
-build:
- docker build -t kuadradoimg .
-
run:
- docker run -p 80:80 \
- -it \
- --name kuadrado \
- --mount type=bind,source="$(shell pwd)/public",target=/usr/share/nginx/html \
- -d kuadradoimg
+ docker-compose up -d
-start:
- docker start kuadrado
+run-log:
+ docker-compose up
+
+build:
+ docker-compose up --build -d
stop:
- docker stop kuadrado
+ docker-compose down
bash:
docker exec -it kuadrado bash
diff --git a/build.js b/build.js
index 90650d3..616d21b 100644
--- a/build.js
+++ b/build.js
@@ -3,14 +3,7 @@
"use strict";
const build_conf = {
- protected_dirs: [
- "assets",
- "style",
- "news-articles",
- "game-articles",
- "software-articles",
- "letsencrypt",
- ],
+ protected_dirs: ["assets", "style", "news-articles", "game-articles", "software-articles"],
};
const fs = require("fs");
diff --git a/docker-compose.yml b/docker-compose.yml
index d1ff4d2..ed08db3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,12 @@
version: "3.9"
services:
- web:
- build: .
- ports:
- - "80:80"
- volumes:
- - ./public:/usr/share/nginx/html
+ web:
+ build: .
+ container_name: "kuadrado"
+ ports:
+ - "80:80"
+ - "443:443"
+ volumes:
+ - ./public:/usr/share/nginx/html
+ certbot:
+ image: certbot/certbot
diff --git a/nginx.conf b/nginx.conf
index d004df3..b2afb72 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -29,11 +29,21 @@ http {
include /etc/nginx/conf.d/*.conf;
server {
+ listen 80;
root /usr/share/nginx/html;
index index.html index.htm;
server_name kuadrado-software.fr www.kuadrado-software.fr;
location / {
- add_header "Access-Control-Allow-Origin" "*";
+ return 301 https://$host$request_uri;
+ }
+ }
+
+ server {
+ listen 443 ssl;
+ server_name kuadrado-software.fr www.kuadrado-software.fr;
+ index index.html index.htm;
+ location / {
+ proxy_pass http://kuadrado-software.fr; #for demo purposes
}
}
}
diff --git a/public/letsencrypt b/public/letsencrypt
deleted file mode 160000
index adb7e5e..0000000
--- a/public/letsencrypt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit adb7e5e62f4c96be678c5af3e55a82ddcc717590
diff --git a/public/main.js b/public/main.js
index 8999e72..a556592 100644
--- a/public/main.js
+++ b/public/main.js
@@ -289,7 +289,6 @@ class HomePage {
tag: "div",
class: "page-header",
contents: [
- {tag:"h1",contents:"AAA"},
{
tag: "div",
class: "big-logo page-contents-center",
diff --git a/src/homepage.js b/src/homepage.js
index 333fc88..74d591e 100644
--- a/src/homepage.js
+++ b/src/homepage.js
@@ -18,7 +18,6 @@ class HomePage {
tag: "div",
class: "page-header",
contents: [
- {tag:"h1",contents:"AAA"},
{
tag: "div",
class: "big-logo page-contents-center",
--
GitLab