From 022b3325ecce08b911a589ba782abcfbe724e8d2 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 22 Jul 2015 00:40:42 +0200 Subject: [PATCH] Modified download place for doraemon. Installing ubuntu-mirror only on non-Virtualbox machines. Adding synchronization job for apt-mirror and a logrotation for the sync task. --- roles/doraemon/tasks/doraemon.yml | 2 +- roles/ubuntu-mirror/files/apt-mirror-cron | 3 +++ roles/ubuntu-mirror/files/apt-mirror-logrotate | 6 ++++++ roles/ubuntu-mirror/tasks/main.yml | 4 ++-- roles/ubuntu-mirror/tasks/ubuntu-mirror.yml | 8 ++++++++ 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100755 roles/ubuntu-mirror/files/apt-mirror-cron create mode 100644 roles/ubuntu-mirror/files/apt-mirror-logrotate diff --git a/roles/doraemon/tasks/doraemon.yml b/roles/doraemon/tasks/doraemon.yml index 8938012..797830d 100644 --- a/roles/doraemon/tasks/doraemon.yml +++ b/roles/doraemon/tasks/doraemon.yml @@ -14,7 +14,7 @@ when: check_doraemon_pkg|changed - name: Installazione doraemon - yum: pkg=http://syntaxerrormmm.zapto.org/downloads/rpm/doraemon-1.0.0-2.ns6.noarch.rpm state=present + yum: pkg=http://sys42.eu/downloads/rpm/doraemon-1.0.0-2.ns6.noarch.rpm state=present when: check_doraemon_pkg|changed sudo: yes diff --git a/roles/ubuntu-mirror/files/apt-mirror-cron b/roles/ubuntu-mirror/files/apt-mirror-cron new file mode 100755 index 0000000..f4932d5 --- /dev/null +++ b/roles/ubuntu-mirror/files/apt-mirror-cron @@ -0,0 +1,3 @@ +#!/bin/bash + +apt-mirror >/var/log/apt-mirror.log 2>&1 diff --git a/roles/ubuntu-mirror/files/apt-mirror-logrotate b/roles/ubuntu-mirror/files/apt-mirror-logrotate new file mode 100644 index 0000000..83dae13 --- /dev/null +++ b/roles/ubuntu-mirror/files/apt-mirror-logrotate @@ -0,0 +1,6 @@ +/var/log/apt-mirror.log { + daily + rotate 15 + compress + missingok +} diff --git a/roles/ubuntu-mirror/tasks/main.yml b/roles/ubuntu-mirror/tasks/main.yml index 67a5efc..001a992 100644 --- a/roles/ubuntu-mirror/tasks/main.yml +++ b/roles/ubuntu-mirror/tasks/main.yml @@ -1,4 +1,4 @@ --- - include: ubuntu-mirror.yml - tags: - - "client-install" + when: ansible_bios_version != "VirtualBox" + tags: ubuntu-mirror diff --git a/roles/ubuntu-mirror/tasks/ubuntu-mirror.yml b/roles/ubuntu-mirror/tasks/ubuntu-mirror.yml index 6862b75..0af1560 100644 --- a/roles/ubuntu-mirror/tasks/ubuntu-mirror.yml +++ b/roles/ubuntu-mirror/tasks/ubuntu-mirror.yml @@ -8,3 +8,11 @@ - name: Installazione configurazione apt-mirror copy: src=apt-mirror.list dest=/etc/apt-mirror.list sudo: yes + +- name: Installazione cron per sincronizzazione notturna + copy: src=apt-mirror-cron dest=/etc/cron.daily/apt-mirror mode=0755 + sudo: yes + +- name: Installazione logrotate per sincronizzazione notturna + copy: src=apt-mirror-logrotate dest=/etc/logrotate.d/apt-mirror mode=0644 + sudo: yes