From 4c47e364756a1396c9ef8e8b1aa1fafc3a638085 Mon Sep 17 00:00:00 2001 From: Igor Smirnov <46046688+SmirnovsIgor@users.noreply.github.com> Date: Mon, 9 Dec 2019 21:28:42 +0300 Subject: [PATCH 1/7] Create folder --- Igor_Smirnov/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Igor_Smirnov/.gitkeep diff --git a/Igor_Smirnov/.gitkeep b/Igor_Smirnov/.gitkeep new file mode 100644 index 0000000..e69de29 From c084c2ee0467129e28c7ce136b3d268c8a7ad3dc Mon Sep 17 00:00:00 2001 From: Igor Smirnov <46046688+SmirnovsIgor@users.noreply.github.com> Date: Tue, 10 Dec 2019 00:36:09 +0300 Subject: [PATCH 2/7] Add .gitignore --- .gitignore | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1db64e9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,82 @@ +# Created by https://www.gitignore.io + +### OSX ### +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo +*.pot + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Vagrant +.vagrant + From 29bb4cb65f0d7d176e0b9822eb54d42de74f6a43 Mon Sep 17 00:00:00 2001 From: Igor Smirnov Date: Wed, 8 Jan 2020 23:24:10 +0300 Subject: [PATCH 3/7] Implement _hw#1 --- Igor_Smirnov/1/Dockerfile | 2 + Igor_Smirnov/1/deployment.yaml | 80 +++++++++++++++++++ .../1/files/nginx-blackout/blackout.html | 41 ++++++++++ 3 files changed, 123 insertions(+) create mode 100644 Igor_Smirnov/1/Dockerfile create mode 100644 Igor_Smirnov/1/deployment.yaml create mode 100644 Igor_Smirnov/1/files/nginx-blackout/blackout.html diff --git a/Igor_Smirnov/1/Dockerfile b/Igor_Smirnov/1/Dockerfile new file mode 100644 index 0000000..14d2466 --- /dev/null +++ b/Igor_Smirnov/1/Dockerfile @@ -0,0 +1,2 @@ +FROM nginx +COPY ./files /usr/share/nginx/html diff --git a/Igor_Smirnov/1/deployment.yaml b/Igor_Smirnov/1/deployment.yaml new file mode 100644 index 0000000..43c014e --- /dev/null +++ b/Igor_Smirnov/1/deployment.yaml @@ -0,0 +1,80 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: nginx-configmap +data: + nginx.conf: | + server { + listen 80; + location /nginx-blackout { + root /usr/share/nginx/html; + index blackout.html; + } + + location / { + if ($time_iso8601 ~ ^2020-01-05T00:[0-5][0-9]:[0-9][0-9]+03:00) { + return 302 /nginx-blackout; + } + root /usr/share/nginx/html; + index index.html; + } + } + +--- + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: nginx-server + template: + metadata: + labels: + app: nginx-server + spec: + containers: + - name: nginx + image: smirnovigor077/nginx-hw1 + volumeMounts: + - name: nginx-config + mountPath: /etc/nginx/conf.d/ + volumes: + - name: nginx-config + configMap: + name: nginx-configmap + +--- + +apiVersion: v1 +kind: Service +metadata: + name: nginx-service +spec: + type: NodePort + selector: + app: nginx-server + ports: + - port: 80 + nodePort: 30036 + +--- + +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: nginx-ingress + annotations: + kubernetes.io/ingress.class: "nginx" +spec: + rules: + - host: localhst + http: + paths: + - path: / + backend: + serviceName: nginx-service + servicePort: 80 diff --git a/Igor_Smirnov/1/files/nginx-blackout/blackout.html b/Igor_Smirnov/1/files/nginx-blackout/blackout.html new file mode 100644 index 0000000..3f3b8c2 --- /dev/null +++ b/Igor_Smirnov/1/files/nginx-blackout/blackout.html @@ -0,0 +1,41 @@ + + + Добро пожаловать в Интернет без Nginx + + + + + + +
+
+
+

Добро пожаловать в Интернет без Nginx

+
IGOR_SYSOEV_ILLEGAL_SEARCH_AND_SEIZURE
+
Разработчик Nginx Игорь Сысоев был задержан по уголовному делу, сфабрикованному на основе безосновательной претензии Рамблера, пытающегося осуществить рейдерский захват Nginx. Без Nginx большинство сайтов в Интернете не смогут существовать, в том числе и этот.

+ +
+
+ + + + From 93054555b36fd2bb9bf9e11cb604016a8586cb75 Mon Sep 17 00:00:00 2001 From: Igor Smirnov Date: Wed, 8 Jan 2020 23:29:27 +0300 Subject: [PATCH 4/7] Delete .gitkeep --- Igor_Smirnov/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Igor_Smirnov/.gitkeep diff --git a/Igor_Smirnov/.gitkeep b/Igor_Smirnov/.gitkeep deleted file mode 100644 index e69de29..0000000 From 1108914823d7349c8f12042da43c6fd4f8743c7e Mon Sep 17 00:00:00 2001 From: Igor Smirnov Date: Thu, 9 Jan 2020 00:42:58 +0300 Subject: [PATCH 5/7] Delete .gitignore --- .gitignore | 82 ------------------------------------------------------ 1 file changed, 82 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1db64e9..0000000 --- a/.gitignore +++ /dev/null @@ -1,82 +0,0 @@ -# Created by https://www.gitignore.io - -### OSX ### -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - - -### Python ### -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.cache -nosetests.xml -coverage.xml - -# Translations -*.mo -*.pot - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Vagrant -.vagrant - From 652864625794d4c425aa57f6e83a596b7ae701c2 Mon Sep 17 00:00:00 2001 From: Igor Smirnov Date: Thu, 9 Jan 2020 13:58:59 +0300 Subject: [PATCH 6/7] Delete NodePort --- Igor_Smirnov/1/deployment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Igor_Smirnov/1/deployment.yaml b/Igor_Smirnov/1/deployment.yaml index 43c014e..8d1e2bd 100644 --- a/Igor_Smirnov/1/deployment.yaml +++ b/Igor_Smirnov/1/deployment.yaml @@ -54,12 +54,11 @@ kind: Service metadata: name: nginx-service spec: - type: NodePort selector: app: nginx-server ports: - port: 80 - nodePort: 30036 + targetPort: 80 --- From 49078ac0821c56685c112337ed20d9b3ec70f152 Mon Sep 17 00:00:00 2001 From: Igor Smirnov Date: Thu, 9 Jan 2020 15:19:32 +0300 Subject: [PATCH 7/7] Change regexp --- Igor_Smirnov/1/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Igor_Smirnov/1/deployment.yaml b/Igor_Smirnov/1/deployment.yaml index 8d1e2bd..cb43681 100644 --- a/Igor_Smirnov/1/deployment.yaml +++ b/Igor_Smirnov/1/deployment.yaml @@ -12,7 +12,7 @@ data: } location / { - if ($time_iso8601 ~ ^2020-01-05T00:[0-5][0-9]:[0-9][0-9]+03:00) { + if ($time_iso8601 ~ ^2020-01-05T00:[0-5][0-9]:[0-9][0-9]) { return 302 /nginx-blackout; } root /usr/share/nginx/html;