diff --git a/Makefile b/Makefile index a454cdc..4aa5d62 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -# TODO(vm) data is supposed to be in $HOME/data/ - BUILD_PATH=__build/ DOCKER=docker diff --git a/secrets.txt b/secrets.txt deleted file mode 100644 index 4686533..0000000 --- a/secrets.txt +++ /dev/null @@ -1,2 +0,0 @@ -# TODO(any)(secret) -DisIsAPasswordForTheSA:D diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 34e8965..9b5547f 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -2,7 +2,6 @@ name: my-awesome-compose services: nginx: - # TODO(any)(latest) no latest?? build: ./requirements/nginx/ ports: - 4433:443 @@ -38,50 +37,3 @@ volumes: secrets: database-pwd: environment: "DATABASE_PWD" - -### services ### -# image: -# build: -# ports: -# depends_on: -# - ... -# ... -# | -# ...: -# condition: service_healthy -# domainname: ... -# env_file: ... -# environment: ... -# expose: -# - ... -# ... -# external-links: -# - ... -# ... -# healthcheck: # Dockerfile -# hostname: ... -# labels: -# - ... -# ... -# label_file: ... -# restart: on-failure:3 / always -# secrets: -# - ... -# ... -# volumes: {out}:{in}:{rw|ro} -# networks: ??? - -### networks (list of networks) ### -# (services are connected to the network "default" by default) -# (see https://docs.docker.com/compose/how-tos/networking/) - -### volumes (list of volumes) ### -# (there's nothing useful???) - -### configs ### -# ??? - -### secrets ### -# ??? see configs before - -### diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 0e42e8a..475c0d9 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -18,6 +18,5 @@ EXPOSE 3306 # start CMD ["/run.sh"] -#CMD ["ls", "-AlF", "/"] HEALTHCHECK --interval=1s --timeout=10s --start-period=600s --retries=1 CMD [ "sh", "-c", "! [ -z \"$(netstat -tuln | grep :3306)\" ]" ] diff --git a/srcs/requirements/nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile index ca58b5f..68ae58d 100644 --- a/srcs/requirements/nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -9,8 +9,6 @@ RUN apk add curl RUN apk fix # install nginx -# TODO(any) installed automatically? -#RUN apk add openssl curl ca-certificates RUN printf "%s%s%s%s\n" \ "@nginx " \ "http://nginx.org/packages/alpine/v" \ diff --git a/srcs/requirements/nginx/conf/nginx.conf b/srcs/requirements/nginx/conf/nginx.conf index b93b327..534f3d1 100644 --- a/srcs/requirements/nginx/conf/nginx.conf +++ b/srcs/requirements/nginx/conf/nginx.conf @@ -31,7 +31,6 @@ http { ssl_certificate_key /cert/cert.key; ssl_protocols TLSv1.3; error_page 497 =301 /497.php; - # TODO ssl_ciphers(any) access_log /var/log/nginx/mcolonna.42.fr.access.log main; @@ -45,7 +44,6 @@ http { } } - # TODO(more) error_page 404 /404.html; - # TODO(more) error_page 500 502 503 504 /50x.html; + error_page 404 /404.php; } } diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile index a16d922..bb99608 100644 --- a/srcs/requirements/wordpress/Dockerfile +++ b/srcs/requirements/wordpress/Dockerfile @@ -12,11 +12,6 @@ RUN apk fix RUN addgroup -S www RUN adduser -D -S -G www www -#RUN apk add curl -# install wordpress -# RUN mkdir -p /www -# RUN curl https://wordpress.org/latest.tar.gz | tar zx -C /www - # add config COPY /conf/ /etc/php83/ COPY /conf/wwwmore/ /conf/wwwmore/ diff --git a/srcs/requirements/wordpress/conf/wwwmore/404.php b/srcs/requirements/wordpress/conf/wwwmore/404.php new file mode 100644 index 0000000..145a146 --- /dev/null +++ b/srcs/requirements/wordpress/conf/wwwmore/404.php @@ -0,0 +1,143 @@ + + + + + + yippee + + + +
4 0 4
+
4 0 4
+
4 0 4
+ + diff --git a/srcs/requirements/wordpress/conf/wwwmore/VarelaRound.ttf b/srcs/requirements/wordpress/conf/wwwmore/VarelaRound.ttf new file mode 100644 index 0000000..9d01812 Binary files /dev/null and b/srcs/requirements/wordpress/conf/wwwmore/VarelaRound.ttf differ diff --git a/srcs/requirements/wordpress/conf/wwwmore/wp-config.php b/srcs/requirements/wordpress/conf/wwwmore/wp-config.php index 157cff5..57431bf 100644 --- a/srcs/requirements/wordpress/conf/wwwmore/wp-config.php +++ b/srcs/requirements/wordpress/conf/wwwmore/wp-config.php @@ -85,7 +85,7 @@ $table_prefix = 'wp_'; * * @link https://developer.wordpress.org/advanced-administration/debug/debug-wordpress/ */ -define( 'WP_DEBUG', true ); # TODO(debug) +define( 'WP_DEBUG', false ); /* Add any custom values between this line and the "stop editing" line. */