summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--files/common/sysadmin-main3
-rw-r--r--files/jenkins/jenkins-admin-keys3
-rw-r--r--files/kojibuilder/ftbfs_auth_keys2
-rw-r--r--files/rkhunter/rkhunter.sysconfig2
-rw-r--r--inventory/host_vars/209.132.184.1422
-rw-r--r--inventory/host_vars/209.132.184.1432
-rw-r--r--inventory/host_vars/209.132.184.1442
-rw-r--r--inventory/host_vars/209.132.184.1462
-rw-r--r--inventory/host_vars/209.132.184.1472
-rw-r--r--inventory/host_vars/209.132.184.1532
-rw-r--r--inventory/host_vars/209.132.184.1652
-rw-r--r--inventory/host_vars/209.132.184.1662
-rw-r--r--inventory/host_vars/copr-be-dev.cloud.fedoraproject.org4
-rw-r--r--inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org4
-rw-r--r--inventory/host_vars/jenkins.cloud.fedoraproject.org2
15 files changed, 14 insertions, 22 deletions
diff --git a/files/common/sysadmin-main b/files/common/sysadmin-main
index 79a6e8a85..079747d50 100644
--- a/files/common/sysadmin-main
+++ b/files/common/sysadmin-main
@@ -25,9 +25,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3eVd6Ccegp1r1mhm7tPnlGUcw0zsAbR2p9hrFZ7RK
#ricky
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDAeAohiRJ2v/RO7R9GS93TF92Gc9ixK6HM7wlbMdlZ4yYAbeoEX8VpeNaSTfo/Nw3zazr9VpmpHg+H70K8ljQsPgRwcgpetRVpF55M5FYjqM5oM+N94HV3nSGcnWbSIho1R31DaDH2ptxVqgh2m5DG7Bc45w9Bd4wjfdQ8nBrGv93tuH7X/cee4g6GvexLm5nXhAngdEmiyxw5MHuJAvj+54l4wMXRWpeF6XlI2iamW42nLSfRMCFkGNiXvBm8zkfkeH2L7I2cNKXXoP/cPCd3G/teIsI9FDqYpZ6CS0zMkWhlTuh7rlCjc9+nJsLdDLgwhb75skiUOOfimGvCCxWeHuCsSL+KpCu4AgI9UAVgO6xblDlmbQXxlGopep29U/s00W/0qv3Zp8Ks4Za0xHdoIwHiaLM0OYymFaNDd3ZqFG0FN23ZjcGqUmFGhGfUQRDt72+e9HtXlBJ0mUaCX9+e4wFGTVciG1/5CKsLHCaLRf+knsWXrv2zcv9BoZ9SCAK32zCZw05wjcmr7jYDCTLmtC6kEBNaOeE9Qqi2oomo4ji8ybg+Qq+1BwOtJKExvmZaooBZud0qd24HmCU0/0ysw732jGcqexzxsCR0VArd+7LKexOD7KwMW0VUss6fdOWac9gwCLx9FaKYh8mVvcQjKhKGI3aO2sXRUWSbBJw8w== ricky@alpha.rzhou.org
-#skvidal
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjlnCEiFMrKpkiIBjs5IW1+RXDald3aKvTszj0hUw9Gl6w3vt3RAiqTD/XRKcNdP0+pVIK/I4KexKfZzemNZ8UYmZ+a9EK+Gj7OQbJv7TQDeR0zyJ8ZgFXaWoN+CnWXLO2mp9poysUR6CILjaDJt4GDxJaD+bebRu+zxUQSlgrjObhIUTSfwsEJu++zK+fy4+xSEMG7SANEJHd+zOAw6+isLnnbp8qY2fs3reKpc8XPkyJscLU4BQV2cGXwlPUhzPVv/itUUV/uWHeAqoz2i5XG4C0/BXk6D85qkGIyE08Nl3COxn6giivrdTIH6W4dUtBdYgTMZ3RgMHL9ClLpS17 skvidal@opus
-
#smooge
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAxnzCHH11nDM1m7yvqo6Uanq5vcZjBcs/mr3LccxwJ59ENzSXwUgEQy/P8vby9VKMwsskoaqZcvJdOSZBFhNV970NTPb69OIXPQAl/xhaLwiJOn606fB+/S8WepeuntS0qLiebbEiA9vIQLteZ+bWl1s/didD/sFo3/wItoTGA4GuShUu1AyWJx5Ue7Y34rwGR+kIvDoy2GHUcunn2PjGt4r3v2vpiR8GuK0JRupJAGYbYCiMBDRMkR0cgEyHW6+QQNqMlA6nRJjp94PcUMKaZK6Tc+6h5v8kLLtzuZ6ZupwMMC4X8sh85YcxqoW9DynrvO28pzaMNBHm7qr9LeY9PIhXscSa35GAcGZ7UwPK4aJAAuIzCf8BzazyvUM3Ye7GPCXHxUwY0kdXk+MHMVKFzZDChNp/ovgdhxNrw9Xzcs4yw7XYambN9Bk567cI6/tWcPuYLYD4ZJQP0qSXVzVgFEPss1lDcgd0k4if+pINyxM8eVFZVAqU+BMeDC+6W8HUUPgv6LiyTWs+xTXTuORwBTSF1pOqWB4LjqsCGIiMAc6n/xdALBGUN7qsuKDU6Q7bwPppaxypi4KCvuJsqW+8sDtMUaZ34I5Zo1q7cu03wqnOljUGoAY6IDn3J66F2KlPPyb/q3PDV3WbY/jnH16L29/xUA73nFUW1p+WXutwmSU= ssmoogen@ponyo.int.smoogespace.com
diff --git a/files/jenkins/jenkins-admin-keys b/files/jenkins/jenkins-admin-keys
index 8b030c82a..889446811 100644
--- a/files/jenkins/jenkins-admin-keys
+++ b/files/jenkins/jenkins-admin-keys
@@ -25,9 +25,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3eVd6Ccegp1r1mhm7tPnlGUcw0zsAbR2p9hrFZ7RK
#ricky
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDAeAohiRJ2v/RO7R9GS93TF92Gc9ixK6HM7wlbMdlZ4yYAbeoEX8VpeNaSTfo/Nw3zazr9VpmpHg+H70K8ljQsPgRwcgpetRVpF55M5FYjqM5oM+N94HV3nSGcnWbSIho1R31DaDH2ptxVqgh2m5DG7Bc45w9Bd4wjfdQ8nBrGv93tuH7X/cee4g6GvexLm5nXhAngdEmiyxw5MHuJAvj+54l4wMXRWpeF6XlI2iamW42nLSfRMCFkGNiXvBm8zkfkeH2L7I2cNKXXoP/cPCd3G/teIsI9FDqYpZ6CS0zMkWhlTuh7rlCjc9+nJsLdDLgwhb75skiUOOfimGvCCxWeHuCsSL+KpCu4AgI9UAVgO6xblDlmbQXxlGopep29U/s00W/0qv3Zp8Ks4Za0xHdoIwHiaLM0OYymFaNDd3ZqFG0FN23ZjcGqUmFGhGfUQRDt72+e9HtXlBJ0mUaCX9+e4wFGTVciG1/5CKsLHCaLRf+knsWXrv2zcv9BoZ9SCAK32zCZw05wjcmr7jYDCTLmtC6kEBNaOeE9Qqi2oomo4ji8ybg+Qq+1BwOtJKExvmZaooBZud0qd24HmCU0/0ysw732jGcqexzxsCR0VArd+7LKexOD7KwMW0VUss6fdOWac9gwCLx9FaKYh8mVvcQjKhKGI3aO2sXRUWSbBJw8w== ricky@alpha.rzhou.org
-#skvidal
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjlnCEiFMrKpkiIBjs5IW1+RXDald3aKvTszj0hUw9Gl6w3vt3RAiqTD/XRKcNdP0+pVIK/I4KexKfZzemNZ8UYmZ+a9EK+Gj7OQbJv7TQDeR0zyJ8ZgFXaWoN+CnWXLO2mp9poysUR6CILjaDJt4GDxJaD+bebRu+zxUQSlgrjObhIUTSfwsEJu++zK+fy4+xSEMG7SANEJHd+zOAw6+isLnnbp8qY2fs3reKpc8XPkyJscLU4BQV2cGXwlPUhzPVv/itUUV/uWHeAqoz2i5XG4C0/BXk6D85qkGIyE08Nl3COxn6giivrdTIH6W4dUtBdYgTMZ3RgMHL9ClLpS17 skvidal@opus
-
#smooge
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAxnzCHH11nDM1m7yvqo6Uanq5vcZjBcs/mr3LccxwJ59ENzSXwUgEQy/P8vby9VKMwsskoaqZcvJdOSZBFhNV970NTPb69OIXPQAl/xhaLwiJOn606fB+/S8WepeuntS0qLiebbEiA9vIQLteZ+bWl1s/didD/sFo3/wItoTGA4GuShUu1AyWJx5Ue7Y34rwGR+kIvDoy2GHUcunn2PjGt4r3v2vpiR8GuK0JRupJAGYbYCiMBDRMkR0cgEyHW6+QQNqMlA6nRJjp94PcUMKaZK6Tc+6h5v8kLLtzuZ6ZupwMMC4X8sh85YcxqoW9DynrvO28pzaMNBHm7qr9LeY9PIhXscSa35GAcGZ7UwPK4aJAAuIzCf8BzazyvUM3Ye7GPCXHxUwY0kdXk+MHMVKFzZDChNp/ovgdhxNrw9Xzcs4yw7XYambN9Bk567cI6/tWcPuYLYD4ZJQP0qSXVzVgFEPss1lDcgd0k4if+pINyxM8eVFZVAqU+BMeDC+6W8HUUPgv6LiyTWs+xTXTuORwBTSF1pOqWB4LjqsCGIiMAc6n/xdALBGUN7qsuKDU6Q7bwPppaxypi4KCvuJsqW+8sDtMUaZ34I5Zo1q7cu03wqnOljUGoAY6IDn3J66F2KlPPyb/q3PDV3WbY/jnH16L29/xUA73nFUW1p+WXutwmSU= ssmoogen@ponyo.int.smoogespace.com
diff --git a/files/kojibuilder/ftbfs_auth_keys b/files/kojibuilder/ftbfs_auth_keys
index bb560a48e..b19f1a08a 100644
--- a/files/kojibuilder/ftbfs_auth_keys
+++ b/files/kojibuilder/ftbfs_auth_keys
@@ -1,5 +1,3 @@
-#skvidal
-from="10.5.126.23,10.5.126.12,10.5.126.11" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjlnCEiFMrKpkiIBjs5IW1+RXDald3aKvTszj0hUw9Gl6w3vt3RAiqTD/XRKcNdP0+pVIK/I4KexKfZzemNZ8UYmZ+a9EK+Gj7OQbJv7TQDeR0zyJ8ZgFXaWoN+CnWXLO2mp9poysUR6CILjaDJt4GDxJaD+bebRu+zxUQSlgrjObhIUTSfwsEJu++zK+fy4+xSEMG7SANEJHd+zOAw6+isLnnbp8qY2fs3reKpc8XPkyJscLU4BQV2cGXwlPUhzPVv/itUUV/uWHeAqoz2i5XG4C0/BXk6D85qkGIyE08Nl3COxn6giivrdTIH6W4dUtBdYgTMZ3RgMHL9ClLpS17 skvidal@opus
#dgilmore
from="10.5.126.23,10.5.126.12,10.5.126.11" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAD9QDskl41P2f4wqBuDBRD3VJ7MfKD6gMetMEaOy2b/CzfxN1vzeoxEvUxefi4+uh5b5ht5+BhQVhvBV7sTxxYftEH+B7IRmWigqcS1Ndnw+ML6zCbSTCJOqDvTLxmkZic0NUBIBP907ztMCoZjaOW9SSCrdA9Vp87V3x/KEQaeSNntmnFqtnpQI/N0NlmqxB78p97W/QDpLuftqJ33sM0uyvxXSusThLSFBHjisezsWox49nEKY8HW+Kwkmw+k7EF4tsDWymPB+S0gMsMlTxzjutNASVDmn6H+lgkzns+5Xxii4/mZWrcjqfLuH7vCI2mWykZJ6ek0LiQea9tNN+KZomqX6NbTUK3riaDPrZPNexa4I83Fp+DYNmYgnGMInqn+cZ5PoUJ3u3LaqZGBQeuuONTw0yQ8Pkkn5xibpPO6qblHKcet0pfmWQ5ab+5BDrsyLcPXolMci5h45GNWebr7UMuXT6+q+EolnYgbgDzzGJ4xPohF04OW8CwflK64KEnYcqlGs+DF4TNgGFlhKiyCWfXSjizmQusxn17ayi6+yrkiGeqfz72qyZ1pSKlwA8XRYC2VkAAquJP6zAtAKjCUdmRTSyYgCpoIAlMwBO07BiPLLov6lKdphZYY1DI7pTXA98fhVU04PDqJJYR1GKkttmCsjbRWnxjkPl/Zka1+ei3k9DNidT6j4hFj+uTj8SS70qZUtKLNpc5IcedHaGEK0vcXJm9lIEKBIEnN0PCLZCa4kQZnfdsbuep1fbXNf4WYPXea29aRKJc4hiqsdrccTp4KueHgWt1Jj6CZDZcFgX+NlUVWwk6djgjRzHUryExtsjCcgGMPRJWdUnVcpgkQ1qJhEXng3W+nFFboArWfwU8u1pXEdeE1Z+m+ows3nJHdEgQevyy/cUx6BPNPZkBh10MWskSV8Z+vb02vJB+QikRMwQs3Ywf6RMaZFrBkWD4FfUaU24f4wgtPQN7j5xxJ2rWLJ/s9ZOWSl9yrytC6ZUQwmayLmiPUdm4u/7ZZmaly39K1YWqFDl3eUrRAZwf1L/NAqFu/qcQQ3Xf20K0nI55nVbZ8ODyx6BtfwoioblnTEcehK0uud5Vamc5mfpErFY0agEecsc0sMZO+ky9pf/gCUdM7je7kMDI2hdx61fOa8Wypb5u9WNBWKRKx8xT1XUKhb2uFumm3sR1iNm1Qhj92mo/NO2aETOA1lsYSL0XK571Yy0iFK3X1nOqp/gCsEGLI8OPQk6XuFqv8hmfiIXNKV8IwuDStw7eIvuQIgT7bmMkj+1Ca25foSmg3w5FqJux1gO9t5F018LeQZ6LVlYHZaQnaN+eTU7KfoCozhWw1H9pprDz Dennis Gilmore
#kfenzi
diff --git a/files/rkhunter/rkhunter.sysconfig b/files/rkhunter/rkhunter.sysconfig
index ee3deb844..0c463db71 100644
--- a/files/rkhunter/rkhunter.sysconfig
+++ b/files/rkhunter/rkhunter.sysconfig
@@ -6,6 +6,6 @@
# yes - perform detailed report scan
# (includes application check)
-MAILTO=skvidal@fedoraproject.org,smooge@fedoraproject.org,kevin@fedoraproject.org
+MAILTO=smooge@fedoraproject.org,kevin@fedoraproject.org
DIAG_SCAN=no
diff --git a/inventory/host_vars/209.132.184.142 b/inventory/host_vars/209.132.184.142
index 8f422a4f4..3d6f35b5a 100644
--- a/inventory/host_vars/209.132.184.142
+++ b/inventory/host_vars/209.132.184.142
@@ -6,6 +6,6 @@ security_group: webserver
zone: nova
hostbase: copr-be-
public_ip: 209.132.184.142
-root_auth_users: skvidal bkabrda msuchy
+root_auth_users: bkabrda msuchy
description: copr dispatcher and repo server
volumes: ['-d /dev/vdb vol-00000008', '-d /dev/vdc vol-00000007']
diff --git a/inventory/host_vars/209.132.184.143 b/inventory/host_vars/209.132.184.143
index b44e223c4..67343dd6e 100644
--- a/inventory/host_vars/209.132.184.143
+++ b/inventory/host_vars/209.132.184.143
@@ -6,6 +6,6 @@ security_group: webserver
zone: nova
hostbase: artboard-
public_ip: 209.132.184.143
-root_auth_users: skvidal duffy
+root_auth_users: duffy kevin
description: artboard cloud instance for the fedora art group
volumes: ['-d /dev/vdb vol-00000009']
diff --git a/inventory/host_vars/209.132.184.144 b/inventory/host_vars/209.132.184.144
index f98bc3606..5449dff97 100644
--- a/inventory/host_vars/209.132.184.144
+++ b/inventory/host_vars/209.132.184.144
@@ -6,6 +6,6 @@ security_group: webserver
zone: nova
hostbase: copr-fe-
public_ip: 209.132.184.144
-root_auth_users: skvidal bkabrda ryanlerch pingou
+root_auth_users: bkabrda ryanlerch pingou
description: copr frontend server
volumes: ['-d /dev/vdb vol-0000000f']
diff --git a/inventory/host_vars/209.132.184.146 b/inventory/host_vars/209.132.184.146
index eca7a0183..4df862ac8 100644
--- a/inventory/host_vars/209.132.184.146
+++ b/inventory/host_vars/209.132.184.146
@@ -6,6 +6,6 @@ security_group: logstash
zone: nova
hostbase: logstash-
public_ip: 209.132.184.146
-root_auth_users: lmacken skvidal
+root_auth_users: lmacken
description: cloud instance for developing/testing logstash
volumes: ['-d /dev/vdb vol-0000000d']
diff --git a/inventory/host_vars/209.132.184.147 b/inventory/host_vars/209.132.184.147
index 059fba330..c4b671a33 100644
--- a/inventory/host_vars/209.132.184.147
+++ b/inventory/host_vars/209.132.184.147
@@ -6,7 +6,7 @@ security_group: webserver
zone: nova
hostbase: fedocal-dev-
public_ip: 209.132.184.147
-root_auth_users: skvidal pingou
+root_auth_users: pingou
description: fedocal dev server
volumes: ['-d /dev/vdb vol-00000010']
diff --git a/inventory/host_vars/209.132.184.153 b/inventory/host_vars/209.132.184.153
index e5dc033a2..0f12d2528 100644
--- a/inventory/host_vars/209.132.184.153
+++ b/inventory/host_vars/209.132.184.153
@@ -6,6 +6,6 @@ security_group: jenkins
zone: nova
hostbase: jenkins-master-
public_ip: 209.132.184.153
-root_auth_users: pingou skvidal puiterwijk
+root_auth_users: pingou puiterwijk
description: jenkins cloud master
volumes: ['-d /dev/vdb vol-00000011']
diff --git a/inventory/host_vars/209.132.184.165 b/inventory/host_vars/209.132.184.165
index 3ba4fed6f..e2d1513b3 100644
--- a/inventory/host_vars/209.132.184.165
+++ b/inventory/host_vars/209.132.184.165
@@ -6,5 +6,5 @@ security_group: jenkins
zone: nova
hostbase: jenkins-el6
public_ip: 209.132.184.165
-root_auth_users: pingou skvidal
+root_auth_users: pingou
description: jenkins el6 worker/slave
diff --git a/inventory/host_vars/209.132.184.166 b/inventory/host_vars/209.132.184.166
index 6772adfd9..32700bfc2 100644
--- a/inventory/host_vars/209.132.184.166
+++ b/inventory/host_vars/209.132.184.166
@@ -6,6 +6,6 @@ security_group: jenkins
zone: nova
hostbase: jenkins-f18
public_ip: 209.132.184.166
-root_auth_users: pingou skvidal
+root_auth_users: pingou
description: jenkins f18 worker/slave
diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org
index 087b469b5..642821596 100644
--- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org
@@ -6,6 +6,6 @@ security_group: webserver
zone: nova
hostbase: copr-be-dev-
public_ip: 209.132.184.179
-root_auth_users: skvidal bkabrda msuchy tradej pingou
+root_auth_users: bkabrda msuchy tradej pingou
description: copr dispatcher and repo server - dev instance
-tcp_ports: ['22', '80', '443'] \ No newline at end of file
+tcp_ports: ['22', '80', '443']
diff --git a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
index 481e14515..2ba5895c6 100644
--- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
@@ -6,6 +6,6 @@ security_group: webserver
zone: nova
hostbase: copr-fe-dev-
public_ip: 209.132.184.183
-root_auth_users: skvidal bkabrda ryanlerch pingou msuchy tradej
+root_auth_users: bkabrda ryanlerch pingou msuchy tradej
description: copr frontend server - dev instance
-tcp_ports: ['22', '80', '443'] \ No newline at end of file
+tcp_ports: ['22', '80', '443']
diff --git a/inventory/host_vars/jenkins.cloud.fedoraproject.org b/inventory/host_vars/jenkins.cloud.fedoraproject.org
index c7582a8eb..f4f105b53 100644
--- a/inventory/host_vars/jenkins.cloud.fedoraproject.org
+++ b/inventory/host_vars/jenkins.cloud.fedoraproject.org
@@ -6,6 +6,6 @@ security_group: jenkins
zone: nova
hostbase: jenkins-master-
public_ip: 209.132.184.153
-root_auth_users: pingou skvidal
+root_auth_users: pingou
description: jenkins cloud master
volumes: ['-d /dev/vdb vol-00000011']