only install needrestart from backports; pin server-scripts commit

diff --git a/base.yml b/base.yml
index 2a7c8246c6b5e288584717dc9f29a5084b2ebd56..face9a3b4b57f6c499002f04235e1b0c02c66be8 100644 (file)
--- a/base.yml
+++ b/base.yml
@@ -14,10 +14,13 @@
     when: backports.rc != 0
   - name: get rid of packages we do not want
     apt: name=exim4-base,rpcbind state=absent autoremove=yes
     when: backports.rc != 0
   - name: get rid of packages we do not want
     apt: name=exim4-base,rpcbind state=absent autoremove=yes

-  - name: install needrestart, git
-    apt: name=needrestart,git state=latest default_release={{ansible_distribution_release}}-backports
+  - name: install needrestart (from backports)
+    apt: name=needrestart state=latest default_release={{ansible_distribution_release}}-backports
+  - name: install aptitude, rsync, git
+    apt: name=aptitude,rsync,git state=latest

   # server-scripts
   - name: clone server-scripts git repository
     git:
   # server-scripts
   - name: clone server-scripts git repository
     git:

-      repo: 'git://ralfj.de/server-scripts'

       dest: /root/server-scripts
       dest: /root/server-scripts

+      repo: 'git://ralfj.de/server-scripts'
+      version: 07d301fd8adeaf8ad40591a418da394ad37816ce

diff --git a/roles/journalwatch/tasks/main.yml b/roles/journalwatch/tasks/main.yml
index 773a2b20a8d6672276e776a7ed8dc9ac1692afab..3a7afcba18ccb21414f3c62d77203cebb92ff61f 100644 (file)
--- a/roles/journalwatch/tasks/main.yml
+++ b/roles/journalwatch/tasks/main.yml
@@ -2,9 +2,9 @@
   apt: name=python3-systemd state=latest
 - name: install journalwatch
   git:
   apt: name=python3-systemd state=latest
 - name: install journalwatch
   git:

+    dest: /root/journalwatch

     repo: 'https://github.com/The-Compiler/journalwatch.git'
     version: b62f223bc36eabc193cfcf0d309d284da4f66463
     repo: 'https://github.com/The-Compiler/journalwatch.git'
     version: b62f223bc36eabc193cfcf0d309d284da4f66463

-    dest: /root/journalwatch

 - name: create journalwatch config dir
   file: path=/root/.config/journalwatch state=directory
 - name: install journalwatch config files
 - name: create journalwatch config dir
   file: path=/root/.config/journalwatch state=directory
 - name: install journalwatch config files