From 7ebd1be9fd381e704dd250aad87bfe76fad920d9 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Wed, 23 Sep 2020 18:16:03 +0200
Subject: [PATCH] Feat: remove userdir task file

---
 files/userdir.conf.j2 | 10 ----------
 localhost.yml         |  3 ++-
 tasks/lamp.yml        |  4 ++++
 tasks/userdir.yml     | 11 -----------
 4 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 files/userdir.conf.j2
 delete mode 100644 tasks/userdir.yml

diff --git a/files/userdir.conf.j2 b/files/userdir.conf.j2
deleted file mode 100644
index 170d5ee..0000000
--- a/files/userdir.conf.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-<IfModule mod_userdir.c>
-        UserDir public_html
-        UserDir disabled root
-
-        <Directory /home/*/public_html>
-                AllowOverride All
-                Options MultiViews Indexes SymLinksIfOwnerMatch
-                Require all granted
-        </Directory>
-</IfModule>
diff --git a/localhost.yml b/localhost.yml
index 85b6ecc..3323986 100644
--- a/localhost.yml
+++ b/localhost.yml
@@ -4,10 +4,11 @@
   become: true
   vars_files:
     - vars/default.yml
+      #- vars/accounts.yml
 
   tasks:
     - include: tasks/lamp.yml
-    - include: tasks/userdir.yml
+      # - include: tasks/accounts.yml
 
   handlers:
     - name: Reload Apache
diff --git a/tasks/lamp.yml b/tasks/lamp.yml
index dbbd2fd..fca35bc 100644
--- a/tasks/lamp.yml
+++ b/tasks/lamp.yml
@@ -70,3 +70,7 @@
   vars:
       name: "la SNT"
 
+- name: Enable userdir
+  shell: /usr/sbin/a2enmod userdir
+  notify: Reload Apache
+
diff --git a/tasks/userdir.yml b/tasks/userdir.yml
deleted file mode 100644
index d50c67c..0000000
--- a/tasks/userdir.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Enable userdir
-  shell: /usr/sbin/a2enmod userdir
-  notify: Reload Apache
-
-- name: Set up userdir virtualhost
-  template:
-      src: "files/userdir.conf.j2"
-      dest: "/etc/apache2/mods-enabled/userdir.conf"
-  notify: Reload Apache
-