diff --git a/.DS_Store b/.DS_Store index d8b3465..dc7ffe3 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/deletesh.sh b/deletesh.sh deleted file mode 100755 index 302ffb0..0000000 --- a/deletesh.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -kubectl delete svc nginx-service -kubectl delete svc mariadb-service -kubectl delete svc phpmyadmin-service -kubectl delete svc ftps -kubectl delete svc wp-service -kubectl delete deployment telegraf -kubectl delete deployment nginx-deployment -kubectl delete deployment mariadb -kubectl delete deployment wp -kubectl delete deployment phpmyadmin-deployment -kubectl delete deployment ftps -kubectl delete pods --all -kubectl delete pv --all \ No newline at end of file diff --git a/run.sh b/setup.sh similarity index 86% rename from run.sh rename to setup.sh index 8ccc6c2..4913d8a 100644 --- a/run.sh +++ b/setup.sh @@ -24,4 +24,6 @@ kubectl apply -f srcs/yaml/influxdb.yaml kubectl apply -f srcs/yaml/telegraf.yaml kubectl apply -f srcs/yaml/grafana.yaml -echo "Minikube IP: ${IP}" \ No newline at end of file +echo "Minikube IP: ${IP}" + +/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --args --incognito --ignore-certificate-errors https://192.168.99.166/ \ No newline at end of file diff --git a/srcs/.DS_Store b/srcs/.DS_Store index c06c1c1..2ae8180 100644 Binary files a/srcs/.DS_Store and b/srcs/.DS_Store differ diff --git a/srcs/ftps/srcs/telegraf.conf b/srcs/ftps/srcs/telegraf.conf deleted file mode 100644 index 972a545..0000000 --- a/srcs/ftps/srcs/telegraf.conf +++ /dev/null @@ -1,53 +0,0 @@ -[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/nginx/Dockerfile b/srcs/nginx/Dockerfile index 38f4e88..f54c862 100755 --- a/srcs/nginx/Dockerfile +++ b/srcs/nginx/Dockerfile @@ -7,6 +7,7 @@ RUN apk add openrc mc nano supervisor openssh nginx openssl && rm -f /var/cache/ COPY index.html nginx.conf ./ RUN mkdir -p /run/nginx www && \ mv index.html /var/www/localhost/htdocs +COPY /images /var/www/localhost/htdocs/images COPY nginx.conf /etc/nginx/nginx.conf RUN mkdir /etc/nginx/ssl RUN openssl req -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out /etc/nginx/ssl/html.pem -keyout /etc/nginx/ssl/html.key -subj "/C=RU/ST=Kazan/L=Kazan/O=21 School/OU=mdenys/CN=html" diff --git a/srcs/nginx/images/v1_26.png b/srcs/nginx/images/v1_26.png new file mode 100755 index 0000000..af7042f Binary files /dev/null and b/srcs/nginx/images/v1_26.png differ diff --git a/srcs/nginx/images/v1_35.png b/srcs/nginx/images/v1_35.png new file mode 100755 index 0000000..3885a7a Binary files /dev/null and b/srcs/nginx/images/v1_35.png differ diff --git a/srcs/nginx/images/wp.png b/srcs/nginx/images/wp.png new file mode 100644 index 0000000..31e6c65 Binary files /dev/null and b/srcs/nginx/images/wp.png differ diff --git a/srcs/nginx/index.html b/srcs/nginx/index.html index c260585..ac1ca15 100755 --- a/srcs/nginx/index.html +++ b/srcs/nginx/index.html @@ -1,13 +1,151 @@ - + + - - - - Document - + + + + Document + -

Welcome to Mdenys ft_services

+ + + + Kubernetes + + + +
+ + + + + +
+ + + + +
+ + /phpmyadmin + + + /wordpress + +
+ + \ No newline at end of file diff --git a/srcs/nginx/nginx.conf b/srcs/nginx/nginx.conf index 21881c8..0de446a 100755 --- a/srcs/nginx/nginx.conf +++ b/srcs/nginx/nginx.conf @@ -18,19 +18,19 @@ http { ssl_certificate /etc/nginx/ssl/html.pem; ssl_certificate_key /etc/nginx/ssl/html.key; - - location /wordpress { return 307 https://$host:5050/; } - location = ^(/phpmyadmin)$ { - proxy_pass https://192.168.99.166:5000/$1; - } + location = ^(/phpmyadmin)$ { + proxy_pass https://192.168.99.166:5000/$1; + } location /phpmyadmin { - proxy_pass https://192.168.99.166:5000/; + proxy_pass https://192.168.99.166:5000/; proxy_redirect /index.php /phpmyadmin/index.php; } + + } } \ No newline at end of file