From 579d880e9921a87133d11cb15285c7f39db83260 Mon Sep 17 00:00:00 2001
From: Dmitry Ilvokhin <d@ilvokhin.com>
Date: Sat, 6 Jan 2024 19:25:23 +0000
Subject: Make ip.ilvokhin.com a role

---
 roles/ip/files/ip.ilvokhin.com        | 28 ++++++++++++++++++++++++++++
 roles/ip/tasks/main.yml               | 10 ++++++++++
 roles/web/files/sites/ip.ilvokhin.com | 28 ----------------------------
 roles/web/tasks/main.yml              |  3 ---
 roles/web/tasks/sites/ip.yml          |  7 -------
 5 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 roles/ip/files/ip.ilvokhin.com
 create mode 100644 roles/ip/tasks/main.yml
 delete mode 100644 roles/web/files/sites/ip.ilvokhin.com
 delete mode 100644 roles/web/tasks/main.yml
 delete mode 100644 roles/web/tasks/sites/ip.yml

(limited to 'roles')

diff --git a/roles/ip/files/ip.ilvokhin.com b/roles/ip/files/ip.ilvokhin.com
new file mode 100644
index 0000000..0555c67
--- /dev/null
+++ b/roles/ip/files/ip.ilvokhin.com
@@ -0,0 +1,28 @@
+server {
+    server_name ip.ilvokhin.com www.ip.ilvokhin.com;
+
+    location / {
+        default_type text/plain;
+        return 200 $remote_addr\n;
+    }
+
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/ip.ilvokhin.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/ip.ilvokhin.com/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+
+# Do not redirect to https to get a plain output for `curl ip.ilvokhin.com`
+# command.
+server {
+    server_name ip.ilvokhin.com www.ip.ilvokhin.com;
+
+    location / {
+        default_type text/plain;
+        return 200 $remote_addr\n;
+    }
+
+    listen 80;
+    listen [::]:80;
+}
diff --git a/roles/ip/tasks/main.yml b/roles/ip/tasks/main.yml
new file mode 100644
index 0000000..ad584f4
--- /dev/null
+++ b/roles/ip/tasks/main.yml
@@ -0,0 +1,10 @@
+- ansible.builtin.include_role:
+  name: nginx
+
+- name: Configure nginx for ip.ilvokhin.com
+  ansible.builtin.copy:
+    src: files/ip.ilvokhin.com
+    dest: /etc/nginx/sites-available
+    owner: root
+    group: root
+    mode: u+rw,g+r,o+r
diff --git a/roles/web/files/sites/ip.ilvokhin.com b/roles/web/files/sites/ip.ilvokhin.com
deleted file mode 100644
index 0555c67..0000000
--- a/roles/web/files/sites/ip.ilvokhin.com
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
-    server_name ip.ilvokhin.com www.ip.ilvokhin.com;
-
-    location / {
-        default_type text/plain;
-        return 200 $remote_addr\n;
-    }
-
-    listen 443 ssl;
-    ssl_certificate /etc/letsencrypt/live/ip.ilvokhin.com/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/ip.ilvokhin.com/privkey.pem;
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-}
-
-# Do not redirect to https to get a plain output for `curl ip.ilvokhin.com`
-# command.
-server {
-    server_name ip.ilvokhin.com www.ip.ilvokhin.com;
-
-    location / {
-        default_type text/plain;
-        return 200 $remote_addr\n;
-    }
-
-    listen 80;
-    listen [::]:80;
-}
diff --git a/roles/web/tasks/main.yml b/roles/web/tasks/main.yml
deleted file mode 100644
index 831d6d6..0000000
--- a/roles/web/tasks/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-- ansible.builtin.import_tasks: roles/web/tasks/logrotate.yml
-- ansible.builtin.import_tasks: roles/web/tasks/nginx.yml
-- ansible.builtin.import_tasks: roles/web/tasks/certbot.yml
diff --git a/roles/web/tasks/sites/ip.yml b/roles/web/tasks/sites/ip.yml
deleted file mode 100644
index a9d2d32..0000000
--- a/roles/web/tasks/sites/ip.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: Configure nginx for ip.ilvokhin.com
-  ansible.builtin.copy:
-    src: roles/web/files/sites/ip.ilvokhin.com
-    dest: /etc/nginx/sites-available
-    owner: root
-    group: root
-    mode: u+rw,g+r,o+r
-- 
cgit v1.2.3-70-g09d2