From 9f21a7ad796141740221585940db9f03e8523f73 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Sat, 2 Jan 2021 19:12:11 +0100
Subject: [PATCH] [nginx] Drop nginx-pubftp role
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
plays/mirror.yml | 1 -
roles/ftpsync/tasks/main.yml | 13 +++++++++++
.../templates/html/FOOTER.html.j2 | 0
.../templates/html/HEADER.html.j2 | 0
.../templates/html/style.min.css.j2 | 0
roles/nginx-pubftp/tasks/main.yml | 14 ------------
roles/nginx-pubftp/templates/nginx/ftp.j2 | 22 -------------------
.../templates/update-motd.d/05-service.j2 | 3 ---
8 files changed, 13 insertions(+), 40 deletions(-)
rename roles/{nginx-pubftp => ftpsync}/templates/html/FOOTER.html.j2 (100%)
rename roles/{nginx-pubftp => ftpsync}/templates/html/HEADER.html.j2 (100%)
rename roles/{nginx-pubftp => ftpsync}/templates/html/style.min.css.j2 (100%)
delete mode 100644 roles/nginx-pubftp/tasks/main.yml
delete mode 100644 roles/nginx-pubftp/templates/nginx/ftp.j2
delete mode 100755 roles/nginx-pubftp/templates/update-motd.d/05-service.j2
diff --git a/plays/mirror.yml b/plays/mirror.yml
index 4b5ba67a..56f83b3c 100755
--- a/plays/mirror.yml
+++ b/plays/mirror.yml
@@ -77,4 +77,3 @@
- ftpsync
- rsync-mirror
- nginx
- - nginx-pubftp
diff --git a/roles/ftpsync/tasks/main.yml b/roles/ftpsync/tasks/main.yml
index d5ff244a..2e6ca8b9 100644
--- a/roles/ftpsync/tasks/main.yml
+++ b/roles/ftpsync/tasks/main.yml
@@ -32,3 +32,16 @@
src: update-motd.d/05-service.j2
dest: /etc/update-motd.d/05-ftpsync
mode: 0755
+
+- name: Copy configuration files
+ template:
+ src: "{{ item.src }}"
+ dest: "{{ item.dest }}"
+ mode: 0644
+ loop:
+ - src: html/HEADER.html.j2
+ dest: /pubftp/.html/HEADER.html
+ - src: html/FOOTER.html.j2
+ dest: /pubftp/.html/FOOTER.html
+ - src: html/style.min.css.j2
+ dest: /pubftp/.html/style.min.css
diff --git a/roles/nginx-pubftp/templates/html/FOOTER.html.j2 b/roles/ftpsync/templates/html/FOOTER.html.j2
similarity index 100%
rename from roles/nginx-pubftp/templates/html/FOOTER.html.j2
rename to roles/ftpsync/templates/html/FOOTER.html.j2
diff --git a/roles/nginx-pubftp/templates/html/HEADER.html.j2 b/roles/ftpsync/templates/html/HEADER.html.j2
similarity index 100%
rename from roles/nginx-pubftp/templates/html/HEADER.html.j2
rename to roles/ftpsync/templates/html/HEADER.html.j2
diff --git a/roles/nginx-pubftp/templates/html/style.min.css.j2 b/roles/ftpsync/templates/html/style.min.css.j2
similarity index 100%
rename from roles/nginx-pubftp/templates/html/style.min.css.j2
rename to roles/ftpsync/templates/html/style.min.css.j2
diff --git a/roles/nginx-pubftp/tasks/main.yml b/roles/nginx-pubftp/tasks/main.yml
deleted file mode 100644
index d4e0a1f9..00000000
--- a/roles/nginx-pubftp/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Copy configuration files
- template:
- src: "{{ item.src }}"
- dest: "{{ item.dest }}"
- loop:
- - src: nginx/ftp.j2
- dest: /etc/nginx/sites-available/ftp
- - src: html/HEADER.html.j2
- dest: /pubftp/.html/HEADER.html
- - src: html/FOOTER.html.j2
- dest: /pubftp/.html/FOOTER.html
- - src: html/style.min.css.j2
- dest: /pubftp/.html/style.min.css
diff --git a/roles/nginx-pubftp/templates/nginx/ftp.j2 b/roles/nginx-pubftp/templates/nginx/ftp.j2
deleted file mode 100644
index 7ebf0cf2..00000000
--- a/roles/nginx-pubftp/templates/nginx/ftp.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ ansible_header | comment }}
-server {
- listen 80;
- listen [::]:80;
- server_name ftp ftp.* mirror mirror.* archive.ubuntu.com fr.archive.ubuntu.com security.ubuntu.com ftps ftps.*;
-
- root /pubftp;
- index index.html;
-
- location / {
- autoindex on;
- autoindex_exact_size off;
- add_before_body /.html/HEADER.html;
- add_after_body /.html/FOOTER.html;
- }
-
- location /pub/events/ {
- mp4;
- mp4_buffer_size 1m;
- mp4_max_buffer_size 5m;
- }
-}
diff --git a/roles/nginx-pubftp/templates/update-motd.d/05-service.j2 b/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
deleted file mode 100755
index 82373d0b..00000000
--- a/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/tail +14
-{{ ansible_header | comment }}
-[0m> [38;5;82mNGINX[0m a été déployé sur cette machine. Voir [38;5;6m/etc/nginx/[0m.
--
GitLab