From 334a3cef81c3e079fbf4f43d906c12037c6864a9 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Sat, 17 Oct 2020 09:52:40 +0200
Subject: Added metallb config, nginx working, ftps not so much

---
 srcs/ftps/Dockerfile         |  2 +-
 srcs/ftps/ftps.yaml          |  9 ++-------
 srcs/nginx/Dockerfile        |  1 +
 srcs/nginx/nginx.yaml        | 16 ++++++----------
 srcs/nginx/src/entrypoint.sh |  1 +
 5 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'srcs')

diff --git a/srcs/ftps/Dockerfile b/srcs/ftps/Dockerfile
index b696368..418ae89 100644
--- a/srcs/ftps/Dockerfile
+++ b/srcs/ftps/Dockerfile
@@ -15,4 +15,4 @@ RUN openssl req -x509 -nodes -days 7300 -subj "/C=FR/ST=fr/L=Belgiaque/O=19/CN=c
 EXPOSE 21
 
 # docker run -p 21:21 -p 21000:21000 -p 21001:21001 -p 21002:21002 -p 21003:21003 -p 21004:21004 -t ftps
-CMD ["pure-ftpd", "-p", "21000:21004", "-P", "192.168.99.110", "-Y", "2"]
+CMD ["pure-ftpd", "-p", "21000:21000", "-P", "192.168.99.110", "-Y", "2"]
diff --git a/srcs/ftps/ftps.yaml b/srcs/ftps/ftps.yaml
index 03a8b97..07e9add 100644
--- a/srcs/ftps/ftps.yaml
+++ b/srcs/ftps/ftps.yaml
@@ -18,11 +18,6 @@ spec:
         - image: cacharle-ftps
           imagePullPolicy: Never
           name: cacharle-ftps-container
-          ports:
-            - containerPort: 21
-              hostPort: 9021 # change me
-            - containerPort: 21000
-              hostPort: 21000
 
 ---
 
@@ -35,8 +30,8 @@ spec:
   ports:
     - name: ftps
       targetPort: 21
-      port: 9021
-    - name: passive1
+      port: 21
+    - name: ftps-data
       targetPort: 21000
       port: 21000
   selector:
diff --git a/srcs/nginx/Dockerfile b/srcs/nginx/Dockerfile
index d4b9e2c..f9267f6 100644
--- a/srcs/nginx/Dockerfile
+++ b/srcs/nginx/Dockerfile
@@ -12,6 +12,7 @@ RUN mkdir -p /run/nginx && \
     rm /etc/nginx/conf.d/default.conf && \
     mv /root/ft_services.conf /etc/nginx/conf.d/ft_services.conf
 
+EXPOSE 22
 EXPOSE 80
 EXPOSE 443
 
diff --git a/srcs/nginx/nginx.yaml b/srcs/nginx/nginx.yaml
index 3fb1492..1ec9db4 100644
--- a/srcs/nginx/nginx.yaml
+++ b/srcs/nginx/nginx.yaml
@@ -9,6 +9,9 @@ spec:
     matchLabels:
       app: nginx
   replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
   template:
     metadata:
       labels:
@@ -18,13 +21,6 @@ spec:
         - image: cacharle-nginx
           imagePullPolicy: Never
           name: cacharle-nginx-container
-          ports:
-            - containerPort: 80
-              hostPort: 9080
-            - containerPort: 443
-              hostPort: 9443
-            - containerPort: 22
-              hostPort: 9022
 
 ---
 
@@ -36,13 +32,13 @@ spec:
   type: LoadBalancer
   ports:
     - name: http
-      port: 9080
+      port: 80
       targetPort: 80
     - name: https
-      port: 9443
+      port: 443
       targetPort: 443
     - name: ssh
-      port: 9022
+      port: 22
       targetPort: 22
   selector:
     app: nginx
diff --git a/srcs/nginx/src/entrypoint.sh b/srcs/nginx/src/entrypoint.sh
index bfef63c..07719af 100755
--- a/srcs/nginx/src/entrypoint.sh
+++ b/srcs/nginx/src/entrypoint.sh
@@ -2,6 +2,7 @@
 
 echo 'root:password' | chpasswd
 echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
+# echo 'Port 30022' >> /etc/ssh/sshd_config
 
 openrc
 touch /run/openrc/softlevel
-- 
cgit