From 7fed35a408b9ec37454169425823785b5fc8978b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 24 Aug 2017 02:22:17 +0200 Subject: Refactor base installation module --- modules/base_installation/files/cronie/puppet-post-merge | 15 +++++++++++++++ .../files/kernel_modules/pcspkr_no_autoload.conf | 1 + .../base_installation/files/package_managers/mirrorlist | 2 ++ modules/base_installation/files/services/en-dhcp.network | 8 ++++++++ .../files/services/getty_conf_override.conf | 2 ++ 5 files changed, 28 insertions(+) create mode 100644 modules/base_installation/files/cronie/puppet-post-merge create mode 100644 modules/base_installation/files/kernel_modules/pcspkr_no_autoload.conf create mode 100644 modules/base_installation/files/package_managers/mirrorlist create mode 100644 modules/base_installation/files/services/en-dhcp.network create mode 100644 modules/base_installation/files/services/getty_conf_override.conf (limited to 'modules/base_installation/files') diff --git a/modules/base_installation/files/cronie/puppet-post-merge b/modules/base_installation/files/cronie/puppet-post-merge new file mode 100644 index 0000000..ac5e3ff --- /dev/null +++ b/modules/base_installation/files/cronie/puppet-post-merge @@ -0,0 +1,15 @@ +#!/bin/bash +## Run Puppet locally using puppet apply +git submodule update --init +/usr/bin/puppet apply `pwd`/manifests/site.pp + +## Log status of the Puppet run +if [ $? -eq 0 ] +then + /usr/bin/logger -i "Puppet has run successfully" -t "puppet-run" + exit 0 +else + /usr/bin/logger -i "Puppet has ran into an error, please run Puppet manually" -t "puppet-run" + exit 1 +fi + diff --git a/modules/base_installation/files/kernel_modules/pcspkr_no_autoload.conf b/modules/base_installation/files/kernel_modules/pcspkr_no_autoload.conf new file mode 100644 index 0000000..b46792e --- /dev/null +++ b/modules/base_installation/files/kernel_modules/pcspkr_no_autoload.conf @@ -0,0 +1 @@ +blacklist pcspkr diff --git a/modules/base_installation/files/package_managers/mirrorlist b/modules/base_installation/files/package_managers/mirrorlist new file mode 100644 index 0000000..2ffca7c --- /dev/null +++ b/modules/base_installation/files/package_managers/mirrorlist @@ -0,0 +1,2 @@ +Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch +Server = http://mir.archlinux.fr/$repo/os/$arch diff --git a/modules/base_installation/files/services/en-dhcp.network b/modules/base_installation/files/services/en-dhcp.network new file mode 100644 index 0000000..6eef0e9 --- /dev/null +++ b/modules/base_installation/files/services/en-dhcp.network @@ -0,0 +1,8 @@ +[Match] +Name=en* + +[Network] +DHCP=yes + +[DHCP] +UseMTU=true diff --git a/modules/base_installation/files/services/getty_conf_override.conf b/modules/base_installation/files/services/getty_conf_override.conf new file mode 100644 index 0000000..52671c7 --- /dev/null +++ b/modules/base_installation/files/services/getty_conf_override.conf @@ -0,0 +1,2 @@ +[Service] +TTYVTDisallocate=no -- cgit v1.2.3