From 284aad09bda973ffcc38c51dedf1e78ca21a6d37 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 May 2013 21:25:42 +0000 Subject: [PATCH] Fix motd, add freeze for datagrepper --- files/common-scripts/make-motd.sh | 30 ------------------------------ inventory/group_vars/datagrepper | 2 ++ playbooks/groups/arm-qa.yml | 5 ++--- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100755 files/common-scripts/make-motd.sh create mode 100644 inventory/group_vars/datagrepper diff --git a/files/common-scripts/make-motd.sh b/files/common-scripts/make-motd.sh deleted file mode 100755 index 3c24f36291..0000000000 --- a/files/common-scripts/make-motd.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -dest=/etc/motd - -cat << EOF > $dest -================================== ATTENTION ================================== - - This is a PRIVATE computer system, unauthorized access is - strictly prohibited. - -This system is to be used for Fedora Project and related purposes only. This -is not your personal computing system. Users who are unsure whether or not -they have access to this system, don't have it and should log off immediately. - -There is no expectation of privacy of any kind on this system. All questions -concerning access should be directed to admin@fedoraproject.org - -=============================================================================== - -This system is ansible managed! Local changes may be overwritten. - -EOF -notesurl="http://infrastructure.fedoraproject.org/infra/hosts/$(/bin/hostname)/notes" -hasnotes=`/usr/bin/wget --tries=1 --timeout=3 -q -O /dev/null "$notesurl"` -if [ "$?" == 0 ]; then - echo -e "\nnotes available from:\n $notesurl\n\n" >> $dest - /usr/bin/wget --tries=1 --timeout=3 -q -O- $notesurl >> $dest -else - echo -e "\n\n********\nNo notes found for this server! Please add some in the infra-hosts repository\n********\n" >> $dest -fi - diff --git a/inventory/group_vars/datagrepper b/inventory/group_vars/datagrepper new file mode 100644 index 0000000000..3d8f2c30da --- /dev/null +++ b/inventory/group_vars/datagrepper @@ -0,0 +1,2 @@ +--- +freezes: false diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index 072afb1270..ca79a2ed88 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -11,6 +11,8 @@ - ${private}/vars.yml tasks: + # make our /etc/motd file + - include: $tasks/motd.yml # This task sets up fas_client for user management - include: $tasks/fas_client.yml # This task sets up /etc/hosts for us @@ -19,6 +21,3 @@ - include: $tasks/common_scripts.yml # This task includes our sudo config - include: $tasks/sudo.yml - # make our /etc/motd file - # TODO: make this not change if there are no changes. - - command: /usr/local/bin/make-motd.sh