From 5877b73b060bb6d9dffa16618aee8862c97f603b Mon Sep 17 00:00:00 2001
From: Ataxya <contact@ataxya.net>
Date: Tue, 12 Oct 2021 01:32:59 +0200
Subject: [PATCH] move *.yml for handle better src + update readme

---
 README.md                                     |  2 ++
 .../basicpackages.yml => basicpackages.yml    |  0
 playbook/dist-upgrade.yml => dist-upgrade.yml |  2 +-
 playbook/dist-upgrade.yml~                    | 19 -------------------
 templates/list-bullseye.j2                    |  5 +++++
 playbook/upgrade.yml => upgrade.yml           |  0
 6 files changed, 8 insertions(+), 20 deletions(-)
 rename playbook/basicpackages.yml => basicpackages.yml (100%)
 rename playbook/dist-upgrade.yml => dist-upgrade.yml (88%)
 delete mode 100644 playbook/dist-upgrade.yml~
 create mode 100644 templates/list-bullseye.j2
 rename playbook/upgrade.yml => upgrade.yml (100%)

diff --git a/README.md b/README.md
index e69de29..7095f62 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,2 @@
+todo: Handle reboot only if dist-upgrade (check if version has changed)
+
diff --git a/playbook/basicpackages.yml b/basicpackages.yml
similarity index 100%
rename from playbook/basicpackages.yml
rename to basicpackages.yml
diff --git a/playbook/dist-upgrade.yml b/dist-upgrade.yml
similarity index 88%
rename from playbook/dist-upgrade.yml
rename to dist-upgrade.yml
index 4ea43c2..d574059 100644
--- a/playbook/dist-upgrade.yml
+++ b/dist-upgrade.yml
@@ -3,7 +3,7 @@
   tasks:
     - name: Change /etc/apt/sources.list
       template:
-        src: /home/ansible/ansible/files/list-bullseye.j2
+        src: list-bullseye.j2
         dest: /etc/apt/sources.list
 
     - name: Updating apt cache
diff --git a/playbook/dist-upgrade.yml~ b/playbook/dist-upgrade.yml~
deleted file mode 100644
index b5c0956..0000000
--- a/playbook/dist-upgrade.yml~
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- hosts: all 
-  tasks:
-    - name: Change /etc/apt/sources.list
-      template:
-        src: /home/ansible/ansible/files/list-bullseye.j2
-        dest: /etc/apt/sources.list
-
-    - name: Updating apt cache
-      apt: update_cache=yes
-        
-    - name: Lauch upgrade
-      apt: upgrade=dist
-
-    - name: Reboot
-      vars:
-        ansible_python_interpreter: /usr/bin/python3
-      reboot:
-        msg: "Attention au reboot !"
diff --git a/templates/list-bullseye.j2 b/templates/list-bullseye.j2
new file mode 100644
index 0000000..72941ce
--- /dev/null
+++ b/templates/list-bullseye.j2
@@ -0,0 +1,5 @@
+deb http://deb.debian.org/debian/ bullseye main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://deb.debian.org/debian bullseye-proposed-updates main contrib non-free
+deb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://deb.debian.org/debian/ bullseye-backports main contrib non-free
diff --git a/playbook/upgrade.yml b/upgrade.yml
similarity index 100%
rename from playbook/upgrade.yml
rename to upgrade.yml