86e75a
import sos-3.2-15.el7_1.8
@@ -0,0 +1,35 @@
|
|
1
|
+
From 61a5b47d4fe4fd47e759b9acc19483491ec17005 Mon Sep 17 00:00:00 2001
|
2
|
+
From: Pavel Moravec <pmoravec@redhat.com>
|
3
|
+
Date: Tue, 5 May 2015 13:50:55 +0200
|
4
|
+
Subject: [PATCH] [hpasm] hpasmcli commands hang under timeout
|
5
|
+
|
6
|
+
When hpasmcli is run in a python Popen or system pipeline via the
|
7
|
+
timeout command it hangs indefinitely.
|
8
|
+
|
9
|
+
Work around this temporarily by disabling the use of the timeout
|
10
|
+
program (by passing a zero timeout value) when running this
|
11
|
+
command.
|
12
|
+
|
13
|
+
Fixes: #559
|
14
|
+
|
15
|
+
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
16
|
+
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
17
|
+
---
|
18
|
+
sos/plugins/hpasm.py | 2 +-
|
19
|
+
1 file changed, 1 insertion(+), 1 deletion(-)
|
20
|
+
|
21
|
+
diff --git a/sos/plugins/hpasm.py b/sos/plugins/hpasm.py
|
22
|
+
index 4d5d158..4d70887 100644
|
23
|
+
--- a/sos/plugins/hpasm.py
|
24
|
+
+++ b/sos/plugins/hpasm.py
|
25
|
+
@@ -30,6 +30,6 @@ class Hpasm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
|
26
|
+
self.add_cmd_output([
|
27
|
+
"hpasmcli -s 'show asr'",
|
28
|
+
"hpasmcli -s 'show server'"
|
29
|
+
- ])
|
30
|
+
+ ], timeout=0)
|
31
|
+
|
32
|
+
# vim: et ts=4 sw=4
|
33
|
+
--
|
34
|
+
1.8.3.1
|
35
|
+
|
@@ -0,0 +1,37 @@
|
|
1
|
+
From f8ab86cbd2302812cd9160bec4478cb4f84e1442 Mon Sep 17 00:00:00 2001
|
2
|
+
From: Shane Bradley <sbradley@redhat.com>
|
3
|
+
Date: Mon, 27 Apr 2015 10:28:34 -0400
|
4
|
+
Subject: [PATCH] [mysql] Collect log file
|
5
|
+
|
6
|
+
When MariaDB is run under Pacemaker an OCF resource agent is used
|
7
|
+
to start and stop the database. This configuration also overrides
|
8
|
+
the log paths used for the database. In particular the mysqld.log
|
9
|
+
is present at '/var/log/mysqld.log'.
|
10
|
+
|
11
|
+
Collect both paths as we do not currently detect whether we are
|
12
|
+
running with an OCF agent or stand-alone.
|
13
|
+
|
14
|
+
Fixes: #554
|
15
|
+
|
16
|
+
Signed-off-by: Shane Bradley <sbradley@redhat.com>
|
17
|
+
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
18
|
+
---
|
19
|
+
sos/plugins/mysql.py | 2 ++
|
20
|
+
1 file changed, 2 insertions(+)
|
21
|
+
|
22
|
+
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
|
23
|
+
index 8dba204..aa8e9b9 100644
|
24
|
+
--- a/sos/plugins/mysql.py
|
25
|
+
+++ b/sos/plugins/mysql.py
|
26
|
+
@@ -37,6 +37,8 @@ class Mysql(Plugin):
|
27
|
+
|
28
|
+
self.add_copy_spec([
|
29
|
+
self.mysql_cnf,
|
30
|
+
+ # Required for MariaDB under pacemaker (MariaDB-Galera)
|
31
|
+
+ "/var/log/mysqld.log",
|
32
|
+
"/var/log/mysql/mysqld.log",
|
33
|
+
"/var/log/mariadb/mariadb.log",
|
34
|
+
])
|
35
|
+
--
|
36
|
+
1.8.3.1
|
37
|
+
|
@@ -0,0 +1,72 @@
|
|
1
|
+
From 5917dbd8f38bab29de9e40d1135b0e9e85cb91bc Mon Sep 17 00:00:00 2001
|
2
|
+
From: Lee Yarwood <lyarwood@redhat.com>
|
3
|
+
Date: Tue, 7 Jul 2015 14:54:49 +0100
|
4
|
+
Subject: [PATCH] [openstack_neutron] Obscure passwords and secrets
|
5
|
+
|
6
|
+
The following passwords and secrets are now obscured :
|
7
|
+
|
8
|
+
- rabbit_password
|
9
|
+
- qpid_password
|
10
|
+
- nova_admin_password
|
11
|
+
- xenapi_connection_password
|
12
|
+
- password
|
13
|
+
- connection
|
14
|
+
- admin_password
|
15
|
+
- metadata_proxy_shared_secret
|
16
|
+
- qpid_password
|
17
|
+
- eapi_password
|
18
|
+
- crd_password
|
19
|
+
- primary_l3_host_password
|
20
|
+
- serverauth
|
21
|
+
- ucsm_password
|
22
|
+
- ha_vrrp_auth_password
|
23
|
+
- ssl_key_password
|
24
|
+
- vcenter_password
|
25
|
+
- edge_appliance_password
|
26
|
+
- tenant_admin_password
|
27
|
+
- apic_password
|
28
|
+
|
29
|
+
Fixes #594
|
30
|
+
|
31
|
+
Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
|
32
|
+
---
|
33
|
+
sos/plugins/openstack_neutron.py | 16 ++++++++++++++++
|
34
|
+
1 file changed, 16 insertions(+)
|
35
|
+
|
36
|
+
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
|
37
|
+
index 36de7cc..ab895c8 100644
|
38
|
+
--- a/sos/plugins/openstack_neutron.py
|
39
|
+
+++ b/sos/plugins/openstack_neutron.py
|
40
|
+
|
41
|
+
# along with this program; if not, write to the Free Software
|
42
|
+
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
43
|
+
|
44
|
+
+import glob
|
45
|
+
import os
|
46
|
+
import re
|
47
|
+
|
48
|
+
@@ -50,6 +51,21 @@ class Neutron(Plugin):
|
49
|
+
|
50
|
+
self.netns_dumps()
|
51
|
+
|
52
|
+
+ def postproc(self):
|
53
|
+
+ protect_keys = [
|
54
|
+
+ "rabbit_password", "qpid_password", "nova_admin_password",
|
55
|
+
+ "xenapi_connection_password", "password", "connection",
|
56
|
+
+ "admin_password", "metadata_proxy_shared_secret", "qpid_password",
|
57
|
+
+ "eapi_password", "crd_password", "primary_l3_host_password",
|
58
|
+
+ "serverauth", "ucsm_password", "ha_vrrp_auth_password",
|
59
|
+
+ "ssl_key_password", "nsx_password", "vcenter_password",
|
60
|
+
+ "edge_appliance_password", "tenant_admin_password", "apic_password"
|
61
|
+
+ ]
|
62
|
+
+ regexp = r"((?m)^\s*#*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
63
|
+
+
|
64
|
+
+ for config_file in glob.glob("/etc/%s/*" % self.component_name):
|
65
|
+
+ self.do_file_sub(config_file, regexp, r"\1*********")
|
66
|
+
+
|
67
|
+
def netns_dumps(self):
|
68
|
+
# It would've been beautiful if we could get parts of the networking
|
69
|
+
# plugin to run in different namespaces. There are a couple of options
|
70
|
+
--
|
71
|
+
1.8.3.1
|
72
|
+
|
@@ -0,0 +1,318 @@
|
|
1
|
+
From 02ef6e2ba8d1a8fe4468aaa8be0ae88f8c74646a Mon Sep 17 00:00:00 2001
|
2
|
+
From: Lee Yarwood <lyarwood@redhat.com>
|
3
|
+
Date: Wed, 15 Jul 2015 15:42:50 +0100
|
4
|
+
Subject: [PATCH] [openstack] Ensure openstack passwords and secrets are
|
5
|
+
obfuscated.
|
6
|
+
|
7
|
+
- Add a postproc method to ceilometer, cinder, glance, hoirzon and swift.
|
8
|
+
- Add missing keys to the remaining plugins.
|
9
|
+
- Modify the regular expression used by all plugins to ignore commented
|
10
|
+
out keys.
|
11
|
+
- Modify all plugins to use do_path_regex_sub() to apply regex to all
|
12
|
+
collected configuration files.
|
13
|
+
|
14
|
+
Resolves: #574
|
15
|
+
|
16
|
+
Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
|
17
|
+
---
|
18
|
+
sos/plugins/openstack_ceilometer.py | 12 ++++++++++++
|
19
|
+
sos/plugins/openstack_cinder.py | 17 +++++++++++++++++
|
20
|
+
sos/plugins/openstack_glance.py | 10 ++++++++++
|
21
|
+
sos/plugins/openstack_heat.py | 9 +++++++++
|
22
|
+
sos/plugins/openstack_horizon.py | 9 +++++++++
|
23
|
+
sos/plugins/openstack_keystone.py | 23 ++++++++---------------
|
24
|
+
sos/plugins/openstack_neutron.py | 17 ++++++++---------
|
25
|
+
sos/plugins/openstack_nova.py | 10 +++++-----
|
26
|
+
sos/plugins/openstack_sahara.py | 11 +++++------
|
27
|
+
sos/plugins/openstack_swift.py | 11 +++++++++++
|
28
|
+
sos/plugins/openstack_trove.py | 19 ++++++-------------
|
29
|
+
11 files changed, 100 insertions(+), 48 deletions(-)
|
30
|
+
|
31
|
+
diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
|
32
|
+
index 7c11057..44a733b 100644
|
33
|
+
--- a/sos/plugins/openstack_ceilometer.py
|
34
|
+
+++ b/sos/plugins/openstack_ceilometer.py
|
35
|
+
@@ -35,6 +35,18 @@ class OpenStackCeilometer(Plugin):
|
36
|
+
"/var/log/ceilometer"
|
37
|
+
])
|
38
|
+
|
39
|
+
+ def postproc(self):
|
40
|
+
+ protect_keys = [
|
41
|
+
+ "admin_password", "connection_password", "host_password",
|
42
|
+
+ "memcache_secret_key", "os_password", "password", "qpid_password",
|
43
|
+
+ "rabbit_password", "readonly_user_password", "secret_key",
|
44
|
+
+ "ssl_key_password", "telemetry_secret", "connection",
|
45
|
+
+ "metering_secret"
|
46
|
+
+ ]
|
47
|
+
+
|
48
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
49
|
+
+ self.do_path_regex_sub("/etc/ceilometer/*", regexp, r"\1*********")
|
50
|
+
+
|
51
|
+
|
52
|
+
class DebianOpenStackCeilometer(OpenStackCeilometer, DebianPlugin,
|
53
|
+
UbuntuPlugin):
|
54
|
+
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
|
55
|
+
index 8588f6c..2f22b5a 100644
|
56
|
+
--- a/sos/plugins/openstack_cinder.py
|
57
|
+
+++ b/sos/plugins/openstack_cinder.py
|
58
|
+
@@ -42,6 +42,23 @@ class OpenStackCinder(Plugin):
|
59
|
+
if self.get_option("log"):
|
60
|
+
self.add_copy_spec(["/var/log/cinder/"])
|
61
|
+
|
62
|
+
+ def postproc(self):
|
63
|
+
+ protect_keys = [
|
64
|
+
+ "admin_password", "backup_tsm_password", "chap_password",
|
65
|
+
+ "nas_password", "cisco_fc_fabric_password", "coraid_password",
|
66
|
+
+ "eqlx_chap_password", "fc_fabric_password",
|
67
|
+
+ "hitachi_auth_password", "hitachi_horcm_password",
|
68
|
+
+ "hp3par_password", "hplefthand_password", "memcache_secret_key",
|
69
|
+
+ "netapp_password", "netapp_sa_password", "nexenta_password",
|
70
|
+
+ "password", "qpid_password", "rabbit_password", "san_password",
|
71
|
+
+ "ssl_key_password", "vmware_host_password", "zadara_password",
|
72
|
+
+ "zfssa_initiator_password", "connection", "zfssa_target_password",
|
73
|
+
+ "os_privileged_user_password", "hmac_keys"
|
74
|
+
+ ]
|
75
|
+
+
|
76
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
77
|
+
+ self.do_path_regex_sub("/etc/cinder/*", regexp, r"\1*********")
|
78
|
+
+
|
79
|
+
|
80
|
+
class DebianOpenStackCinder(OpenStackCinder, DebianPlugin, UbuntuPlugin):
|
81
|
+
|
82
|
+
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
|
83
|
+
index 35c406a..33e69a9 100644
|
84
|
+
--- a/sos/plugins/openstack_glance.py
|
85
|
+
+++ b/sos/plugins/openstack_glance.py
|
86
|
+
@@ -38,6 +38,16 @@ class OpenStackGlance(plugins.Plugin):
|
87
|
+
"/var/log/glance/"
|
88
|
+
])
|
89
|
+
|
90
|
+
+ def postproc(self):
|
91
|
+
+ protect_keys = [
|
92
|
+
+ "admin_password", "password", "qpid_password", "rabbit_password",
|
93
|
+
+ "s3_store_secret_key", "ssl_key_password", "connection",
|
94
|
+
+ "vmware_server_password"
|
95
|
+
+ ]
|
96
|
+
+
|
97
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
98
|
+
+ self.do_path_regex_sub("/etc/glance/*", regexp, r"\1*********")
|
99
|
+
+
|
100
|
+
|
101
|
+
class DebianOpenStackGlance(OpenStackGlance,
|
102
|
+
plugins.DebianPlugin,
|
103
|
+
|
104
|
+
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
|
105
|
+
index 70185db..b60285a 100644
|
106
|
+
--- a/sos/plugins/openstack_heat.py
|
107
|
+
+++ b/sos/plugins/openstack_heat.py
|
108
|
+
@@ -36,6 +36,15 @@ class OpenStackHeat(Plugin):
|
109
|
+
"/var/log/heat/"
|
110
|
+
])
|
111
|
+
|
112
|
+
+ def postproc(self):
|
113
|
+
+ protect_keys = [
|
114
|
+
+ "admin_password", "memcache_secret_key", "password", "connection",
|
115
|
+
+ "qpid_password", "rabbit_password", "stack_domain_admin_password",
|
116
|
+
+ ]
|
117
|
+
+
|
118
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
119
|
+
+ self.do_path_regex_sub("/etc/heat/*", regexp, r"\1*********")
|
120
|
+
+
|
121
|
+
|
122
|
+
class DebianOpenStack(OpenStackHeat,
|
123
|
+
plugins.DebianPlugin,
|
124
|
+
|
125
|
+
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
|
126
|
+
index 4c93cd9..5449ce9 100644
|
127
|
+
--- a/sos/plugins/openstack_horizon.py
|
128
|
+
+++ b/sos/plugins/openstack_horizon.py
|
129
|
+
@@ -33,6 +33,15 @@ class OpenStackHorizon(Plugin):
|
130
|
+
if self.get_option("log"):
|
131
|
+
self.add_copy_spec("/var/log/horizon/")
|
132
|
+
|
133
|
+
+ def postproc(self):
|
134
|
+
+ protect_keys = [
|
135
|
+
+ "SECRET_KEY", "EMAIL_HOST_PASSWORD"
|
136
|
+
+ ]
|
137
|
+
+
|
138
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
139
|
+
+ self.do_path_regex_sub("/etc/openstack-dashboard/*",
|
140
|
+
+ regexp, r"\1*********")
|
141
|
+
+
|
142
|
+
|
143
|
+
class DebianOpenStackHorizon(OpenStackHorizon, DebianPlugin):
|
144
|
+
|
145
|
+
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
|
146
|
+
index 7d93d88..bff9ef6 100644
|
147
|
+
--- a/sos/plugins/openstack_keystone.py
|
148
|
+
+++ b/sos/plugins/openstack_keystone.py
|
149
|
+
@@ -38,21 +38,14 @@ class OpenStackKeystone(Plugin):
|
150
|
+
self.add_copy_spec("/var/log/keystone/")
|
151
|
+
|
152
|
+
def postproc(self):
|
153
|
+
- self.do_file_sub('/etc/keystone/keystone.conf',
|
154
|
+
- r"(?m)^(admin_password.*=)(.*)",
|
155
|
+
- r"\1 ******")
|
156
|
+
- self.do_file_sub('/etc/keystone/keystone.conf',
|
157
|
+
- r"(?m)^(admin_token.*=)(.*)",
|
158
|
+
- r"\1 ******")
|
159
|
+
- self.do_file_sub('/etc/keystone/keystone.conf',
|
160
|
+
- r"(?m)^(connection.*=.*mysql://)(.*)(:)(.*)(@)(.*)",
|
161
|
+
- r"\1\2:******@\6")
|
162
|
+
- self.do_file_sub('/etc/keystone/keystone.conf',
|
163
|
+
- r"(?m)^(password.*=)(.*)",
|
164
|
+
- r"\1 ******")
|
165
|
+
- self.do_file_sub('/etc/keystone/keystone.conf',
|
166
|
+
- r"(?m)^(ca_password.*=)(.*)",
|
167
|
+
- r"\1 ******")
|
168
|
+
+ protect_keys = [
|
169
|
+
+ "password", "qpid_password", "rabbit_password", "ssl_key_password",
|
170
|
+
+ "ldap_dns_password", "neutron_admin_password", "host_password",
|
171
|
+
+ "connection", "admin_password", "admin_token", "ca_password"
|
172
|
+
+ ]
|
173
|
+
+
|
174
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
175
|
+
+ self.do_path_regex_sub("/etc/keystone/*", regexp, r"\1*********")
|
176
|
+
|
177
|
+
|
178
|
+
class DebianOpenStackKeystone(OpenStackKeystone, DebianPlugin, UbuntuPlugin):
|
179
|
+
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
|
180
|
+
index ab895c8..91ee9f5 100644
|
181
|
+
--- a/sos/plugins/openstack_neutron.py
|
182
|
+
+++ b/sos/plugins/openstack_neutron.py
|
183
|
+
|
184
|
+
# along with this program; if not, write to the Free Software
|
185
|
+
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
186
|
+
|
187
|
+
-import glob
|
188
|
+
import os
|
189
|
+
import re
|
190
|
+
|
191
|
+
@@ -55,16 +54,16 @@ class Neutron(Plugin):
|
192
|
+
protect_keys = [
|
193
|
+
"rabbit_password", "qpid_password", "nova_admin_password",
|
194
|
+
"xenapi_connection_password", "password", "connection",
|
195
|
+
- "admin_password", "metadata_proxy_shared_secret", "qpid_password",
|
196
|
+
- "eapi_password", "crd_password", "primary_l3_host_password",
|
197
|
+
- "serverauth", "ucsm_password", "ha_vrrp_auth_password",
|
198
|
+
- "ssl_key_password", "nsx_password", "vcenter_password",
|
199
|
+
- "edge_appliance_password", "tenant_admin_password", "apic_password"
|
200
|
+
+ "admin_password", "metadata_proxy_shared_secret", "eapi_password",
|
201
|
+
+ "crd_password", "primary_l3_host_password", "serverauth",
|
202
|
+
+ "ucsm_password", "ha_vrrp_auth_password", "ssl_key_password",
|
203
|
+
+ "nsx_password", "vcenter_password", "edge_appliance_password",
|
204
|
+
+ "tenant_admin_password", "apic_password"
|
205
|
+
]
|
206
|
+
- regexp = r"((?m)^\s*#*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
207
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
208
|
+
|
209
|
+
- for config_file in glob.glob("/etc/%s/*" % self.component_name):
|
210
|
+
- self.do_file_sub(config_file, regexp, r"\1*********")
|
211
|
+
+ self.do_path_regex_sub("/etc/%s/*" % self.component_name,
|
212
|
+
+ regexp, r"\1*********")
|
213
|
+
|
214
|
+
def netns_dumps(self):
|
215
|
+
# It would've been beautiful if we could get parts of the networking
|
216
|
+
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
|
217
|
+
index 20fb3a3..e226dac 100644
|
218
|
+
--- a/sos/plugins/openstack_nova.py
|
219
|
+
+++ b/sos/plugins/openstack_nova.py
|
220
|
+
@@ -66,13 +66,13 @@ class OpenStackNova(Plugin):
|
221
|
+
"ldap_dns_password", "neutron_admin_password", "rabbit_password",
|
222
|
+
"qpid_password", "powervm_mgr_passwd", "virtual_power_host_pass",
|
223
|
+
"xenapi_connection_password", "password", "host_password",
|
224
|
+
- "vnc_password", "connection", "sql_connection", "admin_password"
|
225
|
+
+ "vnc_password", "connection", "sql_connection", "admin_password",
|
226
|
+
+ "connection_password", "memcache_secret_key", "s3_secret_key",
|
227
|
+
+ "metadata_proxy_shared_secret"
|
228
|
+
]
|
229
|
+
|
230
|
+
- regexp = r"((?m)^\s*#*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
231
|
+
-
|
232
|
+
- for conf_file in ["/etc/nova/nova.conf", "/etc/nova/api-paste.ini"]:
|
233
|
+
- self.do_file_sub(conf_file, regexp, r"\1*********")
|
234
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
235
|
+
+ self.do_path_regex_sub("/etc/nova/*", regexp, r"\1*********")
|
236
|
+
|
237
|
+
|
238
|
+
class DebianOpenStackNova(OpenStackNova, DebianPlugin, UbuntuPlugin):
|
239
|
+
diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py
|
240
|
+
index 9d971ba..18e56d7 100644
|
241
|
+
--- a/sos/plugins/openstack_sahara.py
|
242
|
+
+++ b/sos/plugins/openstack_sahara.py
|
243
|
+
@@ -33,14 +33,13 @@ class OpenStackSahara(Plugin):
|
244
|
+
|
245
|
+
def postproc(self):
|
246
|
+
protect_keys = [
|
247
|
+
- 'memcache_secret_key', 'qpid_password', 'rabbit_password',
|
248
|
+
- 'admin_password', 'password', 'ssl_key_password',
|
249
|
+
- 'admin_token', 'connection'
|
250
|
+
+ "admin_password", "memcache_secret_key", "password",
|
251
|
+
+ "qpid_password", "rabbit_password", "ssl_key_password",
|
252
|
+
+ "xenapi_connection_password", "connection"
|
253
|
+
]
|
254
|
+
|
255
|
+
- regexp = r"((?m)^\s*#*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
256
|
+
-
|
257
|
+
- self.do_file_sub('/etc/sahara/sahara.conf', regexp, r"\1*********")
|
258
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
259
|
+
+ self.do_path_regex_sub("/etc/sahara/*", regexp, r"\1*********")
|
260
|
+
|
261
|
+
|
262
|
+
class DebianOpenStackSahara(OpenStackSahara, DebianPlugin, UbuntuPlugin):
|
263
|
+
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
|
264
|
+
index f0f94bb..f337331 100644
|
265
|
+
--- a/sos/plugins/openstack_swift.py
|
266
|
+
+++ b/sos/plugins/openstack_swift.py
|
267
|
+
@@ -33,6 +33,17 @@ class OpenStackSwift(Plugin):
|
268
|
+
# Swift
|
269
|
+
self.add_copy_spec("/etc/swift/")
|
270
|
+
|
271
|
+
+ def postproc(self):
|
272
|
+
+ protect_keys = [
|
273
|
+
+ "ldap_dns_password", "neutron_admin_password", "rabbit_password",
|
274
|
+
+ "qpid_password", "powervm_mgr_passwd", "virtual_power_host_pass",
|
275
|
+
+ "xenapi_connection_password", "password", "host_password",
|
276
|
+
+ "vnc_password", "connection", "sql_connection", "admin_password"
|
277
|
+
+ ]
|
278
|
+
+
|
279
|
+
+ regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
280
|
+
+ self.do_path_regex_sub("/etc/swift/*.conf*", regexp, r"\1*********")
|
281
|
+
+
|
282
|
+
|
283
|
+
class DebianOpenStackSwift(OpenStackSwift, DebianPlugin, UbuntuPlugin):
|
284
|
+
|
285
|
+
--
|
286
|
+
1.8.3.1
|
287
|
+
|
288
|
+
From 08ba22aebb066de389cffed414a725e61a6b86d7 Mon Sep 17 00:00:00 2001
|
289
|
+
From: Pavel Moravec <pmoravec@redhat.com>
|
290
|
+
Date: Mon, 7 Sep 2015 09:54:17 +0200
|
291
|
+
Subject: [PATCH] [openstack_neutron] obfuscate server_auth in restproxy.ini
|
292
|
+
|
293
|
+
server_auth secrets in /etc/neutron/plugins/ml2/restproxy.ini need to be
|
294
|
+
obfuscated.
|
295
|
+
|
296
|
+
Resolves: #639
|
297
|
+
|
298
|
+
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
299
|
+
---
|
300
|
+
sos/plugins/openstack_neutron.py | 2 +-
|
301
|
+
1 file changed, 1 insertion(+), 1 deletion(-)
|
302
|
+
|
303
|
+
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
|
304
|
+
index 91ee9f5..fc494d2 100644
|
305
|
+
--- a/sos/plugins/openstack_neutron.py
|
306
|
+
+++ b/sos/plugins/openstack_neutron.py
|
307
|
+
@@ -58,7 +58,7 @@ class Neutron(Plugin):
|
308
|
+
"crd_password", "primary_l3_host_password", "serverauth",
|
309
|
+
"ucsm_password", "ha_vrrp_auth_password", "ssl_key_password",
|
310
|
+
"nsx_password", "vcenter_password", "edge_appliance_password",
|
311
|
+
- "tenant_admin_password", "apic_password"
|
312
|
+
+ "tenant_admin_password", "apic_password", "server_auth"
|
313
|
+
]
|
314
|
+
regexp = r"((?m)^\s*(%s)\s*=\s*)(.*)" % "|".join(protect_keys)
|
315
|
+
|
316
|
+
--
|
317
|
+
1.8.3.1
|
318
|
+
|
@@ -1,1288 +0,0 @@
|
|
1
|
-
diff -uNrp sos-3.0.orig/po/af.po sos-3.0/po/af.po
|
2
|
-
--- sos-3.0.orig/po/af.po 2013-06-10 12:35:56.000000000 -0500
|
3
|
-
+++ sos-3.0/po/af.po 2014-06-21 11:15:36.435724571 -0500
|
4
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
5
|
-
msgstr ""
|
6
|
-
|
7
|
-
#: ../sos/policyredhat.py:399
|
8
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
9
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
10
|
-
msgstr ""
|
11
|
-
|
12
|
-
#: ../sos/policyredhat.py:401
|
13
|
-
diff -uNrp sos-3.0.orig/po/am.po sos-3.0/po/am.po
|
14
|
-
--- sos-3.0.orig/po/am.po 2013-06-10 12:35:56.000000000 -0500
|
15
|
-
+++ sos-3.0/po/am.po 2014-06-21 11:15:36.436724563 -0500
|
16
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
17
|
-
msgstr ""
|
18
|
-
|
19
|
-
#: ../sos/policyredhat.py:399
|
20
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
21
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
22
|
-
msgstr ""
|
23
|
-
|
24
|
-
#: ../sos/policyredhat.py:401
|
25
|
-
diff -uNrp sos-3.0.orig/po/ar.po sos-3.0/po/ar.po
|
26
|
-
--- sos-3.0.orig/po/ar.po 2013-06-10 12:35:56.000000000 -0500
|
27
|
-
+++ sos-3.0/po/ar.po 2014-06-21 11:16:38.081245080 -0500
|
28
|
-
@@ -179,8 +179,8 @@ msgid "Cannot upload to specified URL."
|
29
|
-
msgstr "لا يمكن الرفع للعنوان المحدّد"
|
30
|
-
|
31
|
-
#: ../sos/policyredhat.py:399
|
32
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
33
|
-
-msgstr "صودفت مشكلة برفع تقريرك إلى دعم Red Hat. "
|
34
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
35
|
-
+msgstr "صودفت مشكلة برفع تقريرك إلى دعم CentOS. "
|
36
|
-
|
37
|
-
#: ../sos/policyredhat.py:401
|
38
|
-
#, python-format
|
39
|
-
diff -uNrp sos-3.0.orig/po/as.po sos-3.0/po/as.po
|
40
|
-
--- sos-3.0.orig/po/as.po 2013-06-10 12:35:56.000000000 -0500
|
41
|
-
+++ sos-3.0/po/as.po 2014-06-21 11:15:36.437724555 -0500
|
42
|
-
@@ -85,11 +85,11 @@ msgid ""
|
43
|
-
"No changes will be made to your system.\n"
|
44
|
-
"\n"
|
45
|
-
msgstr ""
|
46
|
-
-"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু Red Hat Enterprise Linux\n"
|
47
|
-
+"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু CentOS Enterprise Linux\n"
|
48
|
-
"প্ৰণালীৰ প্ৰতিষ্ঠা সম্পৰ্কে বিশদ তথ্য সংগ্ৰহ কৰা হ'ব ।\n"
|
49
|
-
"তথ্য সংগ্ৰহৰ পিছত /tmp পঞ্জিকাৰ অধীন এটা আৰ্কাইভ নিৰ্মিত হয় ।\n"
|
50
|
-
"এই আৰ্কাইভ আপুনি সহায়তা প্ৰতিনিধিৰ কাশত পঠায় দিব পাৰে ।\n"
|
51
|
-
-"Red Hat দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n"
|
52
|
-
+"CentOS দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n"
|
53
|
-
"আৰু ইয়াৰ গোপনীয়তা বজায় ৰাখা হ'ব ।\n"
|
54
|
-
"\n"
|
55
|
-
"এই কাম সম্পন্ন হ'বলৈ কিছু সময় ব্যয় হ'ব পাৰে ।\n"
|
56
|
-
@@ -184,14 +184,14 @@ msgid "Cannot upload to specified URL."
|
57
|
-
msgstr "উল্লিখিত URL-এ আপলোড কৰিবলৈ ব্যৰ্থ ।"
|
58
|
-
|
59
|
-
#: ../sos/policyredhat.py:399
|
60
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
61
|
-
-msgstr "আপোনাৰ ৰিপোৰ্টটি Red Hat সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।"
|
62
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
63
|
-
+msgstr "আপোনাৰ ৰিপোৰ্টটি CentOS সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।"
|
64
|
-
|
65
|
-
#: ../sos/policyredhat.py:401
|
66
|
-
#, fuzzy, python-format
|
67
|
-
msgid "Your report was successfully uploaded to %s with name:"
|
68
|
-
msgstr ""
|
69
|
-
-"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে Red Hat-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড "
|
70
|
-
+"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে CentOS-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড "
|
71
|
-
"কৰা হৈছে:"
|
72
|
-
|
73
|
-
#: ../sos/policyredhat.py:404
|
74
|
-
diff -uNrp sos-3.0.orig/po/ast.po sos-3.0/po/ast.po
|
75
|
-
--- sos-3.0.orig/po/ast.po 2013-06-10 12:35:56.000000000 -0500
|
76
|
-
+++ sos-3.0/po/ast.po 2014-06-21 11:17:08.318010034 -0500
|
77
|
-
@@ -86,10 +86,10 @@ msgid ""
|
78
|
-
"\n"
|
79
|
-
msgstr ""
|
80
|
-
"Esta utilidá recueyerá dalguna información detallada sobro'l\n"
|
81
|
-
-"hardware y la configuración del to sistema Red Hat Enterprise Linux.\n"
|
82
|
-
+"hardware y la configuración del to sistema CentOS Enterprise Linux.\n"
|
83
|
-
"La información recuéyese y críase un ficheru baxo /tmp.\n"
|
84
|
-
"Ésti puede mandase al to representante de sofitu.\n"
|
85
|
-
-"Red Hat usará esta información pa diagnosticar el sistema\n"
|
86
|
-
+"CentOS usará esta información pa diagnosticar el sistema\n"
|
87
|
-
"únicamente y considerará esta información como confidencial.\n"
|
88
|
-
"\n"
|
89
|
-
"Esti procesu va llevar un tiempu pa completase.\n"
|
90
|
-
@@ -184,14 +184,14 @@ msgid "Cannot upload to specified URL."
|
91
|
-
msgstr "Nun se puede cargar a la URL especificada."
|
92
|
-
|
93
|
-
#: ../sos/policyredhat.py:399
|
94
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
95
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
96
|
-
msgstr ""
|
97
|
-
-"Hebo un problema al cargar el to informe al equipu d'asistencia de Red Hat"
|
98
|
-
+"Hebo un problema al cargar el to informe al equipu d'asistencia de CentOS"
|
99
|
-
|
100
|
-
#: ../sos/policyredhat.py:401
|
101
|
-
#, fuzzy, python-format
|
102
|
-
msgid "Your report was successfully uploaded to %s with name:"
|
103
|
-
-msgstr "El to informe cargóse bien a los sirvidores ftp e Red Hat col nome:"
|
104
|
-
+msgstr "El to informe cargóse bien a los sirvidores ftp e CentOS col nome:"
|
105
|
-
|
106
|
-
#: ../sos/policyredhat.py:404
|
107
|
-
msgid "Please communicate this name to your support representative."
|
108
|
-
diff -uNrp sos-3.0.orig/po/be.po sos-3.0/po/be.po
|
109
|
-
--- sos-3.0.orig/po/be.po 2013-06-10 12:35:56.000000000 -0500
|
110
|
-
+++ sos-3.0/po/be.po 2014-06-21 11:15:36.438724547 -0500
|
111
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
112
|
-
msgstr ""
|
113
|
-
|
114
|
-
#: ../sos/policyredhat.py:399
|
115
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
116
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
117
|
-
msgstr ""
|
118
|
-
|
119
|
-
#: ../sos/policyredhat.py:401
|
120
|
-
diff -uNrp sos-3.0.orig/po/bg.po sos-3.0/po/bg.po
|
121
|
-
--- sos-3.0.orig/po/bg.po 2013-06-10 12:35:56.000000000 -0500
|
122
|
-
+++ sos-3.0/po/bg.po 2014-06-21 11:15:36.439724539 -0500
|
123
|
-
@@ -172,9 +172,9 @@ msgid "Cannot upload to specified URL."
|
124
|
-
msgstr "Не може да се качи на посочения URL"
|
125
|
-
|
126
|
-
#: ../sos/policyredhat.py:399
|
127
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
128
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
129
|
-
msgstr ""
|
130
|
-
-"Възникна проблем при качването на вашия отчет на проддръжката на Red Hat."
|
131
|
-
+"Възникна проблем при качването на вашия отчет на проддръжката на CentOS."
|
132
|
-
|
133
|
-
#: ../sos/policyredhat.py:401
|
134
|
-
#, python-format
|
135
|
-
diff -uNrp sos-3.0.orig/po/bn_IN.po sos-3.0/po/bn_IN.po
|
136
|
-
--- sos-3.0.orig/po/bn_IN.po 2013-06-10 12:35:56.000000000 -0500
|
137
|
-
+++ sos-3.0/po/bn_IN.po 2014-06-21 11:15:36.440724532 -0500
|
138
|
-
@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL."
|
139
|
-
msgstr "উল্লিখিত URL-এ আপলোড করতে ব্যর্থ।"
|
140
|
-
|
141
|
-
#: ../sos/policyredhat.py:399
|
142
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
143
|
-
-msgstr "আপনার রিপোর্টটি Red Hat সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।"
|
144
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
145
|
-
+msgstr "আপনার রিপোর্টটি CentOS সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।"
|
146
|
-
|
147
|
-
#: ../sos/policyredhat.py:401
|
148
|
-
#, python-format
|
149
|
-
diff -uNrp sos-3.0.orig/po/bn.po sos-3.0/po/bn.po
|
150
|
-
--- sos-3.0.orig/po/bn.po 2013-06-10 12:35:56.000000000 -0500
|
151
|
-
+++ sos-3.0/po/bn.po 2014-06-21 11:15:36.440724532 -0500
|
152
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
153
|
-
msgstr ""
|
154
|
-
|
155
|
-
#: ../sos/policyredhat.py:399
|
156
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
157
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
158
|
-
msgstr ""
|
159
|
-
|
160
|
-
#: ../sos/policyredhat.py:401
|
161
|
-
diff -uNrp sos-3.0.orig/po/bs.po sos-3.0/po/bs.po
|
162
|
-
--- sos-3.0.orig/po/bs.po 2013-06-10 12:35:56.000000000 -0500
|
163
|
-
+++ sos-3.0/po/bs.po 2014-06-21 11:15:36.441724524 -0500
|
164
|
-
@@ -189,8 +189,8 @@ msgid "Cannot upload to specified URL."
|
165
|
-
msgstr "Nije se mogao postaviti specificirani URL,"
|
166
|
-
|
167
|
-
#: ../sos/policyredhat.py:399
|
168
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
169
|
-
-msgstr "Bilo je problema u postavljanju vaseg izvjestaja na Red Hat podrsku. "
|
170
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
171
|
-
+msgstr "Bilo je problema u postavljanju vaseg izvjestaja na CentOS podrsku. "
|
172
|
-
|
173
|
-
#: ../sos/policyredhat.py:401
|
174
|
-
#, python-format
|
175
|
-
diff -uNrp sos-3.0.orig/po/ca.po sos-3.0/po/ca.po
|
176
|
-
--- sos-3.0.orig/po/ca.po 2013-06-10 12:35:56.000000000 -0500
|
177
|
-
+++ sos-3.0/po/ca.po 2014-06-21 11:15:36.442724516 -0500
|
178
|
-
@@ -194,8 +194,8 @@ msgid "Cannot upload to specified URL."
|
179
|
-
msgstr "No es pot pujar a la URL especificada."
|
180
|
-
|
181
|
-
#: ../sos/policyredhat.py:399
|
182
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
183
|
-
-msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de Red Hat."
|
184
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
185
|
-
+msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de CentOS."
|
186
|
-
|
187
|
-
#: ../sos/policyredhat.py:401
|
188
|
-
#, python-format
|
189
|
-
diff -uNrp sos-3.0.orig/po/cs.po sos-3.0/po/cs.po
|
190
|
-
--- sos-3.0.orig/po/cs.po 2013-06-10 12:35:56.000000000 -0500
|
191
|
-
+++ sos-3.0/po/cs.po 2014-06-21 11:15:36.443724508 -0500
|
192
|
-
@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
|
193
|
-
msgstr "Nelze uložit na uvedené URL."
|
194
|
-
|
195
|
-
#: ../sos/policyredhat.py:399
|
196
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
197
|
-
-msgstr "Při odesílání zprávy do firmy Red Hat vznikla chyba."
|
198
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
199
|
-
+msgstr "Při odesílání zprávy do firmy CentOS vznikla chyba."
|
200
|
-
|
201
|
-
#: ../sos/policyredhat.py:401
|
202
|
-
#, python-format
|
203
|
-
diff -uNrp sos-3.0.orig/po/cy.po sos-3.0/po/cy.po
|
204
|
-
--- sos-3.0.orig/po/cy.po 2013-06-10 12:35:56.000000000 -0500
|
205
|
-
+++ sos-3.0/po/cy.po 2014-06-21 11:15:36.443724508 -0500
|
206
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
207
|
-
msgstr ""
|
208
|
-
|
209
|
-
#: ../sos/policyredhat.py:399
|
210
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
211
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
212
|
-
msgstr ""
|
213
|
-
|
214
|
-
#: ../sos/policyredhat.py:401
|
215
|
-
diff -uNrp sos-3.0.orig/po/da.po sos-3.0/po/da.po
|
216
|
-
--- sos-3.0.orig/po/da.po 2013-06-10 12:35:56.000000000 -0500
|
217
|
-
+++ sos-3.0/po/da.po 2014-06-21 11:15:36.444724501 -0500
|
218
|
-
@@ -184,9 +184,9 @@ msgid "Cannot upload to specified URL."
|
219
|
-
msgstr "Kan ikke overføre til den angivne URL."
|
220
|
-
|
221
|
-
#: ../sos/policyredhat.py:399
|
222
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
223
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
224
|
-
msgstr ""
|
225
|
-
-"Der opstod et problem under overførsel af din rapport til Red Hat-support."
|
226
|
-
+"Der opstod et problem under overførsel af din rapport til CentOS-support."
|
227
|
-
|
228
|
-
#: ../sos/policyredhat.py:401
|
229
|
-
#, python-format
|
230
|
-
diff -uNrp sos-3.0.orig/po/de_CH.po sos-3.0/po/de_CH.po
|
231
|
-
--- sos-3.0.orig/po/de_CH.po 2013-06-10 12:35:56.000000000 -0500
|
232
|
-
+++ sos-3.0/po/de_CH.po 2014-06-21 11:15:36.444724501 -0500
|
233
|
-
@@ -87,10 +87,10 @@ msgid ""
|
234
|
-
"\n"
|
235
|
-
msgstr ""
|
236
|
-
"Dieses Dienstprogramm sammelt einige detaillierte Informationen\n"
|
237
|
-
-"zur Hardware und Einrichtung Ihres Red Hat Enterprise Linux Systems.\n"
|
238
|
-
+"zur Hardware und Einrichtung Ihres CentOS Enterprise Linux Systems.\n"
|
239
|
-
"Die Informationen werden gesammelt und in einem Archiv unter /tmp\n"
|
240
|
-
"zusammengefasst, welches Sie an einen Support-Vertreter schicken\n"
|
241
|
-
-"können. Red Hat verwendet diese Informationen AUSSCHLIESSLICH zu\n"
|
242
|
-
+"können. CentOS verwendet diese Informationen AUSSCHLIESSLICH zu\n"
|
243
|
-
"Diagnosezwecken und behandelt sie als vertrauliche Informationen.\n"
|
244
|
-
"\n"
|
245
|
-
"Die Fertigstellung dieses Prozesses kann eine Weile dauern.\n"
|
246
|
-
@@ -188,14 +188,14 @@ msgid "Cannot upload to specified URL."
|
247
|
-
msgstr "Hochladen zu speziellem URL scheiterte."
|
248
|
-
|
249
|
-
#: ../sos/policyredhat.py:399
|
250
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
251
|
-
-msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf."
|
252
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
253
|
-
+msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf."
|
254
|
-
|
255
|
-
#: ../sos/policyredhat.py:401
|
256
|
-
#, fuzzy, python-format
|
257
|
-
msgid "Your report was successfully uploaded to %s with name:"
|
258
|
-
msgstr ""
|
259
|
-
-"Ihr Bericht wurde erfolgreich auf den Red Hat FTP-Server hochgeladen, mit "
|
260
|
-
+"Ihr Bericht wurde erfolgreich auf den CentOS FTP-Server hochgeladen, mit "
|
261
|
-
"dem Namen:"
|
262
|
-
|
263
|
-
#: ../sos/policyredhat.py:404
|
264
|
-
diff -uNrp sos-3.0.orig/po/de.po sos-3.0/po/de.po
|
265
|
-
--- sos-3.0.orig/po/de.po 2013-06-10 12:35:56.000000000 -0500
|
266
|
-
+++ sos-3.0/po/de.po 2014-06-21 11:15:36.445724493 -0500
|
267
|
-
@@ -191,8 +191,8 @@ msgid "Cannot upload to specified URL."
|
268
|
-
msgstr "Hochladen zu spezieller URL scheiterte."
|
269
|
-
|
270
|
-
#: ../sos/policyredhat.py:399
|
271
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
272
|
-
-msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf."
|
273
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
274
|
-
+msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf."
|
275
|
-
|
276
|
-
#: ../sos/policyredhat.py:401
|
277
|
-
#, python-format
|
278
|
-
diff -uNrp sos-3.0.orig/po/el.po sos-3.0/po/el.po
|
279
|
-
--- sos-3.0.orig/po/el.po 2013-06-10 12:35:56.000000000 -0500
|
280
|
-
+++ sos-3.0/po/el.po 2014-06-21 11:15:36.445724493 -0500
|
281
|
-
@@ -84,10 +84,10 @@ msgid ""
|
282
|
-
"\n"
|
283
|
-
msgstr ""
|
284
|
-
"Αυτό το εργαλείο θα συγκετρώσει ορισμένες πληροφορίες για τον υπολογιστή σας "
|
285
|
-
-"και την εγκατάσταση του Red Hat Enterprise Linux συστήματος.\n"
|
286
|
-
+"και την εγκατάσταση του CentOS Enterprise Linux συστήματος.\n"
|
287
|
-
"Οι πληροφορίες συγκετρώνονται και το archive δημιουργήται στο\n"
|
288
|
-
"/tmp,το οποίο και μπορείτε να στείλετε σε έναν αντιπρόσωπο υποστήριξης.\n"
|
289
|
-
-"Η Red Hat θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n"
|
290
|
-
+"Η CentOS θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n"
|
291
|
-
"και θα παραμείνουν εμπιστευτηκά.\n"
|
292
|
-
"\n"
|
293
|
-
|
294
|
-
@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL."
|
295
|
-
msgstr "Δεν είναι δυνατό το upload στο καθορισμένο URL."
|
296
|
-
|
297
|
-
#: ../sos/policyredhat.py:399
|
298
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
299
|
-
-msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην Red Hat."
|
300
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
301
|
-
+msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην CentOS."
|
302
|
-
|
303
|
-
#: ../sos/policyredhat.py:401
|
304
|
-
#, python-format
|
305
|
-
diff -uNrp sos-3.0.orig/po/en_GB.po sos-3.0/po/en_GB.po
|
306
|
-
--- sos-3.0.orig/po/en_GB.po 2013-06-10 12:35:56.000000000 -0500
|
307
|
-
+++ sos-3.0/po/en_GB.po 2014-06-21 11:15:36.446724485 -0500
|
308
|
-
@@ -83,10 +83,10 @@ msgid ""
|
309
|
-
"\n"
|
310
|
-
msgstr ""
|
311
|
-
"This utility will collect some detailed information about the\n"
|
312
|
-
-"hardware and setup of your Red Hat Enterprise Linux system.\n"
|
313
|
-
+"hardware and setup of your CentOS Enterprise Linux system.\n"
|
314
|
-
"The information is collected and an archive is packaged under\n"
|
315
|
-
"/tmp, which you can send to a support representative.\n"
|
316
|
-
-"Red Hat will use this information for diagnostic purposes ONLY\n"
|
317
|
-
+"CentOS will use this information for diagnostic purposes ONLY\n"
|
318
|
-
"and it will be considered confidential information.\n"
|
319
|
-
"\n"
|
320
|
-
"This process may take a while to complete.\n"
|
321
|
-
@@ -181,14 +181,14 @@ msgid "Cannot upload to specified URL."
|
322
|
-
msgstr "Cannot upload to specified URL."
|
323
|
-
|
324
|
-
#: ../sos/policyredhat.py:399
|
325
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
326
|
-
-msgstr "There was a problem uploading your report to Red Hat support."
|
327
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
328
|
-
+msgstr "There was a problem uploading your report to CentOS support."
|
329
|
-
|
330
|
-
#: ../sos/policyredhat.py:401
|
331
|
-
#, fuzzy, python-format
|
332
|
-
msgid "Your report was successfully uploaded to %s with name:"
|
333
|
-
msgstr ""
|
334
|
-
-"Your report was successfully uploaded to Red Hat's ftp server with name:"
|
335
|
-
+"Your report was successfully uploaded to CentOS's ftp server with name:"
|
336
|
-
|
337
|
-
#: ../sos/policyredhat.py:404
|
338
|
-
msgid "Please communicate this name to your support representative."
|
339
|
-
diff -uNrp sos-3.0.orig/po/en.po sos-3.0/po/en.po
|
340
|
-
--- sos-3.0.orig/po/en.po 2013-06-10 12:35:56.000000000 -0500
|
341
|
-
+++ sos-3.0/po/en.po 2014-06-21 11:15:36.446724485 -0500
|
342
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
343
|
-
msgstr ""
|
344
|
-
|
345
|
-
#: ../sos/policyredhat.py:399
|
346
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
347
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
348
|
-
msgstr ""
|
349
|
-
|
350
|
-
#: ../sos/policyredhat.py:401
|
351
|
-
diff -uNrp sos-3.0.orig/po/es.po sos-3.0/po/es.po
|
352
|
-
--- sos-3.0.orig/po/es.po 2013-06-10 12:35:56.000000000 -0500
|
353
|
-
+++ sos-3.0/po/es.po 2014-06-21 11:17:24.153886936 -0500
|
354
|
-
@@ -189,9 +189,9 @@ msgid "Cannot upload to specified URL."
|
355
|
-
msgstr "No se puede cargar a la URL especificada."
|
356
|
-
|
357
|
-
#: ../sos/policyredhat.py:399
|
358
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
359
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
360
|
-
msgstr ""
|
361
|
-
-"Hubo un problema al cargar su reporte al equipo de asistencia de Red Hat"
|
362
|
-
+"Hubo un problema al cargar su reporte al equipo de asistencia de CentOS"
|
363
|
-
|
364
|
-
#: ../sos/policyredhat.py:401
|
365
|
-
#, python-format
|
366
|
-
diff -uNrp sos-3.0.orig/po/et.po sos-3.0/po/et.po
|
367
|
-
--- sos-3.0.orig/po/et.po 2013-06-10 12:35:56.000000000 -0500
|
368
|
-
+++ sos-3.0/po/et.po 2014-06-21 11:15:36.447724477 -0500
|
369
|
-
@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
|
370
|
-
msgstr ""
|
371
|
-
|
372
|
-
#: ../sos/policyredhat.py:399
|
373
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
374
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
375
|
-
msgstr ""
|
376
|
-
|
377
|
-
#: ../sos/policyredhat.py:401
|
378
|
-
diff -uNrp sos-3.0.orig/po/eu_ES.po sos-3.0/po/eu_ES.po
|
379
|
-
--- sos-3.0.orig/po/eu_ES.po 2013-06-10 12:35:56.000000000 -0500
|
380
|
-
+++ sos-3.0/po/eu_ES.po 2014-06-21 11:15:36.448724469 -0500
|
381
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
382
|
-
msgstr ""
|
383
|
-
|
384
|
-
#: ../sos/policyredhat.py:399
|
385
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
386
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
387
|
-
msgstr ""
|
388
|
-
|
389
|
-
#: ../sos/policyredhat.py:401
|
390
|
-
diff -uNrp sos-3.0.orig/po/fa.po sos-3.0/po/fa.po
|
391
|
-
--- sos-3.0.orig/po/fa.po 2013-06-10 12:35:56.000000000 -0500
|
392
|
-
+++ sos-3.0/po/fa.po 2014-06-21 11:15:36.448724469 -0500
|
393
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
394
|
-
msgstr ""
|
395
|
-
|
396
|
-
#: ../sos/policyredhat.py:399
|
397
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
398
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
399
|
-
msgstr ""
|
400
|
-
|
401
|
-
#: ../sos/policyredhat.py:401
|
402
|
-
diff -uNrp sos-3.0.orig/po/fi.po sos-3.0/po/fi.po
|
403
|
-
--- sos-3.0.orig/po/fi.po 2013-06-10 12:35:56.000000000 -0500
|
404
|
-
+++ sos-3.0/po/fi.po 2014-06-21 11:17:38.280777198 -0500
|
405
|
-
@@ -179,8 +179,8 @@ msgid "Cannot upload to specified URL."
|
406
|
-
msgstr "Annettuun osoitteeseen ei voida lähettää."
|
407
|
-
|
408
|
-
#: ../sos/policyredhat.py:399
|
409
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
410
|
-
-msgstr "Raportin lähettämisessä Red Hatin käyttötukeen oli ongelmia."
|
411
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
412
|
-
+msgstr "Raportin lähettämisessä CentOSin käyttötukeen oli ongelmia."
|
413
|
-
|
414
|
-
#: ../sos/policyredhat.py:401
|
415
|
-
#, python-format
|
416
|
-
diff -uNrp sos-3.0.orig/po/fr.po sos-3.0/po/fr.po
|
417
|
-
--- sos-3.0.orig/po/fr.po 2013-06-10 12:35:56.000000000 -0500
|
418
|
-
+++ sos-3.0/po/fr.po 2014-06-21 11:15:36.449724462 -0500
|
419
|
-
@@ -188,10 +188,10 @@ msgid "Cannot upload to specified URL."
|
420
|
-
msgstr "Impossible de le télécharger vers l'URL spécifié."
|
421
|
-
|
422
|
-
#: ../sos/policyredhat.py:399
|
423
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
424
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
425
|
-
msgstr ""
|
426
|
-
"Une erreur s'est produite lors du téléchargement de votre rapport vers le "
|
427
|
-
-"support Red Hat."
|
428
|
-
+"support CentOS."
|
429
|
-
|
430
|
-
#: ../sos/policyredhat.py:401
|
431
|
-
#, python-format
|
432
|
-
diff -uNrp sos-3.0.orig/po/gl.po sos-3.0/po/gl.po
|
433
|
-
--- sos-3.0.orig/po/gl.po 2013-06-10 12:35:56.000000000 -0500
|
434
|
-
+++ sos-3.0/po/gl.po 2014-06-21 11:15:36.450724454 -0500
|
435
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
436
|
-
msgstr ""
|
437
|
-
|
438
|
-
#: ../sos/policyredhat.py:399
|
439
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
440
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
441
|
-
msgstr ""
|
442
|
-
|
443
|
-
#: ../sos/policyredhat.py:401
|
444
|
-
diff -uNrp sos-3.0.orig/po/gu.po sos-3.0/po/gu.po
|
445
|
-
--- sos-3.0.orig/po/gu.po 2013-06-10 12:35:56.000000000 -0500
|
446
|
-
+++ sos-3.0/po/gu.po 2014-06-21 11:15:36.450724454 -0500
|
447
|
-
@@ -186,8 +186,8 @@ msgid "Cannot upload to specified URL."
|
448
|
-
msgstr "સ્પષ્ટ કરેલ URL અપલોડ કરી શકતા નથી."
|
449
|
-
|
450
|
-
#: ../sos/policyredhat.py:399
|
451
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
452
|
-
-msgstr "તમારા અહેવાલને Red Hat આધારમાં અપલોડ કરવામાં સમસ્યા હતી."
|
453
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
454
|
-
+msgstr "તમારા અહેવાલને CentOS આધારમાં અપલોડ કરવામાં સમસ્યા હતી."
|
455
|
-
|
456
|
-
#: ../sos/policyredhat.py:401
|
457
|
-
#, python-format
|
458
|
-
diff -uNrp sos-3.0.orig/po/he.po sos-3.0/po/he.po
|
459
|
-
--- sos-3.0.orig/po/he.po 2013-06-10 12:35:56.000000000 -0500
|
460
|
-
+++ sos-3.0/po/he.po 2014-06-21 11:15:36.450724454 -0500
|
461
|
-
@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
|
462
|
-
msgstr ""
|
463
|
-
|
464
|
-
#: ../sos/policyredhat.py:399
|
465
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
466
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
467
|
-
msgstr ""
|
468
|
-
|
469
|
-
#: ../sos/policyredhat.py:401
|
470
|
-
diff -uNrp sos-3.0.orig/po/hi.po sos-3.0/po/hi.po
|
471
|
-
--- sos-3.0.orig/po/hi.po 2013-06-10 12:35:56.000000000 -0500
|
472
|
-
+++ sos-3.0/po/hi.po 2014-06-21 11:15:36.451724446 -0500
|
473
|
-
@@ -187,8 +187,8 @@ msgid "Cannot upload to specified URL."
|
474
|
-
msgstr "निर्दिष्ट URL अपलोड नहीं कर सकता है."
|
475
|
-
|
476
|
-
#: ../sos/policyredhat.py:399
|
477
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
478
|
-
-msgstr "आपके रिपोर्ट को Red Hat समर्थन में अपलोड करने में समस्या थी."
|
479
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
480
|
-
+msgstr "आपके रिपोर्ट को CentOS समर्थन में अपलोड करने में समस्या थी."
|
481
|
-
|
482
|
-
#: ../sos/policyredhat.py:401
|
483
|
-
#, python-format
|
484
|
-
diff -uNrp sos-3.0.orig/po/hr.po sos-3.0/po/hr.po
|
485
|
-
--- sos-3.0.orig/po/hr.po 2013-06-10 12:35:56.000000000 -0500
|
486
|
-
+++ sos-3.0/po/hr.po 2014-06-21 11:15:36.451724446 -0500
|
487
|
-
@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
|
488
|
-
msgstr ""
|
489
|
-
|
490
|
-
#: ../sos/policyredhat.py:399
|
491
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
492
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
493
|
-
msgstr ""
|
494
|
-
|
495
|
-
#: ../sos/policyredhat.py:401
|
496
|
-
diff -uNrp sos-3.0.orig/po/hu.po sos-3.0/po/hu.po
|
497
|
-
--- sos-3.0.orig/po/hu.po 2013-06-10 12:35:56.000000000 -0500
|
498
|
-
+++ sos-3.0/po/hu.po 2014-06-21 11:15:36.452724438 -0500
|
499
|
-
@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL."
|
500
|
-
msgstr "Nem lehet az URL-re feltölteni."
|
501
|
-
|
502
|
-
#: ../sos/policyredhat.py:399
|
503
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
504
|
-
-msgstr "A jelentést a Red Hat támogatáshoz feltöltvén baj történt."
|
505
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
506
|
-
+msgstr "A jelentést a CentOS támogatáshoz feltöltvén baj történt."
|
507
|
-
|
508
|
-
#: ../sos/policyredhat.py:401
|
509
|
-
#, python-format
|
510
|
-
diff -uNrp sos-3.0.orig/po/hy.po sos-3.0/po/hy.po
|
511
|
-
--- sos-3.0.orig/po/hy.po 2013-06-10 12:35:56.000000000 -0500
|
512
|
-
+++ sos-3.0/po/hy.po 2014-06-21 11:15:36.452724438 -0500
|
513
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
514
|
-
msgstr ""
|
515
|
-
|
516
|
-
#: ../sos/policyredhat.py:399
|
517
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
518
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
519
|
-
msgstr ""
|
520
|
-
|
521
|
-
#: ../sos/policyredhat.py:401
|
522
|
-
diff -uNrp sos-3.0.orig/po/id.po sos-3.0/po/id.po
|
523
|
-
--- sos-3.0.orig/po/id.po 2013-06-10 12:35:56.000000000 -0500
|
524
|
-
+++ sos-3.0/po/id.po 2014-06-21 11:15:36.453724430 -0500
|
525
|
-
@@ -171,7 +171,7 @@ msgid "Cannot upload to specified URL."
|
526
|
-
msgstr ""
|
527
|
-
|
528
|
-
#: ../sos/policyredhat.py:399
|
529
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
530
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
531
|
-
msgstr ""
|
532
|
-
|
533
|
-
#: ../sos/policyredhat.py:401
|
534
|
-
diff -uNrp sos-3.0.orig/po/ilo.po sos-3.0/po/ilo.po
|
535
|
-
--- sos-3.0.orig/po/ilo.po 2013-06-10 12:35:56.000000000 -0500
|
536
|
-
+++ sos-3.0/po/ilo.po 2014-06-21 11:15:36.453724430 -0500
|
537
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
538
|
-
msgstr ""
|
539
|
-
|
540
|
-
#: ../sos/policyredhat.py:399
|
541
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
542
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
543
|
-
msgstr ""
|
544
|
-
|
545
|
-
#: ../sos/policyredhat.py:401
|
546
|
-
diff -uNrp sos-3.0.orig/po/is.po sos-3.0/po/is.po
|
547
|
-
--- sos-3.0.orig/po/is.po 2013-06-10 12:35:56.000000000 -0500
|
548
|
-
+++ sos-3.0/po/is.po 2014-06-21 11:15:36.453724430 -0500
|
549
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
550
|
-
msgstr ""
|
551
|
-
|
552
|
-
#: ../sos/policyredhat.py:399
|
553
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
554
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
555
|
-
msgstr ""
|
556
|
-
|
557
|
-
#: ../sos/policyredhat.py:401
|
558
|
-
diff -uNrp sos-3.0.orig/po/it.po sos-3.0/po/it.po
|
559
|
-
--- sos-3.0.orig/po/it.po 2013-06-10 12:35:56.000000000 -0500
|
560
|
-
+++ sos-3.0/po/it.po 2014-06-21 11:15:36.454724423 -0500
|
561
|
-
@@ -181,7 +181,7 @@ msgid "Cannot upload to specified URL."
|
562
|
-
msgstr "Impossibile inviare all'URL specificato."
|
563
|
-
|
564
|
-
#: ../sos/policyredhat.py:399
|
565
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
566
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
567
|
-
msgstr ""
|
568
|
-
"Si è verificato un problema nell'inviare il report al supporto tecnico Red "
|
569
|
-
"Hat."
|
570
|
-
diff -uNrp sos-3.0.orig/po/ja.po sos-3.0/po/ja.po
|
571
|
-
--- sos-3.0.orig/po/ja.po 2013-06-10 12:35:56.000000000 -0500
|
572
|
-
+++ sos-3.0/po/ja.po 2014-06-21 11:15:36.454724423 -0500
|
573
|
-
@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
|
574
|
-
msgstr "指定された URL にアップロードできません。"
|
575
|
-
|
576
|
-
#: ../sos/policyredhat.py:399
|
577
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
578
|
-
-msgstr "レポートを Red Hat サポートにアップロードするのに問題がありました。"
|
579
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
580
|
-
+msgstr "レポートを CentOS サポートにアップロードするのに問題がありました。"
|
581
|
-
|
582
|
-
#: ../sos/policyredhat.py:401
|
583
|
-
#, python-format
|
584
|
-
diff -uNrp sos-3.0.orig/po/ka.po sos-3.0/po/ka.po
|
585
|
-
--- sos-3.0.orig/po/ka.po 2013-06-10 12:35:56.000000000 -0500
|
586
|
-
+++ sos-3.0/po/ka.po 2014-06-21 11:15:36.455724415 -0500
|
587
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
588
|
-
msgstr ""
|
589
|
-
|
590
|
-
#: ../sos/policyredhat.py:399
|
591
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
592
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
593
|
-
msgstr ""
|
594
|
-
|
595
|
-
#: ../sos/policyredhat.py:401
|
596
|
-
diff -uNrp sos-3.0.orig/po/kn.po sos-3.0/po/kn.po
|
597
|
-
--- sos-3.0.orig/po/kn.po 2013-06-10 12:35:56.000000000 -0500
|
598
|
-
+++ sos-3.0/po/kn.po 2014-06-21 11:15:36.455724415 -0500
|
599
|
-
@@ -185,9 +185,9 @@ msgid "Cannot upload to specified URL."
|
600
|
-
msgstr "ಸೂಚಿಸಲಾದ URL ಅನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
|
601
|
-
|
602
|
-
#: ../sos/policyredhat.py:399
|
603
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
604
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
605
|
-
msgstr ""
|
606
|
-
-"ನಿಮ್ಮ ವರದಿಯನ್ನು Red Hat ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ."
|
607
|
-
+"ನಿಮ್ಮ ವರದಿಯನ್ನು CentOS ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ."
|
608
|
-
|
609
|
-
#: ../sos/policyredhat.py:401
|
610
|
-
#, python-format
|
611
|
-
diff -uNrp sos-3.0.orig/po/ko.po sos-3.0/po/ko.po
|
612
|
-
--- sos-3.0.orig/po/ko.po 2013-06-10 12:35:56.000000000 -0500
|
613
|
-
+++ sos-3.0/po/ko.po 2014-06-21 11:17:58.331621414 -0500
|
614
|
-
@@ -84,10 +84,10 @@ msgid ""
|
615
|
-
"No changes will be made to your system.\n"
|
616
|
-
"\n"
|
617
|
-
msgstr ""
|
618
|
-
-"이 유틸리티는 Red Hat Enterprise Linux 시스템의 하드웨어와 \n"
|
619
|
-
+"이 유틸리티는 CentOS Enterprise Linux 시스템의 하드웨어와 \n"
|
620
|
-
"시스템 설정 사항에 대한 상세 정보를 수집하게 됩니다. 수집된 \n"
|
621
|
-
"정보는 지원 담당자에게 보낼 수 있도록 /tmp 디렉토리 안에 \n"
|
622
|
-
-"아카이브로 저장됩니다. Red Hat은 이 정보를 문제 해결 목적으로만 사용하며 기"
|
623
|
-
+"아카이브로 저장됩니다. CentOS은 이 정보를 문제 해결 목적으로만 사용하며 기"
|
624
|
-
"밀 정보로 \n"
|
625
|
-
"취급할 것입니다. \n"
|
626
|
-
"\n"
|
627
|
-
@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
|
628
|
-
msgstr "지정된 URL에서 업로드할 수 없습니다."
|
629
|
-
|
630
|
-
#: ../sos/policyredhat.py:399
|
631
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
632
|
-
-msgstr "리포트를 Red Hat 지원 센터로 업로드하는 데 문제가 발생했습니다."
|
633
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
634
|
-
+msgstr "리포트를 CentOS 지원 센터로 업로드하는 데 문제가 발생했습니다."
|
635
|
-
|
636
|
-
#: ../sos/policyredhat.py:401
|
637
|
-
#, python-format
|
638
|
-
diff -uNrp sos-3.0.orig/po/ku.po sos-3.0/po/ku.po
|
639
|
-
--- sos-3.0.orig/po/ku.po 2013-06-10 12:35:56.000000000 -0500
|
640
|
-
+++ sos-3.0/po/ku.po 2014-06-21 11:15:36.456724407 -0500
|
641
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
642
|
-
msgstr ""
|
643
|
-
|
644
|
-
#: ../sos/policyredhat.py:399
|
645
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
646
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
647
|
-
msgstr ""
|
648
|
-
|
649
|
-
#: ../sos/policyredhat.py:401
|
650
|
-
diff -uNrp sos-3.0.orig/po/lo.po sos-3.0/po/lo.po
|
651
|
-
--- sos-3.0.orig/po/lo.po 2013-06-10 12:35:56.000000000 -0500
|
652
|
-
+++ sos-3.0/po/lo.po 2014-06-21 11:15:36.457724399 -0500
|
653
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
654
|
-
msgstr ""
|
655
|
-
|
656
|
-
#: ../sos/policyredhat.py:399
|
657
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
658
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
659
|
-
msgstr ""
|
660
|
-
|
661
|
-
#: ../sos/policyredhat.py:401
|
662
|
-
diff -uNrp sos-3.0.orig/po/lt.po sos-3.0/po/lt.po
|
663
|
-
--- sos-3.0.orig/po/lt.po 2013-06-10 12:35:56.000000000 -0500
|
664
|
-
+++ sos-3.0/po/lt.po 2014-06-21 11:15:36.457724399 -0500
|
665
|
-
@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
|
666
|
-
msgstr ""
|
667
|
-
|
668
|
-
#: ../sos/policyredhat.py:399
|
669
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
670
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
671
|
-
msgstr ""
|
672
|
-
|
673
|
-
#: ../sos/policyredhat.py:401
|
674
|
-
diff -uNrp sos-3.0.orig/po/lv.po sos-3.0/po/lv.po
|
675
|
-
--- sos-3.0.orig/po/lv.po 2013-06-10 12:35:56.000000000 -0500
|
676
|
-
+++ sos-3.0/po/lv.po 2014-06-21 11:15:36.458724392 -0500
|
677
|
-
@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
|
678
|
-
msgstr ""
|
679
|
-
|
680
|
-
#: ../sos/policyredhat.py:399
|
681
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
682
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
683
|
-
msgstr ""
|
684
|
-
|
685
|
-
#: ../sos/policyredhat.py:401
|
686
|
-
diff -uNrp sos-3.0.orig/po/mk.po sos-3.0/po/mk.po
|
687
|
-
--- sos-3.0.orig/po/mk.po 2013-06-10 12:35:56.000000000 -0500
|
688
|
-
+++ sos-3.0/po/mk.po 2014-06-21 11:15:36.459724384 -0500
|
689
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
690
|
-
msgstr ""
|
691
|
-
|
692
|
-
#: ../sos/policyredhat.py:399
|
693
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
694
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
695
|
-
msgstr ""
|
696
|
-
|
697
|
-
#: ../sos/policyredhat.py:401
|
698
|
-
diff -uNrp sos-3.0.orig/po/ml.po sos-3.0/po/ml.po
|
699
|
-
--- sos-3.0.orig/po/ml.po 2013-06-10 12:35:56.000000000 -0500
|
700
|
-
+++ sos-3.0/po/ml.po 2014-06-21 11:15:36.459724384 -0500
|
701
|
-
@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
|
702
|
-
msgstr "നല്കിയിരിക്കുന്ന URL-ലേക്ക് ഫയല് അപ്ലോഡ് ചെയ്യുവാന് സാധ്യമായില്ല "
|
703
|
-
|
704
|
-
#: ../sos/policyredhat.py:399
|
705
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
706
|
-
-msgstr "Red Hat-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്ട്ട് അയയ്ക്കുന്നതില് ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു."
|
707
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
708
|
-
+msgstr "CentOS-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്ട്ട് അയയ്ക്കുന്നതില് ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു."
|
709
|
-
|
710
|
-
#: ../sos/policyredhat.py:401
|
711
|
-
#, python-format
|
712
|
-
diff -uNrp sos-3.0.orig/po/mr.po sos-3.0/po/mr.po
|
713
|
-
--- sos-3.0.orig/po/mr.po 2013-06-10 12:35:56.000000000 -0500
|
714
|
-
+++ sos-3.0/po/mr.po 2014-06-21 11:15:36.460724376 -0500
|
715
|
-
@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL."
|
716
|
-
msgstr "निर्देशीत URL अपलोड करण्यास अशक्य."
|
717
|
-
|
718
|
-
#: ../sos/policyredhat.py:399
|
719
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
720
|
-
-msgstr "तुमचा अहवाल Red Hat सपोर्टकडे पाठवतेवेळी अडचण आढळली."
|
721
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
722
|
-
+msgstr "तुमचा अहवाल CentOS सपोर्टकडे पाठवतेवेळी अडचण आढळली."
|
723
|
-
|
724
|
-
#: ../sos/policyredhat.py:401
|
725
|
-
#, python-format
|
726
|
-
diff -uNrp sos-3.0.orig/po/ms.po sos-3.0/po/ms.po
|
727
|
-
--- sos-3.0.orig/po/ms.po 2013-06-10 12:35:56.000000000 -0500
|
728
|
-
+++ sos-3.0/po/ms.po 2014-06-21 11:15:36.461724368 -0500
|
729
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
730
|
-
msgstr ""
|
731
|
-
|
732
|
-
#: ../sos/policyredhat.py:399
|
733
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
734
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
735
|
-
msgstr ""
|
736
|
-
|
737
|
-
#: ../sos/policyredhat.py:401
|
738
|
-
diff -uNrp sos-3.0.orig/po/my.po sos-3.0/po/my.po
|
739
|
-
--- sos-3.0.orig/po/my.po 2013-06-10 12:35:56.000000000 -0500
|
740
|
-
+++ sos-3.0/po/my.po 2014-06-21 11:15:36.461724368 -0500
|
741
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
742
|
-
msgstr ""
|
743
|
-
|
744
|
-
#: ../sos/policyredhat.py:399
|
745
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
746
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
747
|
-
msgstr ""
|
748
|
-
|
749
|
-
#: ../sos/policyredhat.py:401
|
750
|
-
diff -uNrp sos-3.0.orig/po/nb.po sos-3.0/po/nb.po
|
751
|
-
--- sos-3.0.orig/po/nb.po 2013-06-10 12:35:56.000000000 -0500
|
752
|
-
+++ sos-3.0/po/nb.po 2014-06-21 11:15:36.462724360 -0500
|
753
|
-
@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
|
754
|
-
msgstr "Kan ikke laste opp til oppgitt URL."
|
755
|
-
|
756
|
-
#: ../sos/policyredhat.py:399
|
757
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
758
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
759
|
-
msgstr ""
|
760
|
-
|
761
|
-
#: ../sos/policyredhat.py:401
|
762
|
-
diff -uNrp sos-3.0.orig/po/nds.po sos-3.0/po/nds.po
|
763
|
-
--- sos-3.0.orig/po/nds.po 2013-06-10 12:35:56.000000000 -0500
|
764
|
-
+++ sos-3.0/po/nds.po 2014-06-21 11:15:36.462724360 -0500
|
765
|
-
@@ -165,7 +165,7 @@ msgid "Cannot upload to specified URL."
|
766
|
-
msgstr ""
|
767
|
-
|
768
|
-
#: ../sos/policyredhat.py:399
|
769
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
770
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
771
|
-
msgstr ""
|
772
|
-
|
773
|
-
#: ../sos/policyredhat.py:401
|
774
|
-
diff -uNrp sos-3.0.orig/po/nl.po sos-3.0/po/nl.po
|
775
|
-
--- sos-3.0.orig/po/nl.po 2013-06-10 12:35:56.000000000 -0500
|
776
|
-
+++ sos-3.0/po/nl.po 2014-06-21 11:15:36.462724360 -0500
|
777
|
-
@@ -183,9 +183,9 @@ msgid "Cannot upload to specified URL."
|
778
|
-
msgstr "Kan niet naar de opgegeven URL uploaden."
|
779
|
-
|
780
|
-
#: ../sos/policyredhat.py:399
|
781
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
782
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
783
|
-
msgstr ""
|
784
|
-
-"Er trad een probleem op bij het uploaden van jouw rapport naar Red Hat "
|
785
|
-
+"Er trad een probleem op bij het uploaden van jouw rapport naar CentOS "
|
786
|
-
"support."
|
787
|
-
|
788
|
-
#: ../sos/policyredhat.py:401
|
789
|
-
diff -uNrp sos-3.0.orig/po/nn.po sos-3.0/po/nn.po
|
790
|
-
--- sos-3.0.orig/po/nn.po 2013-06-10 12:35:56.000000000 -0500
|
791
|
-
+++ sos-3.0/po/nn.po 2014-06-21 11:15:36.462724360 -0500
|
792
|
-
@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
|
793
|
-
msgstr ""
|
794
|
-
|
795
|
-
#: ../sos/policyredhat.py:399
|
796
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
797
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
798
|
-
msgstr ""
|
799
|
-
|
800
|
-
#: ../sos/policyredhat.py:401
|
801
|
-
diff -uNrp sos-3.0.orig/po/nso.po sos-3.0/po/nso.po
|
802
|
-
--- sos-3.0.orig/po/nso.po 2013-06-10 12:35:56.000000000 -0500
|
803
|
-
+++ sos-3.0/po/nso.po 2014-06-21 11:15:36.463724353 -0500
|
804
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
805
|
-
msgstr ""
|
806
|
-
|
807
|
-
#: ../sos/policyredhat.py:399
|
808
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
809
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
810
|
-
msgstr ""
|
811
|
-
|
812
|
-
#: ../sos/policyredhat.py:401
|
813
|
-
diff -uNrp sos-3.0.orig/po/or.po sos-3.0/po/or.po
|
814
|
-
--- sos-3.0.orig/po/or.po 2013-06-10 12:35:56.000000000 -0500
|
815
|
-
+++ sos-3.0/po/or.po 2014-06-21 11:15:36.463724353 -0500
|
816
|
-
@@ -188,8 +188,8 @@ msgid "Cannot upload to specified URL."
|
817
|
-
msgstr "ଉଲ୍ଲିଖିତ URL କୁ ଧାରଣ କରିପାରିବେ ନାହିଁ।"
|
818
|
-
|
819
|
-
#: ../sos/policyredhat.py:399
|
820
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
821
|
-
-msgstr "Red Hat ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।"
|
822
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
823
|
-
+msgstr "CentOS ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।"
|
824
|
-
|
825
|
-
#: ../sos/policyredhat.py:401
|
826
|
-
#, python-format
|
827
|
-
diff -uNrp sos-3.0.orig/po/pa.po sos-3.0/po/pa.po
|
828
|
-
--- sos-3.0.orig/po/pa.po 2013-06-10 12:35:56.000000000 -0500
|
829
|
-
+++ sos-3.0/po/pa.po 2014-06-21 11:15:36.463724353 -0500
|
830
|
-
@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL."
|
831
|
-
msgstr "ਦਿੱਤੇ URL ਤੇ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ।"
|
832
|
-
|
833
|
-
#: ../sos/policyredhat.py:399
|
834
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
835
|
-
-msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ Red Hat ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।"
|
836
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
837
|
-
+msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ CentOS ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।"
|
838
|
-
|
839
|
-
#: ../sos/policyredhat.py:401
|
840
|
-
#, python-format
|
841
|
-
diff -uNrp sos-3.0.orig/po/pl.po sos-3.0/po/pl.po
|
842
|
-
--- sos-3.0.orig/po/pl.po 2013-06-10 12:35:56.000000000 -0500
|
843
|
-
+++ sos-3.0/po/pl.po 2014-06-21 11:15:36.463724353 -0500
|
844
|
-
@@ -179,10 +179,10 @@ msgid "Cannot upload to specified URL."
|
845
|
-
msgstr "Nie można wysłać na podany adres URL."
|
846
|
-
|
847
|
-
#: ../sos/policyredhat.py:399
|
848
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
849
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
850
|
-
msgstr ""
|
851
|
-
"Wystąpił problem podczas wysyłania raportu do wsparcia technicznego firmy "
|
852
|
-
-"Red Hat."
|
853
|
-
+"CentOS."
|
854
|
-
|
855
|
-
#: ../sos/policyredhat.py:401
|
856
|
-
#, python-format
|
857
|
-
diff -uNrp sos-3.0.orig/po/pt_BR.po sos-3.0/po/pt_BR.po
|
858
|
-
--- sos-3.0.orig/po/pt_BR.po 2013-06-10 12:35:56.000000000 -0500
|
859
|
-
+++ sos-3.0/po/pt_BR.po 2014-06-21 11:15:36.463724353 -0500
|
860
|
-
@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
|
861
|
-
msgstr "Não foi possível enviar para a URL especificada."
|
862
|
-
|
863
|
-
#: ../sos/policyredhat.py:399
|
864
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
865
|
-
-msgstr "Houve um problema ao enviar o seu relatório para o suporte da Red Hat."
|
866
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
867
|
-
+msgstr "Houve um problema ao enviar o seu relatório para o suporte da CentOS."
|
868
|
-
|
869
|
-
#: ../sos/policyredhat.py:401
|
870
|
-
#, python-format
|
871
|
-
diff -uNrp sos-3.0.orig/po/pt.po sos-3.0/po/pt.po
|
872
|
-
--- sos-3.0.orig/po/pt.po 2013-06-10 12:35:56.000000000 -0500
|
873
|
-
+++ sos-3.0/po/pt.po 2014-06-21 11:15:36.463724353 -0500
|
874
|
-
@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
|
875
|
-
msgstr "Não foi possível submeter para o URL especificado."
|
876
|
-
|
877
|
-
#: ../sos/policyredhat.py:399
|
878
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
879
|
-
-msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte Red Hat."
|
880
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
881
|
-
+msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte CentOS."
|
882
|
-
|
883
|
-
#: ../sos/policyredhat.py:401
|
884
|
-
#, python-format
|
885
|
-
diff -uNrp sos-3.0.orig/po/ro.po sos-3.0/po/ro.po
|
886
|
-
--- sos-3.0.orig/po/ro.po 2013-06-10 12:35:56.000000000 -0500
|
887
|
-
+++ sos-3.0/po/ro.po 2014-06-21 11:15:36.464724345 -0500
|
888
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
889
|
-
msgstr ""
|
890
|
-
|
891
|
-
#: ../sos/policyredhat.py:399
|
892
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
893
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
894
|
-
msgstr ""
|
895
|
-
|
896
|
-
#: ../sos/policyredhat.py:401
|
897
|
-
diff -uNrp sos-3.0.orig/po/ru.po sos-3.0/po/ru.po
|
898
|
-
--- sos-3.0.orig/po/ru.po 2013-06-10 12:35:56.000000000 -0500
|
899
|
-
+++ sos-3.0/po/ru.po 2014-06-21 11:15:36.464724345 -0500
|
900
|
-
@@ -186,9 +186,9 @@ msgid "Cannot upload to specified URL."
|
901
|
-
msgstr "Не удалось отправить файл."
|
902
|
-
|
903
|
-
#: ../sos/policyredhat.py:399
|
904
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
905
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
906
|
-
msgstr ""
|
907
|
-
-"Произошла ошибка при попытке отправить отчёт в службу поддержки Red Hat."
|
908
|
-
+"Произошла ошибка при попытке отправить отчёт в службу поддержки CentOS."
|
909
|
-
|
910
|
-
#: ../sos/policyredhat.py:401
|
911
|
-
#, python-format
|
912
|
-
diff -uNrp sos-3.0.orig/po/si.po sos-3.0/po/si.po
|
913
|
-
--- sos-3.0.orig/po/si.po 2013-06-10 12:35:56.000000000 -0500
|
914
|
-
+++ sos-3.0/po/si.po 2014-06-21 11:15:36.464724345 -0500
|
915
|
-
@@ -85,11 +85,11 @@ msgid ""
|
916
|
-
"No changes will be made to your system.\n"
|
917
|
-
"\n"
|
918
|
-
msgstr ""
|
919
|
-
-"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ Red Hat "
|
920
|
-
+"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ CentOS "
|
921
|
-
"Enterprise Linux පද්ධතිය පිහිටවනු ලැබේ.\n"
|
922
|
-
"රැස් කළ තොරතුරු සහ සංරක්ෂකය /tmp යටතේ ඇසුරුම් ගත කර ඇති අතර ඔබට එය සහායක නියෝජිත වෙත "
|
923
|
-
"යැවිය හැක.\n"
|
924
|
-
-"Red Hat මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු "
|
925
|
-
+"CentOS මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු "
|
926
|
-
"ලෙස සළකණු ලබයි.\n"
|
927
|
-
"\n"
|
928
|
-
"මෙම ක්රියාව නිම වීමට වේලාවක් ගතවනු ඇත.\n"
|
929
|
-
@@ -184,13 +184,13 @@ msgid "Cannot upload to specified URL."
|
930
|
-
msgstr "දක්වන ලඳ URL වෙත ලබා දිය නොහැක."
|
931
|
-
|
932
|
-
#: ../sos/policyredhat.py:399
|
933
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
934
|
-
-msgstr "ඔබගේ වාර්තාව Red Hat සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය."
|
935
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
936
|
-
+msgstr "ඔබගේ වාර්තාව CentOS සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය."
|
937
|
-
|
938
|
-
#: ../sos/policyredhat.py:401
|
939
|
-
#, fuzzy, python-format
|
940
|
-
msgid "Your report was successfully uploaded to %s with name:"
|
941
|
-
-msgstr "ඔබගේ වාර්තාව සාර්තකව Red Hat's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:"
|
942
|
-
+msgstr "ඔබගේ වාර්තාව සාර්තකව CentOS's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:"
|
943
|
-
|
944
|
-
#: ../sos/policyredhat.py:404
|
945
|
-
msgid "Please communicate this name to your support representative."
|
946
|
-
diff -uNrp sos-3.0.orig/po/sk.po sos-3.0/po/sk.po
|
947
|
-
--- sos-3.0.orig/po/sk.po 2013-06-10 12:35:56.000000000 -0500
|
948
|
-
+++ sos-3.0/po/sk.po 2014-06-21 11:15:36.464724345 -0500
|
949
|
-
@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
|
950
|
-
msgstr "Nie je možné odoslať na zadanú adresu URL."
|
951
|
-
|
952
|
-
#: ../sos/policyredhat.py:399
|
953
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
954
|
-
-msgstr "Nastal problém pri odosielaní vašej správy na podporu Red Hat."
|
955
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
956
|
-
+msgstr "Nastal problém pri odosielaní vašej správy na podporu CentOS."
|
957
|
-
|
958
|
-
#: ../sos/policyredhat.py:401
|
959
|
-
#, python-format
|
960
|
-
diff -uNrp sos-3.0.orig/po/sl.po sos-3.0/po/sl.po
|
961
|
-
--- sos-3.0.orig/po/sl.po 2013-06-10 12:35:56.000000000 -0500
|
962
|
-
+++ sos-3.0/po/sl.po 2014-06-21 11:15:36.464724345 -0500
|
963
|
-
@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL."
|
964
|
-
msgstr ""
|
965
|
-
|
966
|
-
#: ../sos/policyredhat.py:399
|
967
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
968
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
969
|
-
msgstr ""
|
970
|
-
|
971
|
-
#: ../sos/policyredhat.py:401
|
972
|
-
diff -uNrp sos-3.0.orig/po/sos.pot sos-3.0/po/sos.pot
|
973
|
-
--- sos-3.0.orig/po/sos.pot 2013-06-10 12:35:56.000000000 -0500
|
974
|
-
+++ sos-3.0/po/sos.pot 2014-06-21 11:15:36.464724345 -0500
|
975
|
-
@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
|
976
|
-
msgstr ""
|
977
|
-
|
978
|
-
#: ../sos/policyredhat.py:399
|
979
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
980
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
981
|
-
msgstr ""
|
982
|
-
|
983
|
-
#: ../sos/policyredhat.py:401
|
984
|
-
diff -uNrp sos-3.0.orig/po/sq.po sos-3.0/po/sq.po
|
985
|
-
--- sos-3.0.orig/po/sq.po 2013-06-10 12:35:56.000000000 -0500
|
986
|
-
+++ sos-3.0/po/sq.po 2014-06-21 11:15:36.464724345 -0500
|
987
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
988
|
-
msgstr ""
|
989
|
-
|
990
|
-
#: ../sos/policyredhat.py:399
|
991
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
992
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
993
|
-
msgstr ""
|
994
|
-
|
995
|
-
#: ../sos/policyredhat.py:401
|
996
|
-
diff -uNrp sos-3.0.orig/po/sr@latin.po sos-3.0/po/sr@latin.po
|
997
|
-
--- sos-3.0.orig/po/sr@latin.po 2013-06-10 12:35:56.000000000 -0500
|
998
|
-
+++ sos-3.0/po/sr@latin.po 2014-06-21 11:15:36.465724337 -0500
|
999
|
-
@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
|
1000
|
-
msgstr "Ne mogu da pošaljem na navedeni URL."
|
1001
|
-
|
1002
|
-
#: ../sos/policyredhat.py:399
|
1003
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1004
|
-
-msgstr "Pojavio se problem pri slanju vašeg izveštaja Red Hat podršci."
|
1005
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1006
|
-
+msgstr "Pojavio se problem pri slanju vašeg izveštaja CentOS podršci."
|
1007
|
-
|
1008
|
-
#: ../sos/policyredhat.py:401
|
1009
|
-
#, python-format
|
1010
|
-
diff -uNrp sos-3.0.orig/po/sr.po sos-3.0/po/sr.po
|
1011
|
-
--- sos-3.0.orig/po/sr.po 2013-06-10 12:35:56.000000000 -0500
|
1012
|
-
+++ sos-3.0/po/sr.po 2014-06-21 11:15:36.465724337 -0500
|
1013
|
-
@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL."
|
1014
|
-
msgstr "Не могу да пошаљем на наведени УРЛ."
|
1015
|
-
|
1016
|
-
#: ../sos/policyredhat.py:399
|
1017
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1018
|
-
-msgstr "Појавио се проблем при слању вашег извештаја Red Hat подршци."
|
1019
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1020
|
-
+msgstr "Појавио се проблем при слању вашег извештаја CentOS подршци."
|
1021
|
-
|
1022
|
-
#: ../sos/policyredhat.py:401
|
1023
|
-
#, python-format
|
1024
|
-
diff -uNrp sos-3.0.orig/po/sv.po sos-3.0/po/sv.po
|
1025
|
-
--- sos-3.0.orig/po/sv.po 2013-06-10 12:35:56.000000000 -0500
|
1026
|
-
+++ sos-3.0/po/sv.po 2014-06-21 11:15:36.465724337 -0500
|
1027
|
-
@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
|
1028
|
-
msgstr "Kan inte skicka till angiven URL."
|
1029
|
-
|
1030
|
-
#: ../sos/policyredhat.py:399
|
1031
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1032
|
-
-msgstr "Ett problem uppstod när din rapport skickades till Red Hat support."
|
1033
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1034
|
-
+msgstr "Ett problem uppstod när din rapport skickades till CentOS support."
|
1035
|
-
|
1036
|
-
#: ../sos/policyredhat.py:401
|
1037
|
-
#, python-format
|
1038
|
-
diff -uNrp sos-3.0.orig/po/ta.po sos-3.0/po/ta.po
|
1039
|
-
--- sos-3.0.orig/po/ta.po 2013-06-10 12:35:56.000000000 -0500
|
1040
|
-
+++ sos-3.0/po/ta.po 2014-06-21 11:15:36.465724337 -0500
|
1041
|
-
@@ -188,8 +188,8 @@ msgid "Cannot upload to specified URL."
|
1042
|
-
msgstr "குறிப்பிட்ட இணைய முகவரியில் ஏற்ற முடியவில்லை."
|
1043
|
-
|
1044
|
-
#: ../sos/policyredhat.py:399
|
1045
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1046
|
-
-msgstr "உங்கள் அறிக்கையை Red Hat சேவைக்கு அனுப்புவதில் சிக்கல்."
|
1047
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1048
|
-
+msgstr "உங்கள் அறிக்கையை CentOS சேவைக்கு அனுப்புவதில் சிக்கல்."
|
1049
|
-
|
1050
|
-
#: ../sos/policyredhat.py:401
|
1051
|
-
#, python-format
|
1052
|
-
diff -uNrp sos-3.0.orig/po/te.po sos-3.0/po/te.po
|
1053
|
-
--- sos-3.0.orig/po/te.po 2013-06-10 12:35:56.000000000 -0500
|
1054
|
-
+++ sos-3.0/po/te.po 2014-06-21 11:15:36.465724337 -0500
|
1055
|
-
@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
|
1056
|
-
msgstr "తెలుపబడిన URLకు అప్లోడ్ చేయలేదు."
|
1057
|
-
|
1058
|
-
#: ../sos/policyredhat.py:399
|
1059
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1060
|
-
-msgstr "మీ సమస్యను Red Hat మద్దతునకు అప్లోడు చేయుటలో వొక సమస్యవుంది."
|
1061
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1062
|
-
+msgstr "మీ సమస్యను CentOS మద్దతునకు అప్లోడు చేయుటలో వొక సమస్యవుంది."
|
1063
|
-
|
1064
|
-
#: ../sos/policyredhat.py:401
|
1065
|
-
#, python-format
|
1066
|
-
diff -uNrp sos-3.0.orig/po/th.po sos-3.0/po/th.po
|
1067
|
-
--- sos-3.0.orig/po/th.po 2013-06-10 12:35:56.000000000 -0500
|
1068
|
-
+++ sos-3.0/po/th.po 2014-06-21 11:18:12.876508348 -0500
|
1069
|
-
@@ -84,9 +84,9 @@ msgid ""
|
1070
|
-
"\n"
|
1071
|
-
msgstr ""
|
1072
|
-
"เครื่องมือนี้จะเก็บข้อมูลโดยละเอียดเกี่ยวกับฮาร์ดแวร์และการตั้งค่า\n"
|
1073
|
-
-"ระบบ Red Hat Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n"
|
1074
|
-
+"ระบบ CentOS Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n"
|
1075
|
-
"สร้างเป็นไฟล์ที่ /tmp ซึ่งคุณสามารถส่งไปยังผู้สนับสนุนได้\n"
|
1076
|
-
-"Red Hat จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n"
|
1077
|
-
+"CentOS จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n"
|
1078
|
-
"ความลับ\n"
|
1079
|
-
"\n"
|
1080
|
-
"กระบวนการนี้อาจจะใช้เวลาสักครู่ในการทำงาน จะไม่มีการแก้ไข\n"
|
1081
|
-
@@ -180,13 +180,13 @@ msgid "Cannot upload to specified URL."
|
1082
|
-
msgstr "ไม่สามารถอัพโหลดไปยัง URL ที่ระบุ"
|
1083
|
-
|
1084
|
-
#: ../sos/policyredhat.py:399
|
1085
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1086
|
-
-msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน Red Hat"
|
1087
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1088
|
-
+msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน CentOS"
|
1089
|
-
|
1090
|
-
#: ../sos/policyredhat.py:401
|
1091
|
-
#, fuzzy, python-format
|
1092
|
-
msgid "Your report was successfully uploaded to %s with name:"
|
1093
|
-
-msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ Red Hat ในชื่อ:"
|
1094
|
-
+msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ CentOS ในชื่อ:"
|
1095
|
-
|
1096
|
-
#: ../sos/policyredhat.py:404
|
1097
|
-
msgid "Please communicate this name to your support representative."
|
1098
|
-
diff -uNrp sos-3.0.orig/po/tr.po sos-3.0/po/tr.po
|
1099
|
-
--- sos-3.0.orig/po/tr.po 2013-06-10 12:35:56.000000000 -0500
|
1100
|
-
+++ sos-3.0/po/tr.po 2014-06-21 11:15:36.466724329 -0500
|
1101
|
-
@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL."
|
1102
|
-
msgstr "Belirtilen URL 'ye yükleme yapılamadı."
|
1103
|
-
|
1104
|
-
#: ../sos/policyredhat.py:399
|
1105
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1106
|
-
-msgstr "Raporunuz Red Hat desteğe yüklenirken bir sorunla karşılaşıldı."
|
1107
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1108
|
-
+msgstr "Raporunuz CentOS desteğe yüklenirken bir sorunla karşılaşıldı."
|
1109
|
-
|
1110
|
-
#: ../sos/policyredhat.py:401
|
1111
|
-
#, python-format
|
1112
|
-
diff -uNrp sos-3.0.orig/po/uk.po sos-3.0/po/uk.po
|
1113
|
-
--- sos-3.0.orig/po/uk.po 2013-06-10 12:35:56.000000000 -0500
|
1114
|
-
+++ sos-3.0/po/uk.po 2014-06-21 11:15:36.466724329 -0500
|
1115
|
-
@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL."
|
1116
|
-
msgstr "Не вдається надіслати файл."
|
1117
|
-
|
1118
|
-
#: ../sos/policyredhat.py:399
|
1119
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1120
|
-
-msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки Red Hat."
|
1121
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1122
|
-
+msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки CentOS."
|
1123
|
-
|
1124
|
-
#: ../sos/policyredhat.py:401
|
1125
|
-
#, python-format
|
1126
|
-
diff -uNrp sos-3.0.orig/po/ur.po sos-3.0/po/ur.po
|
1127
|
-
--- sos-3.0.orig/po/ur.po 2013-06-10 12:35:56.000000000 -0500
|
1128
|
-
+++ sos-3.0/po/ur.po 2014-06-21 11:15:36.466724329 -0500
|
1129
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
1130
|
-
msgstr ""
|
1131
|
-
|
1132
|
-
#: ../sos/policyredhat.py:399
|
1133
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1134
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1135
|
-
msgstr ""
|
1136
|
-
|
1137
|
-
#: ../sos/policyredhat.py:401
|
1138
|
-
diff -uNrp sos-3.0.orig/po/vi.po sos-3.0/po/vi.po
|
1139
|
-
--- sos-3.0.orig/po/vi.po 2013-06-10 12:35:56.000000000 -0500
|
1140
|
-
+++ sos-3.0/po/vi.po 2014-06-21 11:15:36.466724329 -0500
|
1141
|
-
@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL."
|
1142
|
-
msgstr ""
|
1143
|
-
|
1144
|
-
#: ../sos/policyredhat.py:399
|
1145
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1146
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1147
|
-
msgstr ""
|
1148
|
-
|
1149
|
-
#: ../sos/policyredhat.py:401
|
1150
|
-
diff -uNrp sos-3.0.orig/po/zh_CN.po sos-3.0/po/zh_CN.po
|
1151
|
-
--- sos-3.0.orig/po/zh_CN.po 2013-06-10 12:35:56.000000000 -0500
|
1152
|
-
+++ sos-3.0/po/zh_CN.po 2014-06-21 11:15:36.466724329 -0500
|
1153
|
-
@@ -184,7 +184,7 @@ msgid "Cannot upload to specified URL."
|
1154
|
-
msgstr "无法上传到指定的网址。"
|
1155
|
-
|
1156
|
-
#: ../sos/policyredhat.py:399
|
1157
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1158
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1159
|
-
msgstr "在将您的报告上传到红帽支持时出错。"
|
1160
|
-
|
1161
|
-
#: ../sos/policyredhat.py:401
|
1162
|
-
diff -uNrp sos-3.0.orig/po/zh_TW.po sos-3.0/po/zh_TW.po
|
1163
|
-
--- sos-3.0.orig/po/zh_TW.po 2013-06-10 12:35:56.000000000 -0500
|
1164
|
-
+++ sos-3.0/po/zh_TW.po 2014-06-21 11:15:36.466724329 -0500
|
1165
|
-
@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL."
|
1166
|
-
msgstr "無法上傳指定的網址。"
|
1167
|
-
|
1168
|
-
#: ../sos/policyredhat.py:399
|
1169
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1170
|
-
-msgstr "將報告上傳至 Red Hat 技術支援時,出現問題。"
|
1171
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1172
|
-
+msgstr "將報告上傳至 CentOS 技術支援時,出現問題。"
|
1173
|
-
|
1174
|
-
#: ../sos/policyredhat.py:401
|
1175
|
-
#, python-format
|
1176
|
-
diff -uNrp sos-3.0.orig/po/zu.po sos-3.0/po/zu.po
|
1177
|
-
--- sos-3.0.orig/po/zu.po 2013-06-10 12:35:56.000000000 -0500
|
1178
|
-
+++ sos-3.0/po/zu.po 2014-06-21 11:15:36.467724321 -0500
|
1179
|
-
@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL."
|
1180
|
-
msgstr ""
|
1181
|
-
|
1182
|
-
#: ../sos/policyredhat.py:399
|
1183
|
-
-msgid "There was a problem uploading your report to Red Hat support."
|
1184
|
-
+msgid "There was a problem uploading your report to CentOS support."
|
1185
|
-
msgstr ""
|
1186
|
-
|
1187
|
-
#: ../sos/policyredhat.py:401
|
1188
|
-
diff -uNrp sos-3.2.orig/sos/plugins/cluster.py sos-3.2/sos/plugins/cluster.py
|
1189
|
-
--- sos-3.2.orig/sos/plugins/cluster.py 2014-09-30 12:38:28.000000000 -0500
|
1190
|
-
+++ sos-3.2/sos/plugins/cluster.py 2015-03-09 14:58:02.982869116 -0500
|
1191
|
-
@@ -19,7 +19,7 @@ from datetime import datetime, timedelta
|
1192
|
-
|
1193
|
-
|
1194
|
-
class Cluster(Plugin, RedHatPlugin):
|
1195
|
-
- """Red Hat Cluster Suite and GFS
|
1196
|
-
+ """Cluster Suite and GFS
|
1197
|
-
"""
|
1198
|
-
|
1199
|
-
plugin_name = 'cluster'
|
1200
|
-
diff -uNrp sos-3.2.orig/sos/plugins/cs.py sos-3.2/sos/plugins/cs.py
|
1201
|
-
--- sos-3.2.orig/sos/plugins/cs.py 2014-09-30 12:38:28.000000000 -0500
|
1202
|
-
+++ sos-3.2/sos/plugins/cs.py 2015-03-09 14:58:20.085778645 -0500
|
1203
|
-
@@ -54,7 +54,7 @@ class CertificateSystem(Plugin, RedHatPl
|
1204
|
-
def setup(self):
|
1205
|
-
csversion = self.checkversion()
|
1206
|
-
if not csversion:
|
1207
|
-
- self.add_alert("Red Hat Certificate System not found.")
|
1208
|
-
+ self.add_alert("Certificate System not found.")
|
1209
|
-
return
|
1210
|
-
if csversion == 71:
|
1211
|
-
self.add_copy_spec([
|
1212
|
-
diff -uNrp sos-3.2.orig/sos/plugins/hts.py sos-3.2/sos/plugins/hts.py
|
1213
|
-
--- sos-3.2.orig/sos/plugins/hts.py 2014-09-30 12:38:28.000000000 -0500
|
1214
|
-
+++ sos-3.2/sos/plugins/hts.py 2015-03-09 14:58:36.973689309 -0500
|
1215
|
-
@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl
|
1216
|
-
|
1217
|
-
|
1218
|
-
class HardwareTestSuite(Plugin, RedHatPlugin):
|
1219
|
-
- """Red Hat Hardware Test Suite
|
1220
|
-
+ """Hardware Test Suite
|
1221
|
-
"""
|
1222
|
-
|
1223
|
-
plugin_name = 'hardwaretestsuite'
|
1224
|
-
diff -uNrp sos-3.2.orig/sos/plugins/__init__.py sos-3.2/sos/plugins/__init__.py
|
1225
|
-
--- sos-3.2.orig/sos/plugins/__init__.py 2015-03-09 14:50:34.162237962 -0500
|
1226
|
-
+++ sos-3.2/sos/plugins/__init__.py 2015-03-09 14:58:56.861584108 -0500
|
1227
|
-
@@ -732,7 +732,7 @@ class Plugin(object):
|
1228
|
-
|
1229
|
-
|
1230
|
-
class RedHatPlugin(object):
|
1231
|
-
- """Tagging class to indicate that this plugin works with Red Hat Linux"""
|
1232
|
-
+ """Tagging class to indicate that this plugin works with CentOS Linux"""
|
1233
|
-
pass
|
1234
|
-
|
1235
|
-
|
1236
|
-
diff -uNrp sos-3.2.orig/sos/plugins/rhui.py sos-3.2/sos/plugins/rhui.py
|
1237
|
-
--- sos-3.2.orig/sos/plugins/rhui.py 2014-09-30 12:38:28.000000000 -0500
|
1238
|
-
+++ sos-3.2/sos/plugins/rhui.py 2015-03-09 14:59:16.909478057 -0500
|
1239
|
-
@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl
|
1240
|
-
|
1241
|
-
|
1242
|
-
class Rhui(Plugin, RedHatPlugin):
|
1243
|
-
- """Red Hat Update Infrastructure
|
1244
|
-
+ """Update Infrastructure
|
1245
|
-
"""
|
1246
|
-
|
1247
|
-
plugin_name = 'rhui'
|
1248
|
-
diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py
|
1249
|
-
--- sos-3.2.orig/sos/policies/redhat.py 2014-09-30 12:38:28.000000000 -0500
|
1250
|
-
+++ sos-3.2/sos/policies/redhat.py 2015-03-09 14:56:04.383496495 -0500
|
1251
|
-
@@ -33,9 +33,9 @@ except:
|
1252
|
-
|
1253
|
-
|
1254
|
-
class RedHatPolicy(LinuxPolicy):
|
1255
|
-
- distro = "Red Hat"
|
1256
|
-
- vendor = "Red Hat"
|
1257
|
-
- vendor_url = "http://www.redhat.com/"
|
1258
|
-
+ distro = "CentOS"
|
1259
|
-
+ vendor = "CentOS"
|
1260
|
-
+ vendor_url = "http://www.centos.org/"
|
1261
|
-
_tmp_dir = "/var/tmp"
|
1262
|
-
|
1263
|
-
def __init__(self):
|
1264
|
-
@@ -57,9 +57,9 @@ class RedHatPolicy(LinuxPolicy):
|
1265
|
-
|
1266
|
-
@classmethod
|
1267
|
-
def check(self):
|
1268
|
-
- """This method checks to see if we are running on Red Hat. It must be
|
1269
|
-
+ """This method checks to see if we are running on CentOS. It must be
|
1270
|
-
overriden by concrete subclasses to return True when running on a
|
1271
|
-
- Fedora, RHEL or other Red Hat distribution or False otherwise."""
|
1272
|
-
+ CentOS or False otherwise."""
|
1273
|
-
return False
|
1274
|
-
|
1275
|
-
def runlevel_by_service(self, name):
|
1276
|
-
@@ -94,9 +94,9 @@ class RedHatPolicy(LinuxPolicy):
|
1277
|
-
|
1278
|
-
|
1279
|
-
class RHELPolicy(RedHatPolicy):
|
1280
|
-
- distro = "Red Hat Enterprise Linux"
|
1281
|
-
- vendor = "Red Hat"
|
1282
|
-
- vendor_url = "https://access.redhat.com/support/"
|
1283
|
-
+ distro = "CentOS Linux"
|
1284
|
-
+ vendor = "CentOS"
|
1285
|
-
+ vendor_url = "https://www.centos.org/"
|
1286
|
-
msg = _("""\
|
1287
|
-
This command will collect diagnostic and configuration \
|
1288
|
-
information from this %(distro)s system and installed \
|
@@ -2,7 +2,7 @@
|
|
2
2
|
Summary: A set of tools to gather troubleshooting information from a system
|
3
3
|
Name: sos
|
4
4
|
Version: 3.2
|
5
|
-
Release: 15%{?dist}.
|
5
|
+
Release: 15%{?dist}.8
|
6
6
|
Group: Applications/System
|
7
7
|
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
8
8
|
License: GPLv2+
|
@@ -46,7 +46,10 @@ Patch26: sos-bz1162788-ovirt-engine-remove-password-leak.patch
|
|
46
46
|
Patch27: sos-bz1206633-fix-exception-when-networkmanager-disabled.patch
|
47
47
|
Patch28: sos-bz1229746-openstack-sahara-plugin.patch
|
48
48
|
Patch29: sos-bz1229746-redact-secrets-from-sahara-config.patch
|
49
|
-
Patch30: sos-
|
49
|
+
Patch30: sos-bz1237029-hpasm-no-data-timeout.patch
|
50
|
+
Patch31: sos-bz1238200-mariadb-mysql-add-log.patch
|
51
|
+
Patch32: sos-bz1242871-openstack_neutron-obfuscate-passwords.patch
|
52
|
+
Patch33: sos-bz1244648-openstack-obfuscate-passwords-secrets.patch
|
50
53
|
|
51
54
|
%description
|
52
55
|
Sos is a set of tools that gathers information about system
|
@@ -87,6 +90,10 @@ support technicians and developers.
|
|
87
90
|
%patch28 -p1
|
88
91
|
%patch29 -p1
|
89
92
|
%patch30 -p1
|
93
|
+
%patch31 -p1
|
94
|
+
%patch32 -p1
|
95
|
+
%patch33 -p1
|
96
|
+
|
90
97
|
|
91
98
|
%build
|
92
99
|
make
|
@@ -110,8 +117,21 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
110
117
|
%config(noreplace) %{_sysconfdir}/sos.conf
|
111
118
|
|
112
119
|
%changelog
|
113
|
-
*
|
114
|
-
-
|
120
|
+
* Mon Sep 07 2015 Pavel Moravec <pmoravec@redhat.com> = 3.2-15.8
|
121
|
+
- [openstack_neutron] obfuscate server_auth in restproxy.ini
|
122
|
+
Resolves: bz1244648
|
123
|
+
|
124
|
+
* Mon Jul 27 2015 Pavel Moravec <pmoravec@redhat.com> = 3.2-15.7
|
125
|
+
- [openstack] Ensure openstack passwords and secrets are obfuscated
|
126
|
+
Resolves: bz1244648
|
127
|
+
|
128
|
+
* Wed Jul 15 2015 Pavel Moravec <pmoravec@redhat.com> = 3.2-15.6
|
129
|
+
- [hpasm] hpasmcli commands hang under timeout
|
130
|
+
Resolves: bz1237029
|
131
|
+
- [mysql] Collect log file
|
132
|
+
Resolves: bz1238200
|
133
|
+
- [openstack_neutron] Obscure passwords and secrets
|
134
|
+
Resolves: bz1242871
|
115
135
|
|
116
136
|
* Mon Jun 15 2015 Shane Bradley <sbradley@redhat.com> = 3.2-15.5
|
117
137
|
- [openstack_sahara] redact secrets from sahara configuration
|