From ffa97cd1d330a4baecd76a7969dd422badea264c Mon Sep 17 00:00:00 2001 From: Matthos Denys Date: Sat, 6 Mar 2021 21:53:13 +0300 Subject: [PATCH] add mysql in ftps --- .DS_Store | Bin 6148 -> 6148 bytes deletesh.sh | 11 +++--- run.sh | 3 +- srcs/.DS_Store | Bin 6148 -> 6148 bytes srcs/ftps/Dockerfile | 23 +++++++------ srcs/ftps/srcs/start.sh | 3 ++ srcs/ftps/srcs/telegraf.conf | 53 +++++++++++++++++++++++++++++ srcs/ftps/srcs/vsftpd.conf | 16 +++++++++ srcs/ftps/start.sh | 1 - srcs/ftps/vsftpd.conf | 26 -------------- srcs/yaml/ftps.yaml | 64 ++++++++++++++++++++++------------- srcs/yaml/mariadb.yaml | 3 -- srcs/yaml/metallb.yaml | 2 +- 13 files changed, 133 insertions(+), 72 deletions(-) create mode 100644 srcs/ftps/srcs/start.sh create mode 100644 srcs/ftps/srcs/telegraf.conf create mode 100644 srcs/ftps/srcs/vsftpd.conf delete mode 100755 srcs/ftps/start.sh delete mode 100644 srcs/ftps/vsftpd.conf diff --git a/.DS_Store b/.DS_Store index 8d8b744712e85c5d076b667b4d6bb53a13302a6c..60d862874fda6efee0afcd0e291c1e567a73acaa 100644 GIT binary patch delta 155 zcmZoMXffEZmdWsBQbA5;afyM!bw(y;7FITP4h}93E?%zK;Eeq8;F83W(qgB?qG%8= zAh9GPDRJ^=CeHv44o(ivcmav(Y70wK9R+h!(^?&cYIAb~9R(9(v)Wot4slgOThD~t l%Bt#`+PawxV8F--p&9t0G>n?Hc?oke%ftrV&Fmb1`2pV#C9nVh delta 220 zcmZoMXffEZmdWi~QbA5;afyM!4Mrwr7FITP4o)s^PHsMK&e-6L{PN(E#FEltr^KRo z0h!>;l+>ieqVUX=l8lhlJlCAmveZ2PBA>*P)XDdlJnN%D8UhkaGJuLWlpT@|Fn|Cj z2WPy1WOcQnk&&^Ef{~?Vt&T#qxw(Okf{C$NZ7nAUhorh&P+VzK->lh7mM&X<_y|}V u10y4ZW)OtZFzP6f!NO3?P{feTP+S&Vl$VpAmkt!$+{f(0vYDOZFFyc!>^c4b diff --git a/deletesh.sh b/deletesh.sh index 7b91c16..3d248c1 100755 --- a/deletesh.sh +++ b/deletesh.sh @@ -1,10 +1,11 @@ #!/bin/bash kubectl delete svc nginx-service -kubectl delete svc mysql-service +kubectl delete svc mariadb-service kubectl delete svc phpmyadmin-service -kubectl delete svc ftp-service +kubectl delete svc ftps kubectl delete deployment nginx-deployment -kubectl delete deployment mysql-deployment +kubectl delete deployment mariadb kubectl delete deployment phpmyadmin-deployment -kubectl delete deployment ftp-deployment -kubectl delete pods --all \ No newline at end of file +kubectl delete deployment ftps +kubectl delete pods --all +kubectl delete pv --all \ No newline at end of file diff --git a/run.sh b/run.sh index 4f580c4..693be40 100644 --- a/run.sh +++ b/run.sh @@ -8,7 +8,7 @@ minikube dashboard & docker build -t nginx_image srcs/nginx docker build -t phpmyadmin_image srcs/phpmyadmin docker build -t mariadb-image srcs/mariadb -docker build -t ftp_image srcs/ftps +docker build -t my_ftps srcs/ftps kubectl apply -f srcs/yaml/metallb.yaml kubectl apply -f srcs/yaml/nginx_service.yaml @@ -18,5 +18,4 @@ kubectl apply -f srcs/yaml/ftps.yaml echo "Minikube IP: ${IP}" - # sh minikubenewpc.sh sh ~/Desktop/ft_services/run.sh \ No newline at end of file diff --git a/srcs/.DS_Store b/srcs/.DS_Store index 4ebb0dee7c32974025d01f359ee771ad0bcde263..9aef9388d08b40571393a0c0911883ec350872d3 100644 GIT binary patch delta 250 zcmZoMXfc@JFUrTjz`)4BAi%&7&rr;e%232m=9#lukYhQsCrFBuA&sGgp#Ug_B%Pm} zl#`zXlm+TySOUZ^|3d+G9g}@nCUBS<8tW*S85vK0!r~Z>#n`goqP(2^ymX)uK=&~4 zVOq?f$56?T$dJpBU;tz>Ft9VgRWcMYB%`TbiL83E5Bu(o4JwSA J**X650|4=SDh&Vt diff --git a/srcs/ftps/Dockerfile b/srcs/ftps/Dockerfile index 2f40bbc..64577ed 100644 --- a/srcs/ftps/Dockerfile +++ b/srcs/ftps/Dockerfile @@ -1,11 +1,14 @@ FROM alpine:3.12.3 -RUN apk update && apk add vsftpd openssl -RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -subj "/C=RU/ST=ru/L=Russia/O=21_schoo/CN=mdenys_services" -keyout /etc/ssl/private/vsftpd.key -out /etc/ssl/certs/vsftpd.crt -COPY vsftpd.conf /etc/vsftpd/ -COPY start.sh . -RUN chmod +x start.sh -RUN adduser -D user -RUN echo "user:user" | chpasswd -RUN chown user:user /home/user -EXPOSE 20 21 21000 -CMD sh start.sh \ No newline at end of file + +RUN apk update && apk add vsftpd openssl && \ + echo "root:root" | chpasswd && \ + openssl req -x509 -nodes -days 365 \ + -newkey rsa:2048 -subj "/C=RU/ST=ru/L=Russia/O=21_schoo/CN=mdenys_services" \ + -keyout /etc/ssl/private/vsftpd.key \ + -out /etc/ssl/certs/vsftpd.crt +COPY /srcs/vsftpd.conf /etc/vsftpd +COPY /srcs/start.sh / + +EXPOSE 21 30020 30021 + +ENTRYPOINT sh start.sh \ No newline at end of file diff --git a/srcs/ftps/srcs/start.sh b/srcs/ftps/srcs/start.sh new file mode 100644 index 0000000..4ab6b56 --- /dev/null +++ b/srcs/ftps/srcs/start.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +vsftpd /etc/vsftpd/vsftpd.conf \ No newline at end of file diff --git a/srcs/ftps/srcs/telegraf.conf b/srcs/ftps/srcs/telegraf.conf new file mode 100644 index 0000000..972a545 --- /dev/null +++ b/srcs/ftps/srcs/telegraf.conf @@ -0,0 +1,53 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 1000 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "0s" + precision = "" + debug = false + quiet = false + logfile = "" + hostname = "ftps" + omit_hostname = false + +############################################################################### +# OUTPUT PLUGINS # +############################################################################### + +[[outputs.influxdb]] + urls = ["http://influxdb:8086"] + database = "telegraf" + retention_policy = "" + write_consistency = "any" + timeout = "5s" + username = "admin" + password = "passwd" + +############################################################################### +# INPUT PLUGINS # +############################################################################### + +[[inputs.cpu]] + percpu = false + totalcpu = true + collect_cpu_time = true + fielddrop = ["time_guest","time_guest_nice","time_irq","time_nice","time_softirq","time_steal","usage_guest","usage_guest_nice","usage_irq","usage_nice","usage_softirq","usage_steal"] + interval = "2s" +[[inputs.disk]] + mount_points = ["/","/var","/data"] + fielddrop=["used","inodes_used"] +[[inputs.mem]] + fielddrop=["active","buffered","cached","free","inactive","used","used_percent"] +[[inputs.processes]] +[[inputs.swap]] + fielddrop=["free","total"] +[[inputs.system]] + fielddrop=["n_users","uptime_format"] +[[inputs.nstat]] + interval = "2s" + proc_net_netstat = "" # this is of interest. + fieldpass = ["IpExtOutOctets","IpExtInOctets"] diff --git a/srcs/ftps/srcs/vsftpd.conf b/srcs/ftps/srcs/vsftpd.conf new file mode 100644 index 0000000..054ed58 --- /dev/null +++ b/srcs/ftps/srcs/vsftpd.conf @@ -0,0 +1,16 @@ +anonymous_enable=YES +local_enable=YES +write_enable=YES +local_umask=022 +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +ftpd_banner=Welcome to blah FTP service. +listen=YES +seccomp_sandbox=NO +rsa_cert_file=/etc/ssl/certs/vsftpd.crt +rsa_private_key_file=/etc/ssl/private/vsftpd.key +ssl_enable=YES +pasv_address=192.168.99.150 +pasv_min_port=30020 +pasv_max_port=30021 \ No newline at end of file diff --git a/srcs/ftps/start.sh b/srcs/ftps/start.sh deleted file mode 100755 index 2ed1c3b..0000000 --- a/srcs/ftps/start.sh +++ /dev/null @@ -1 +0,0 @@ -vsftpd /etc/vsftpd/vsftpd.conf \ No newline at end of file diff --git a/srcs/ftps/vsftpd.conf b/srcs/ftps/vsftpd.conf deleted file mode 100644 index e48f051..0000000 --- a/srcs/ftps/vsftpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -listen=YES -dirmessage_enable=YES -xferlog_enable=YES -pam_service_name=vsftpd -pasv_enable=YES -pasv_min_port=21000 -pasv_max_port=21000 -port_enable=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -ssl_enable=YES -rsa_cert_file=/etc/ssl/certs/vsftpd.crt -rsa_private_key_file=/etc/ssl/private/vsftpd.key -allow_anon_ssl=NO -force_local_data_ssl=YES -force_local_logins_ssl=YES -ssl_tlsv1=YES -ssl_sslv2=NO -ssl_sslv3=NO -pasv_address=192.168.99.100 -chroot_local_user=YES -background=NO \ No newline at end of file diff --git a/srcs/yaml/ftps.yaml b/srcs/yaml/ftps.yaml index e08729b..fd0c62c 100644 --- a/srcs/yaml/ftps.yaml +++ b/srcs/yaml/ftps.yaml @@ -1,50 +1,66 @@ apiVersion: v1 kind: Service metadata: - name: ftp-service + labels: + app: ftps + name: ftps annotations: - metallb.universe.tf/allow-shared-ip: minikube + metallb.universe.tf/address-pool: minikube spec: - selector: - app: ftp ports: - - name: ftp - protocol: TCP - port: 21 - targetPort: 21 - - name: ftp-passive - protocol: TCP - port: 2100 - targetPort: 2100 - - name: ftp-port - protocol: TCP - port: 20 - targetPort: 20 + - name: data + port: 20 + targetPort: 20 + - name: ftps + port: 21 + protocol: TCP + targetPort: 21 + - name: ftps-pasv20 + port: 30020 + protocol: TCP + targetPort: 30020 + - name: ftps-pasv + port: 30021 + protocol: TCP + targetPort: 30021 + selector: + app: ftps type: LoadBalancer + externalIPs: + - "192.168.99.150" --- apiVersion: apps/v1 kind: Deployment metadata: - name: ftp-deployment + labels: + app: ftps + name: ftps spec: + replicas: 1 selector: matchLabels: - app: ftp + app: ftps template: metadata: labels: - app: ftp + app: ftps spec: containers: - - name: ftp - image: ftp_image + - image: my_ftps resources: limits: memory: "128Mi" cpu: "50m" imagePullPolicy: Never + name: ftps ports: - containerPort: 21 - - containerPort: 2100 - - containerPort: 20 - name: ftp \ No newline at end of file + - containerPort: 30020 + - containerPort: 30021 + volumeMounts: + - mountPath: "/var/lib/mysql" + name: mariadb-pv + volumes: + - name: mariadb-pv + persistentVolumeClaim: + claimName: mariadb-pvc \ No newline at end of file diff --git a/srcs/yaml/mariadb.yaml b/srcs/yaml/mariadb.yaml index 135597c..87b7d9e 100644 --- a/srcs/yaml/mariadb.yaml +++ b/srcs/yaml/mariadb.yaml @@ -23,9 +23,6 @@ spec: selector: matchLabels: app: mariadb - replicas: 1 - strategy: - type: Recreate template: metadata: labels: diff --git a/srcs/yaml/metallb.yaml b/srcs/yaml/metallb.yaml index d6156e7..4de9d67 100755 --- a/srcs/yaml/metallb.yaml +++ b/srcs/yaml/metallb.yaml @@ -9,4 +9,4 @@ data: - name: default protocol: layer2 addresses: - - 192.168.99.100-192.168.99.200 \ No newline at end of file + - 192.168.99.150-192.168.99.200 \ No newline at end of file