From 4fd48934d704c3ecfa2758f4d58590323f641baf Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Tue, 4 Apr 2017 15:00:16 +0300 Subject: Rename role to be generic Debian, not just jessie --- roles/sane-debian-system/README | 10 ++++++++++ roles/sane-debian-system/defaults/main.yml | 16 ++++++++++++++++ roles/sane-debian-system/tasks/apt.yml | 22 ++++++++++++++++++++++ roles/sane-debian-system/tasks/env.yml | 19 +++++++++++++++++++ roles/sane-debian-system/tasks/main.yml | 2 ++ roles/sane-debian-system/templates/sources.list.j2 | 3 +++ roles/sane_jessie_system/README | 10 ---------- roles/sane_jessie_system/defaults/main.yml | 16 ---------------- roles/sane_jessie_system/tasks/apt.yml | 22 ---------------------- roles/sane_jessie_system/tasks/env.yml | 19 ------------------- roles/sane_jessie_system/tasks/main.yml | 2 -- roles/sane_jessie_system/templates/sources.list.j2 | 3 --- 12 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 roles/sane-debian-system/README create mode 100644 roles/sane-debian-system/defaults/main.yml create mode 100644 roles/sane-debian-system/tasks/apt.yml create mode 100644 roles/sane-debian-system/tasks/env.yml create mode 100644 roles/sane-debian-system/tasks/main.yml create mode 100644 roles/sane-debian-system/templates/sources.list.j2 delete mode 100644 roles/sane_jessie_system/README delete mode 100644 roles/sane_jessie_system/defaults/main.yml delete mode 100644 roles/sane_jessie_system/tasks/apt.yml delete mode 100644 roles/sane_jessie_system/tasks/env.yml delete mode 100644 roles/sane_jessie_system/tasks/main.yml delete mode 100644 roles/sane_jessie_system/templates/sources.list.j2 (limited to 'roles') diff --git a/roles/sane-debian-system/README b/roles/sane-debian-system/README new file mode 100644 index 0000000..a0799a8 --- /dev/null +++ b/roles/sane-debian-system/README @@ -0,0 +1,10 @@ +This role, sane_jessie_system, set up a Debian system to run jessie, +and does some setup so the system meets minimal criteria for sanity. +Specifically: + +- APT is configured with all the sources.list entries required by the + playbook +- all packages are upgraded to current versions +- hostname is set +- the clock is kept accurate with NTP +- locales are available diff --git a/roles/sane-debian-system/defaults/main.yml b/roles/sane-debian-system/defaults/main.yml new file mode 100644 index 0000000..2f2f3b2 --- /dev/null +++ b/roles/sane-debian-system/defaults/main.yml @@ -0,0 +1,16 @@ +# These are the variables expected by this role. + +# The desired hostname. Default is empty, which means hostname won't +# be set. +hostname: "" + + +# Default Debian mirror to use. Default should work everywhere, but if +# needed, pick a faster mirror, perhaps a local one. +debian_mirror: http.debian.net + + +# A list of extra APT repositories to add. Each list entry should be a +# dict with the key "repo", which is the sources.list line to add. If +# list is empty (as it is by default), nothing extra is added. +sources_lists: [] diff --git a/roles/sane-debian-system/tasks/apt.yml b/roles/sane-debian-system/tasks/apt.yml new file mode 100644 index 0000000..4977683 --- /dev/null +++ b/roles/sane-debian-system/tasks/apt.yml @@ -0,0 +1,22 @@ +# This is installed before updating sources lists, so that if they +# happen to use https URLs the package lists can still be update. +- name: install apt-transport-https + apt: + name: apt-transport-https + +- name: configure main sources.list + copy: + src: source.list + dest: /etc/apt/sources.list + +- name: additional sources.list.d/* + with_items: "{{ sources_lists }}" + apt_repository: + repo: "{{ item.repo }}" + update_cache: no + +- name: dist-upgrade so everything is up to date + apt: + upgrade: dist + update_cache: yes + cache_valid_time: 0 diff --git a/roles/sane-debian-system/tasks/env.yml b/roles/sane-debian-system/tasks/env.yml new file mode 100644 index 0000000..d1e7cab --- /dev/null +++ b/roles/sane-debian-system/tasks/env.yml @@ -0,0 +1,19 @@ +- name: set /etc/hostname + copy: + content: "{{ hostname }}" + dest: /etc/hostname + when: hostname + +- name: add hostname to /etc/hosts + lineinfile: + dest: /etc/hosts + regexp: '^127\.0\.1\.1 ' + line: "127.0.1.1 {{ hostname }}" + when: hostname + +- name: install environment packages + apt: + name: "{{ item }}" + with_items: + - locales-all + - ntp diff --git a/roles/sane-debian-system/tasks/main.yml b/roles/sane-debian-system/tasks/main.yml new file mode 100644 index 0000000..dcb3b60 --- /dev/null +++ b/roles/sane-debian-system/tasks/main.yml @@ -0,0 +1,2 @@ +- include: apt.yml +- include: env.yml diff --git a/roles/sane-debian-system/templates/sources.list.j2 b/roles/sane-debian-system/templates/sources.list.j2 new file mode 100644 index 0000000..4701d19 --- /dev/null +++ b/roles/sane-debian-system/templates/sources.list.j2 @@ -0,0 +1,3 @@ +deb http://{{ debian_mirror }}/debian jessie main +deb http://security.debian.org/ jessie/updates main +deb {{ debian_mirror }} jessie-updates main diff --git a/roles/sane_jessie_system/README b/roles/sane_jessie_system/README deleted file mode 100644 index a0799a8..0000000 --- a/roles/sane_jessie_system/README +++ /dev/null @@ -1,10 +0,0 @@ -This role, sane_jessie_system, set up a Debian system to run jessie, -and does some setup so the system meets minimal criteria for sanity. -Specifically: - -- APT is configured with all the sources.list entries required by the - playbook -- all packages are upgraded to current versions -- hostname is set -- the clock is kept accurate with NTP -- locales are available diff --git a/roles/sane_jessie_system/defaults/main.yml b/roles/sane_jessie_system/defaults/main.yml deleted file mode 100644 index 2f2f3b2..0000000 --- a/roles/sane_jessie_system/defaults/main.yml +++ /dev/null @@ -1,16 +0,0 @@ -# These are the variables expected by this role. - -# The desired hostname. Default is empty, which means hostname won't -# be set. -hostname: "" - - -# Default Debian mirror to use. Default should work everywhere, but if -# needed, pick a faster mirror, perhaps a local one. -debian_mirror: http.debian.net - - -# A list of extra APT repositories to add. Each list entry should be a -# dict with the key "repo", which is the sources.list line to add. If -# list is empty (as it is by default), nothing extra is added. -sources_lists: [] diff --git a/roles/sane_jessie_system/tasks/apt.yml b/roles/sane_jessie_system/tasks/apt.yml deleted file mode 100644 index 4977683..0000000 --- a/roles/sane_jessie_system/tasks/apt.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This is installed before updating sources lists, so that if they -# happen to use https URLs the package lists can still be update. -- name: install apt-transport-https - apt: - name: apt-transport-https - -- name: configure main sources.list - copy: - src: source.list - dest: /etc/apt/sources.list - -- name: additional sources.list.d/* - with_items: "{{ sources_lists }}" - apt_repository: - repo: "{{ item.repo }}" - update_cache: no - -- name: dist-upgrade so everything is up to date - apt: - upgrade: dist - update_cache: yes - cache_valid_time: 0 diff --git a/roles/sane_jessie_system/tasks/env.yml b/roles/sane_jessie_system/tasks/env.yml deleted file mode 100644 index d1e7cab..0000000 --- a/roles/sane_jessie_system/tasks/env.yml +++ /dev/null @@ -1,19 +0,0 @@ -- name: set /etc/hostname - copy: - content: "{{ hostname }}" - dest: /etc/hostname - when: hostname - -- name: add hostname to /etc/hosts - lineinfile: - dest: /etc/hosts - regexp: '^127\.0\.1\.1 ' - line: "127.0.1.1 {{ hostname }}" - when: hostname - -- name: install environment packages - apt: - name: "{{ item }}" - with_items: - - locales-all - - ntp diff --git a/roles/sane_jessie_system/tasks/main.yml b/roles/sane_jessie_system/tasks/main.yml deleted file mode 100644 index dcb3b60..0000000 --- a/roles/sane_jessie_system/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -- include: apt.yml -- include: env.yml diff --git a/roles/sane_jessie_system/templates/sources.list.j2 b/roles/sane_jessie_system/templates/sources.list.j2 deleted file mode 100644 index 4701d19..0000000 --- a/roles/sane_jessie_system/templates/sources.list.j2 +++ /dev/null @@ -1,3 +0,0 @@ -deb http://{{ debian_mirror }}/debian jessie main -deb http://security.debian.org/ jessie/updates main -deb {{ debian_mirror }} jessie-updates main -- cgit v1.2.1