From 73f534bd37c7ab5340d55d217d885568fb8e86c6 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 10 Apr 2018 21:31:51 +0000 Subject: [PATCH] dennis-s email was down and I saw a way to clean up stuff --- .../hosts/data-analysis01.phx2.fedoraproject.org.yml | 1 - roles/fas_client/files/aliases.template | 2 +- .../nagios/contactgroups/fedora-sysadmin-email.cfg | 2 +- .../templates/nagios/configs/cgi.cfg.j2 | 12 +++--------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 344deded63..62e8e32781 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -72,7 +72,6 @@ - php-pdo - php-gd - php-xml - - php-mbstring - php - php-pecl-geoip - gnuplot diff --git a/roles/fas_client/files/aliases.template b/roles/fas_client/files/aliases.template index 7956891543..c68036284f 100644 --- a/roles/fas_client/files/aliases.template +++ b/roles/fas_client/files/aliases.template @@ -171,7 +171,7 @@ ham-radio-exams: nb,codeblock,gholms # Misc Aliases cvs-access: accounts -ftpsync: ausil,kevin,smooge +ftpsync: kevin,smooge # Used for openshift census instance census: npmccallum,kevin,ianweller,tflink # User for openshift fedora-status instance diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg index 144a5f2084..eb59de586e 100644 --- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg +++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg @@ -2,5 +2,5 @@ define contactgroup{ contactgroup_name fedora-sysadmin-email alias Fedora Sysadmin Email Contacts # sysadmin-main: @ausil codeblock jstanley @kevin pbrobinson pingou puiterwijk ralph @smooge tflink - members admin,ausil,codeblock,jstanley,kevin,puiterwijkp,smooge + members admin,codeblock,kevin,puiterwijkp,smooge } diff --git a/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2 b/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2 index 5852e78ba9..d4148e8cf9 100644 --- a/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2 @@ -143,7 +143,7 @@ authorized_for_configuration_information=* # authenticated to the web server. #authorized_for_system_commands=nagiosadmin -authorized_for_system_commands=athmane,ausil,averi,badone,codeblock,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillion,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,pbrobinson,ricky,toshio,spot,mahrud,karsten,parasense,pingou,tflink,mizdebsk,msimacek,stickster +authorized_for_system_commands=averi,codeblock,kevin,nb,pfrields,puiterwijk,smooge,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson @@ -173,12 +173,9 @@ authorized_for_all_hosts=* #authorized_for_all_service_commands=nagiosadmin #authorized_for_all_host_commands=nagiosadmin -authorized_for_all_service_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillion,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,pbrobinson,ricky,toshio,spot,mahrud,dwa,karsten,pingou,tflink,mizdebsk,msimacek,stickster,cverna - -authorized_for_all_host_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivani,ianweller,jspaleta,jstanley,kevin,lbazan,lmacken,maxamillion,mmahut,mmcgrath,nb,pfrields,puiterwijk,rafaelgomes,ralph,sijis,smooge,susmit,tibbs,tmz,wsterling,mdomsch,notting,pbrobinson,ricky,toshio,spot,mahrud,dwa,karsten,pingou,tflink,mizdebsk,msimacek,stickster,cverna - - +authorized_for_all_service_commands=averi,codeblock,kevin,nb,pfrields,puiterwijk,smooge,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson +authorized_for_all_host_commands=averi,codeblock,kevin,nb,pfrields,puiterwijk,smooge,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson # STATUSMAP BACKGROUND IMAGE # This option allows you to specify an image to be used as a @@ -193,9 +190,6 @@ authorized_for_all_host_commands=athmane,ausil,averi,badone,codeblock,dwa,hvivan #statusmap_background_image=smbackground.gd2 - - - # STATUSMAP TRANSPARENCY INDEX COLOR # These options set the r,g,b values of the background color used the statusmap CGI, # so normal browsers that can't show real png transparency set the desired color as