Status: | Merged |
---|---|
Approved by: | Michael Chase-Salerno |
Approved revision: | 26 |
Merge reported by: | Michael Chase-Salerno |
Merged at revision: | not available |
Proposed branch: | lp:~vsasi/ibmcharms/code |
Merge into: | lp:ibmcharms |
Diff against target: |
381 lines (+321/-0) 11 files modified
charms/trusty/ibm-mq/README.md (+67/-0) charms/trusty/ibm-mq/config.yaml (+11/-0) charms/trusty/ibm-mq/copyright (+13/-0) charms/trusty/ibm-mq/hooks/config-changed (+127/-0) charms/trusty/ibm-mq/hooks/install (+21/-0) charms/trusty/ibm-mq/hooks/messaging-relation-joined (+4/-0) charms/trusty/ibm-mq/hooks/start (+8/-0) charms/trusty/ibm-mq/hooks/stop (+6/-0) charms/trusty/ibm-mq/icon.svg (+51/-0) charms/trusty/ibm-mq/metadata.yaml (+12/-0) charms/trusty/ibm-mq/revision (+1/-0) |
To merge this branch: | bzr merge lp:~vsasi/ibmcharms/code |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Chase-Salerno | Approve | ||
Review via email: mp+251864@code.launchpad.net |
Commit message
IBM MQ Initial commit
Description of the change
First commit for IBM MQ charm
Michael Chase-Salerno (mcs-chasal) : | # |
vsr (vsasi) : | # |
- 26. By vsasi
-
Update to handle system configuration, platform architecture
vsr (vsasi) wrote : | # |
> The modifications required by the user (sysctl.conf, limits.conf, adduser) are
> still causing a problem for me. Charm hooks do run as root, so permissions
> should not be a problem. The hooks here are doing package installs which
> require root permissions.
>
> I've found other charms that do modify the sysctl.conf (like Ceph) so it's
> something that others are doing. The charmhelper package provides a function
> to add a user, so that should definitely be doable.
>
> Even if it's not possible in LXC, the charm still needs to be able to do this.
> LXC isn't really how charms would be actually used, so a different testing
> method needs to be employed when a limit of LXC prevents function. We were
> unable to fully test the GPFS charm under LXC because of the requirement to
> load a module, which LXC can't do.
>
> If you'd like to open a bug for fixing this, I'd be ok with doing this merge
> with that bug pending, but I think it will have to be resolved before we can
> attempt to publish this to the charm store.
Have updated to save configuration changes. Please review and accept for merger.
Michael Chase-Salerno (mcs-chasal) wrote : | # |
Latest version looks good.
Michael Chase-Salerno (mcs-chasal) wrote : | # |
Merged into new devel branch: https:/
Preview Diff
1 | === added directory 'charms/trusty/ibm-mq' |
2 | === added file 'charms/trusty/ibm-mq/IBM-MQ-license.txt' |
3 | Binary files charms/trusty/ibm-mq/IBM-MQ-license.txt 1970-01-01 00:00:00 +0000 and charms/trusty/ibm-mq/IBM-MQ-license.txt 2015-03-11 04:53:46 +0000 differ |
4 | === added file 'charms/trusty/ibm-mq/README.md' |
5 | --- charms/trusty/ibm-mq/README.md 1970-01-01 00:00:00 +0000 |
6 | +++ charms/trusty/ibm-mq/README.md 2015-03-11 04:53:46 +0000 |
7 | @@ -0,0 +1,67 @@ |
8 | + |
9 | +Charm for IBM MQ 8.0.0.0 |
10 | + |
11 | +Overview |
12 | +-------- |
13 | + |
14 | +IBM MQ |
15 | + |
16 | +IBM MQ provides for messaging services to transport multiple types of data. |
17 | +MQ Runtime, Server and Sample components from IBM MQ 8.0 product |
18 | +are provided as part of this charm. |
19 | + |
20 | +Usage |
21 | +----- |
22 | + |
23 | +Step by step instructions on using the charm: |
24 | + |
25 | +Download your licensed IBM MQ 8.0.0.0 software and extract it's contents to files/archives directory of MQ charm. |
26 | + |
27 | +To install the downloaded binaries you must agree to the IBM license. The license file(s) can be found in the files/archives directory and the IBM-MQ-license.txt file under the charm directory. |
28 | + |
29 | +Run the following to deploy this charm: |
30 | + |
31 | + juju deploy ibm-mq |
32 | + |
33 | +At this point the charm will wait until the user accepts the license. If you |
34 | +agree to the license, run the following command: |
35 | + |
36 | + juju set ibm-mq accept-ibm-mq-license=True |
37 | + |
38 | +In order to create MQ objects like queue, it is required that some |
39 | +of the system configurations be updated. Details provided at: |
40 | +[here](http://www-01.ibm.com/support/knowledgecenter/SSFKSJ_8.0.0/com.ibm.mq.ins.doc/q008550_.htm?lang=en). |
41 | + |
42 | +The Charm updates the following system configuration- |
43 | +/etc/sysctl.conf: |
44 | +fs.file-max = 524288 |
45 | +kernel.shmmax = 268435456 |
46 | + |
47 | +/etc/security/limits.conf |
48 | +mqm hard nofile 10240 |
49 | +mqm soft nofile 10240 |
50 | + |
51 | +Adds user 'ubuntu' to group 'mqm'. |
52 | + |
53 | +Verify these changes have been made successfully if MQ throws up any errors. |
54 | + |
55 | +Configuration |
56 | +------------- |
57 | + |
58 | +`accept-ibm-mq-license` |
59 | +Before you can use, extract, or install IBM MQ, |
60 | +you must accept the terms of International License |
61 | +Agreement for Non-Warranted Programs and additional license information. |
62 | +Please read the license agreement carefully. |
63 | + |
64 | +The license file can be found in the root directory of the charm source |
65 | +in the IBM-MQ-license.txt file. |
66 | + |
67 | +**The IBM MQ software cannot be installed until the terms and |
68 | +contions are accepted. The charm will not function correctly until the |
69 | +this configuration option is set to True.** |
70 | + |
71 | +IBM MQ Information |
72 | +------------------- |
73 | +More information available [here](https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/8.5.5.1/lafiles/runtime//en.html). |
74 | + |
75 | |
76 | === added file 'charms/trusty/ibm-mq/config.yaml' |
77 | --- charms/trusty/ibm-mq/config.yaml 1970-01-01 00:00:00 +0000 |
78 | +++ charms/trusty/ibm-mq/config.yaml 2015-03-11 04:53:46 +0000 |
79 | @@ -0,0 +1,11 @@ |
80 | +options: |
81 | + accept-ibm-mq-license: |
82 | + type: boolean |
83 | + default: False |
84 | + description: | |
85 | + The MQ software can only be used by |
86 | + accepting the terms and conditions found in the |
87 | + IBM-MQ-license.txt file. Setting this option to True |
88 | + indicates that you have read and accepted the IBM MQ terms and |
89 | + conditions found in the license file. The details about the license |
90 | + file can be found in the README. |
91 | |
92 | === added file 'charms/trusty/ibm-mq/copyright' |
93 | --- charms/trusty/ibm-mq/copyright 1970-01-01 00:00:00 +0000 |
94 | +++ charms/trusty/ibm-mq/copyright 2015-03-11 04:53:46 +0000 |
95 | @@ -0,0 +1,13 @@ |
96 | +Copyright 2015 IBM Corporation |
97 | + |
98 | +This Charm is licensed under the Apache License, Version 2.0 (the "License"); |
99 | +you may not use this file except in compliance with the License. |
100 | +You may obtain a copy of the License at |
101 | + |
102 | + http://www.apache.org/licenses/LICENSE-2.0 |
103 | + |
104 | +Unless required by applicable law or agreed to in writing, software |
105 | +distributed under the License is distributed on an "AS IS" BASIS, |
106 | +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
107 | +See the License for the specific language governing permissions and |
108 | +limitations under the License. |
109 | |
110 | === added directory 'charms/trusty/ibm-mq/files' |
111 | === added directory 'charms/trusty/ibm-mq/files/archives' |
112 | === added directory 'charms/trusty/ibm-mq/hooks' |
113 | === added file 'charms/trusty/ibm-mq/hooks/config-changed' |
114 | --- charms/trusty/ibm-mq/hooks/config-changed 1970-01-01 00:00:00 +0000 |
115 | +++ charms/trusty/ibm-mq/hooks/config-changed 2015-03-11 04:53:46 +0000 |
116 | @@ -0,0 +1,127 @@ |
117 | +#!/bin/bash |
118 | + |
119 | +set -e |
120 | +MQ_INSTALL_PATH=/opt/mqm |
121 | + |
122 | + |
123 | +# Check whether MQ is installed |
124 | +is_mq_installed() |
125 | +{ |
126 | + if [ -d $MQ_INSTALL_PATH/bin ]; then |
127 | + source $MQ_INSTALL_PATH/bin/setmqenv -s |
128 | + if [ $? == 0 ]; then |
129 | + source $MQ_INSTALL_PATH/bin/setmqenv -s |
130 | + echo "True" |
131 | + fi |
132 | + else |
133 | + echo "False" |
134 | + fi |
135 | +} |
136 | + |
137 | +# Remove MQ, if installed |
138 | +remove_software() |
139 | +{ |
140 | + |
141 | + mq_installed=`is_mq_installed` |
142 | + if [ $mq_installed == True ]; then |
143 | + juju-log "Removing IBM MQ software." |
144 | + |
145 | + # Stop all queues |
146 | + questr="QMNAME(" |
147 | + for queue in `$MQ_INSTALL_PATH/bin/dspmq -o installation | cut -d' ' -f1 `; |
148 | + do |
149 | + # Get the queue manager name |
150 | + queue_mgr_name=${queue:${#questr}:${#queue}-${#questr}-1} |
151 | + juju-log "Stopping queue manager $queue_mgr_name" |
152 | + $MQ_INSTALL_PATH/bin/endmqm $queue_mgr_name |
153 | + $MQ_INSTALL_PATH/bin/endmqlsr -m $queue_mgr_name |
154 | + done |
155 | + |
156 | + # Get list of packages and remove them |
157 | + mq_rpms="`rpm -qa | grep MQSeries`" |
158 | + juju-log "Removing package(s) $mq_rpms" |
159 | + rpm -ev --force-debian $mq_rpms |
160 | + fi |
161 | + |
162 | +} |
163 | + |
164 | +# Remove MQ if license not accpeted |
165 | +remove_unaccepted_software() |
166 | +{ |
167 | + |
168 | + if [ $1 == False ]; then |
169 | + juju-log "Removing IBM MQ (if installed) as the license agreement is not accepted." |
170 | + remove_software |
171 | + fi |
172 | + |
173 | +} |
174 | + |
175 | +# Update system configuration after installing MQ |
176 | +configure_system() |
177 | +{ |
178 | + juju-log "IBM MQ: Updating system configuration." |
179 | + |
180 | + # Some containers do not allow system updates. |
181 | + # Prevent the script from failing in such cases |
182 | + set +e |
183 | + shmmax=`sysctl kernel.shmmax | cut -d'=' -f2` |
184 | + if [ $shmmax -lt 268435456 ]; |
185 | + then |
186 | + sysctl -w kernel.shmmax=268435456 |
187 | + fi |
188 | + |
189 | + fmax=`sysctl fs.file-max | cut -d'=' -f2` |
190 | + if [ $fmax -lt 524288 ]; |
191 | + then |
192 | + sysctl -w fs.file-max=524288 |
193 | + fi |
194 | + sysctl -p |
195 | + |
196 | + # Add user ubuntu to mqm group |
197 | + adduser ubuntu mqm |
198 | + |
199 | + # Update mqm file limits |
200 | + if [ "`grep mqm /etc/security/limits.conf`"=="" ]; then |
201 | + sed -i 's/# End of file/mqm hard nofile 10240\nmqm soft nofile 10240\n# End of file/' /etc/security/limits.conf |
202 | + fi |
203 | + set -e |
204 | + juju-log "IBM MQ: Completed system configuration update." |
205 | + |
206 | +} |
207 | + |
208 | + |
209 | +juju-log "IBM MQ: Begin config-change hook" |
210 | +mq_license_accepted=`config-get accept-ibm-mq-license` |
211 | + |
212 | + |
213 | +# Remove MQ if license not accepted and exit. Else install it |
214 | +remove_unaccepted_software $mq_license_accepted |
215 | +if [ $mq_license_accepted == False ]; then |
216 | + juju-log "IBM MQ License not accepted." |
217 | + |
218 | +elif [ $mq_license_accepted == True ]; then |
219 | + |
220 | + juju-log "License accepted" |
221 | + mq_inst=`is_mq_installed` |
222 | + if [ $mq_inst == False ]; then |
223 | + # Check MQ package availability |
224 | + if [ -f $CHARM_DIR/files/archives/MQSeriesServer*rpm ] && [ -f $CHARM_DIR/files/archives/MQSeriesRuntime*rpm ]; |
225 | + then |
226 | + echo "MQ Packages available for installation."; |
227 | + $CHARM_DIR/files/archives/mqlicense.sh -accept |
228 | + juju-log "Installing available MQ packages." |
229 | + rpm -ivh --nodeps --force-debian --prefix /opt/mqm $CHARM_DIR/files/archives/MQSeries*rpm |
230 | + juju-log "Installation of available MQ packages complete." |
231 | + # Configure system values for MQ |
232 | + configure_system |
233 | + else |
234 | + echo "MQ Packages missing. Please check README file."; |
235 | + echo "Upgrade MQ charm after adding the MQ packages"; |
236 | + exit 1 |
237 | + fi |
238 | + fi |
239 | +else |
240 | + juju-log " Acceptable values for license is 'True' or 'False'" |
241 | + |
242 | +fi |
243 | +juju-log "IBM MQ: End config-change hook" |
244 | |
245 | === added file 'charms/trusty/ibm-mq/hooks/install' |
246 | --- charms/trusty/ibm-mq/hooks/install 1970-01-01 00:00:00 +0000 |
247 | +++ charms/trusty/ibm-mq/hooks/install 2015-03-11 04:53:46 +0000 |
248 | @@ -0,0 +1,21 @@ |
249 | +#!/bin/bash |
250 | + |
251 | +set -e |
252 | + |
253 | +#Install RPM dependency |
254 | +juju-log "IBM MQ: Begin Install." |
255 | + |
256 | +# Get the architecture from the uname command. |
257 | +ARCHITECTURE=`uname -m` |
258 | +if [ "$ARCHITECTURE" != "x86_64" ]; then |
259 | + juju-log "IBM MQ: Unsupported platform. IBM MQ installed with this Charm supports only the x86_64 platform." |
260 | + exit 1 |
261 | +fi |
262 | + |
263 | +# Install RPM |
264 | +juju-log "IBM MQ: Downloading and installng RPM." |
265 | +apt-get install -y rpm |
266 | +juju-log "IBM MQ: RPM downloaded and installed. Awaiting acceptance of license (see README on how to accept the license)." |
267 | + |
268 | +juju-log "IBM MQ: End RPM Install." |
269 | + |
270 | |
271 | === added file 'charms/trusty/ibm-mq/hooks/messaging-relation-joined' |
272 | --- charms/trusty/ibm-mq/hooks/messaging-relation-joined 1970-01-01 00:00:00 +0000 |
273 | +++ charms/trusty/ibm-mq/hooks/messaging-relation-joined 2015-03-11 04:53:46 +0000 |
274 | @@ -0,0 +1,4 @@ |
275 | +#!/bin/sh |
276 | + |
277 | +set -e |
278 | +relation-set hostname=`unit-get private-address` port=1414 |
279 | |
280 | === added file 'charms/trusty/ibm-mq/hooks/start' |
281 | --- charms/trusty/ibm-mq/hooks/start 1970-01-01 00:00:00 +0000 |
282 | +++ charms/trusty/ibm-mq/hooks/start 2015-03-11 04:53:46 +0000 |
283 | @@ -0,0 +1,8 @@ |
284 | +#!/bin/bash |
285 | + |
286 | +# Juju command to open port |
287 | + |
288 | +set -e |
289 | +juju-log "IBM MQ: Begin Start hook" |
290 | +open-port 1414/TCP |
291 | +juju-log "IBM MQ: End Start hook" |
292 | |
293 | === added file 'charms/trusty/ibm-mq/hooks/stop' |
294 | --- charms/trusty/ibm-mq/hooks/stop 1970-01-01 00:00:00 +0000 |
295 | +++ charms/trusty/ibm-mq/hooks/stop 2015-03-11 04:53:46 +0000 |
296 | @@ -0,0 +1,6 @@ |
297 | +#!/bin/bash |
298 | + |
299 | +set -e |
300 | +juju-log "IBM MQ: Begin Stop hook" |
301 | +close-port 1414/TCP |
302 | +juju-log "IBM MQ: End Stop hook" |
303 | |
304 | === added file 'charms/trusty/ibm-mq/icon.svg' |
305 | --- charms/trusty/ibm-mq/icon.svg 1970-01-01 00:00:00 +0000 |
306 | +++ charms/trusty/ibm-mq/icon.svg 2015-03-11 04:53:46 +0000 |
307 | @@ -0,0 +1,51 @@ |
308 | +<?xml version="1.0" encoding="UTF-8"?> |
309 | +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> |
310 | +<!-- Creator: CorelDRAW X6 --> |
311 | +<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1.10417in" height="1.09376in" version="1.1" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" |
312 | +viewBox="0 0 1104 1094" |
313 | + xmlns:xlink="http://www.w3.org/1999/xlink"> |
314 | + <defs> |
315 | + <mask id="id0"> |
316 | + <linearGradient id="id1" gradientUnits="userSpaceOnUse" x1="604.165" y1="152.24" x2="604.165" y2="400.776"> |
317 | + <stop offset="0" stop-opacity="1" stop-color="white"/> |
318 | + <stop offset="0.141176" stop-opacity="0.501961" stop-color="white"/> |
319 | + <stop offset="1" stop-opacity="0" stop-color="white"/> |
320 | + </linearGradient> |
321 | + <rect fill="url(#id1)" x="104" y="94" width="1000" height="365"/> |
322 | + </mask> |
323 | + </defs> |
324 | + <g id="Layer_x0020_1"> |
325 | + <metadata id="CorelCorpID_0Corel-Layer"/> |
326 | + <g id="_710492016"> |
327 | + <path id="Background" fill="#CFCFCF" d="M104 769l0 -351c0,-284 41,-324 324,-324l352 0c284,0 324,40 324,324l0 351c0,284 -40,325 -324,325l-352 0c-283,0 -324,-41 -324,-325z"/> |
328 | + <path fill="#999999" mask="url(#id0)" d="M104 459l0 -41c0,-284 41,-324 324,-324l352 0c284,0 324,40 324,324l0 41c0,-284 -40,-324 -324,-324l-352 0c-283,0 -324,40 -324,324z"/> |
329 | + <path id="Curve22" fill="#B3B3B3" fill-rule="nonzero" d="M589 692l28 0 0 41 -105 0 0 -41 28 0 0 -151 -72 192 -35 0 -74 -192 0 151 30 0 0 41 -107 0 0 -41 28 0 0 -177 -28 0 0 -41 97 0 70 183 71 -183 97 0 0 41 -28 0 0 177zm178 -3c7,0 13,-1 19,-2 6,-2 12,-5 17,-8 -11,-11 -22,-21 -34,-28 -13,-8 -27,-12 -43,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 32,31 13,7 27,11 42,11zm-84 -81c7,-3 15,-5 22,-7 8,-1 16,-2 24,-2 10,0 21,2 30,4 10,3 19,7 28,12 8,5 16,10 24,17 8,6 15,14 22,21 12,-14 18,-30 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -27,-19 -11,-4 -22,-7 -34,-7 -12,0 -23,3 -34,7 -10,4 -20,11 -27,19 -7,7 -12,16 -17,25 -4,9 -6,18 -6,27l1 14zm254 66l0 66 -15 1c-14,0 -28,-2 -42,-6 -13,-4 -26,-11 -38,-20 -11,8 -23,14 -36,18 -12,3 -26,5 -40,5 -19,0 -37,-3 -53,-10 -17,-8 -31,-17 -43,-30 -12,-12 -22,-27 -28,-43 -7,-17 -11,-35 -11,-54 0,-18 4,-35 11,-52 7,-16 17,-30 29,-43 12,-12 26,-21 42,-28 17,-8 34,-11 53,-11 19,0 36,3 53,10 16,7 31,17 43,29 13,13 22,27 30,43 7,17 10,34 10,53 0,15 -2,30 -8,45 -5,15 -12,28 -23,40 5,3 9,5 14,8 5,2 11,3 16,3l0 -24 36 0z"/> |
330 | + <path id="Curve21" fill="#AEAEAE" d="M588 691c10,0 19,0 29,0 0,14 0,28 0,42 -35,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,65 -48,129 -72,193 -11,0 -23,0 -34,0 -25,-64 -50,-128 -74,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 10,0 19,0 28,0 0,-59 0,-117 0,-176 -9,0 -18,0 -28,0 0,-14 0,-28 0,-42 33,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,59 0,117 0,176zm179 -3c6,0 12,0 18,-2 7,-2 12,-4 18,-7 -11,-12 -23,-21 -35,-29 -12,-8 -27,-11 -43,-11 -5,0 -11,0 -17,2 -5,1 -11,3 -16,6 8,13 19,24 32,31 13,7 28,10 43,10zm-84 -81c7,-3 14,-5 22,-6 8,-2 15,-2 23,-2 11,0 21,1 31,4 9,3 18,6 27,11 9,5 17,11 25,17 7,7 15,14 22,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-10 -10,-20 -18,-28 -7,-7 -16,-14 -27,-18 -10,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -6,7 -12,15 -16,24 -4,9 -6,18 -6,28 0,4 0,9 1,13zm254 67c0,22 0,44 0,66 -5,0 -10,0 -15,1 -15,0 -29,-2 -42,-6 -14,-5 -27,-11 -38,-20 -12,7 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -42,-29 -13,-13 -22,-27 -29,-44 -7,-16 -10,-34 -10,-53 0,-19 3,-36 10,-52 8,-17 17,-31 29,-43 12,-12 27,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,17 44,29 12,12 22,26 29,43 7,16 11,34 11,53 0,15 -3,30 -8,45 -5,14 -13,28 -23,39 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
331 | + <path id="Curve20" fill="darkgray" d="M588 691c9,0 19,0 28,0 0,14 0,27 0,41 -35,0 -70,0 -105,0 0,-14 0,-27 0,-41 9,0 18,0 28,0 0,-50 0,-101 0,-151 -24,64 -48,128 -72,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,101 0,151 10,0 20,0 30,0 0,14 0,27 0,41 -35,0 -71,0 -107,0 0,-14 0,-27 0,-41 9,0 18,0 28,0 0,-59 0,-118 0,-177 -10,0 -19,0 -28,0 0,-14 0,-27 0,-41 32,0 64,0 97,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,14 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-2 6,-2 12,-5 17,-8 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -42,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 32,31 13,7 27,11 42,11zm-84 -81c7,-3 15,-5 22,-7 8,-1 16,-2 24,-2 10,0 21,2 30,4 10,3 19,7 27,12 9,5 17,10 25,17 8,6 15,14 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -27,-19 -11,-4 -22,-7 -34,-7 -12,0 -23,3 -34,7 -11,4 -20,11 -27,19 -7,7 -12,16 -17,25 -4,9 -6,18 -6,27 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -28,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -23,14 -36,17 -12,4 -26,6 -40,6 -19,0 -37,-3 -53,-10 -17,-8 -31,-17 -43,-30 -12,-12 -22,-27 -29,-43 -6,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 17,-30 29,-43 12,-12 26,-21 42,-28 17,-8 34,-11 53,-11 18,0 36,3 53,10 16,7 31,17 43,29 13,13 22,27 29,43 8,16 11,34 11,53 0,15 -2,30 -8,45 -5,15 -12,28 -23,40 5,3 9,5 14,8 5,2 11,3 16,3 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
332 | + <path id="Curve19" fill="#A4A4A4" d="M587 690c10,0 19,0 29,0 0,14 0,28 0,42 -35,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,65 -48,129 -72,193 -11,0 -23,0 -34,0 -25,-64 -50,-128 -74,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-117 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 33,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,59 0,117 0,176zm179 -3c6,0 12,0 18,-2 6,-2 12,-4 18,-7 -11,-12 -23,-21 -35,-29 -12,-8 -27,-11 -43,-11 -5,0 -11,0 -17,2 -5,1 -11,3 -16,6 8,13 19,23 32,31 13,7 28,10 43,10zm-84 -81c7,-3 14,-5 22,-6 8,-2 15,-2 23,-2 11,0 21,1 31,4 9,3 18,6 27,11 9,5 17,11 25,17 7,7 15,14 22,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-10 -10,-20 -18,-28 -7,-8 -16,-14 -27,-18 -10,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -4,9 -7,18 -7,28 1,4 1,9 2,13zm254 67c0,22 0,44 0,66 -5,0 -10,0 -15,1 -15,0 -29,-2 -42,-6 -14,-5 -27,-11 -38,-20 -12,7 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -42,-29 -13,-13 -22,-27 -29,-44 -7,-17 -10,-34 -10,-53 0,-19 3,-36 10,-52 7,-17 17,-31 29,-43 12,-12 27,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,17 44,29 12,12 22,26 29,43 7,16 11,34 11,53 0,15 -3,30 -8,45 -5,14 -13,28 -23,39 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
333 | + <path id="Curve18" fill="#A0A0A0" d="M587 690c9,0 19,0 28,0 0,14 0,27 0,41 -35,0 -70,0 -105,0 0,-14 0,-27 0,-41 9,0 18,0 28,0 0,-51 0,-101 0,-151 -24,64 -48,128 -72,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,14 0,27 0,41 -36,0 -71,0 -107,0 0,-14 0,-27 0,-41 9,0 18,0 28,0 0,-59 0,-118 0,-177 -10,0 -19,0 -28,0 0,-14 0,-27 0,-41 32,0 64,0 97,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,14 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -42,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 32,31 13,7 27,11 42,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,5 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -27,-19 -11,-4 -22,-7 -34,-7 -12,0 -23,2 -34,7 -11,4 -20,11 -27,19 -7,7 -12,15 -17,25 -4,9 -6,18 -6,27 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -28,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -23,14 -36,17 -12,4 -26,6 -40,6 -19,0 -37,-3 -53,-10 -17,-8 -31,-17 -43,-30 -12,-12 -22,-27 -29,-43 -6,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 17,-30 29,-43 12,-12 26,-21 42,-28 17,-8 34,-11 53,-11 18,0 36,3 53,10 16,7 31,17 43,29 13,12 22,27 29,43 8,16 11,34 11,53 0,15 -2,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,3 11,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
334 | + <path id="Curve17" fill="#9B9B9B" d="M586 689c10,0 19,0 29,0 0,14 0,28 0,42 -35,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,65 -48,129 -72,193 -11,0 -23,0 -34,0 -25,-64 -50,-128 -74,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-117 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,59 0,117 0,176zm179 -3c6,0 12,0 18,-2 6,-2 12,-4 18,-7 -11,-12 -23,-21 -35,-29 -12,-8 -27,-11 -43,-11 -5,0 -11,0 -17,2 -6,1 -11,3 -16,6 8,13 19,23 32,31 13,7 28,10 43,10zm-84 -81c7,-3 14,-5 22,-6 7,-2 15,-2 23,-2 11,0 21,1 31,4 9,3 18,6 27,11 9,5 17,11 24,17 8,7 16,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -16,-14 -27,-18 -11,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -4,9 -7,18 -7,28 1,4 1,9 2,13zm254 67c0,22 0,44 0,66 -5,0 -10,0 -15,1 -15,0 -29,-2 -42,-7 -14,-4 -27,-10 -38,-19 -12,7 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -10,-34 -10,-53 0,-19 3,-36 10,-52 7,-17 17,-31 29,-43 12,-12 27,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,17 44,29 12,12 22,26 29,43 7,16 11,34 11,52 0,16 -3,31 -8,46 -5,14 -13,28 -23,39 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
335 | + <path id="Curve16" fill="#969696" d="M586 689c9,0 19,0 28,0 0,14 0,27 0,41 -35,0 -70,0 -105,0 0,-14 0,-27 0,-41 9,0 18,0 28,0 0,-51 0,-101 0,-151 -24,64 -48,128 -72,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,14 0,27 0,41 -36,0 -72,0 -107,0 0,-14 0,-27 0,-41 9,0 18,0 28,0 0,-59 0,-118 0,-177 -10,0 -19,0 -28,0 0,-14 0,-27 0,-41 32,0 64,0 97,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,14 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -42,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,5 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -27,-19 -11,-4 -22,-7 -34,-7 -12,0 -23,2 -34,7 -11,4 -20,11 -28,19 -6,7 -11,15 -16,25 -4,9 -6,18 -6,27 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -28,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -23,14 -36,17 -12,4 -26,6 -40,6 -19,0 -37,-3 -53,-10 -17,-8 -31,-17 -43,-30 -12,-12 -22,-27 -29,-43 -6,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 17,-30 29,-43 12,-12 26,-21 42,-28 17,-8 34,-11 53,-11 18,0 36,3 53,10 16,7 31,17 43,29 13,12 22,27 29,43 8,16 11,34 11,53 0,15 -2,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,3 11,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
336 | + <path id="Curve15" fill="#919191" d="M585 688c10,0 19,0 29,0 0,14 0,28 0,42 -35,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,129 -72,193 -11,0 -23,0 -34,0 -25,-64 -50,-129 -74,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,58 0,117 0,176zm179 -3c6,0 12,0 18,-2 6,-2 12,-4 18,-7 -11,-12 -23,-21 -35,-29 -12,-8 -27,-11 -43,-11 -6,0 -11,0 -17,2 -6,1 -11,3 -16,6 8,13 19,23 32,31 13,7 28,10 43,10zm-84 -81c7,-3 14,-5 22,-6 7,-2 15,-2 23,-2 11,0 21,1 31,4 9,3 18,6 27,11 9,5 17,11 24,17 8,7 16,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -16,-14 -27,-18 -11,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -4,9 -7,18 -7,28 1,4 1,9 2,13zm254 67c0,22 0,44 0,66 -5,0 -10,0 -15,1 -15,0 -29,-2 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -36,18 -13,4 -26,6 -40,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -10,-34 -10,-53 0,-19 3,-36 10,-52 7,-17 17,-31 29,-43 12,-12 27,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,43 7,16 11,34 11,52 0,16 -3,31 -8,46 -5,14 -13,28 -23,39 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
337 | + <path id="Curve14" fill="#8C8C8C" d="M585 688c9,0 19,0 28,0 0,14 0,27 0,41 -35,0 -70,0 -105,0 0,-14 0,-27 0,-41 9,0 18,0 27,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,14 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-27 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -42,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,5 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -33,-7 -12,0 -23,2 -34,7 -11,4 -20,11 -28,19 -6,7 -11,15 -16,25 -4,9 -6,18 -6,27 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -28,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -23,14 -36,17 -12,4 -26,6 -40,6 -19,0 -37,-3 -53,-10 -17,-8 -31,-17 -43,-30 -12,-12 -22,-27 -29,-43 -6,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 17,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 53,-10 18,0 36,3 53,10 16,7 31,17 43,29 13,12 22,27 29,43 8,16 11,34 11,53 0,15 -2,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
338 | + <path id="Curve13" fill="#878787" d="M584 687c10,0 19,0 29,0 0,14 0,28 0,42 -36,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,129 -72,193 -11,0 -23,0 -34,0 -25,-64 -50,-129 -74,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,58 0,117 0,176zm179 -3c6,0 12,0 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -12,-8 -27,-11 -43,-11 -6,0 -11,0 -17,2 -6,1 -11,3 -16,6 8,13 19,23 32,31 13,7 28,10 43,10zm-84 -81c7,-3 14,-5 22,-6 7,-2 15,-2 23,-2 11,0 21,1 31,4 9,3 18,6 27,11 9,5 17,11 24,17 8,7 16,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -16,-14 -27,-18 -11,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -4,9 -7,18 -7,28 1,4 1,9 2,13zm254 67c0,22 0,44 0,66 -5,0 -10,0 -15,1 -15,0 -29,-2 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -36,18 -13,4 -26,6 -40,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -10,-34 -10,-53 0,-19 3,-36 10,-52 7,-17 17,-31 29,-43 12,-12 27,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,43 7,16 11,34 11,52 0,16 -3,31 -8,46 -5,14 -13,27 -23,39 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
339 | + <path id="Curve12" fill="#828282" d="M584 687c9,0 19,0 28,0 0,13 0,27 0,41 -35,0 -70,0 -106,0 0,-14 0,-28 0,-41 10,0 19,0 28,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,13 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-28 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -42,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,4 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -34,-7 -11,0 -22,2 -33,7 -11,4 -20,11 -28,19 -6,7 -11,15 -16,24 -4,10 -6,19 -6,28 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -28,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -24,14 -36,17 -12,4 -26,6 -40,6 -19,0 -37,-3 -53,-11 -17,-7 -31,-16 -43,-29 -12,-12 -22,-27 -29,-43 -7,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 17,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 52,-10 19,0 37,3 54,10 16,7 31,17 43,29 13,12 22,27 29,43 8,16 11,34 11,53 0,15 -2,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
340 | + <path id="Curve11_x0020_" fill="#7E7E7E" d="M583 686c10,0 19,0 29,0 0,14 0,28 0,42 -36,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,129 -72,193 -11,0 -23,0 -35,0 -24,-64 -49,-129 -73,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,58 0,117 0,176zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -12,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 19,24 32,32 13,7 28,10 43,10zm-85 -81c8,-3 15,-5 23,-6 7,-2 15,-2 23,-2 11,0 21,1 31,4 9,2 18,6 27,11 8,5 17,11 24,17 8,7 16,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -16,-14 -27,-18 -11,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -4,9 -7,18 -7,28 1,4 1,9 1,13zm255 67c0,22 0,44 0,66 -5,0 -10,0 -15,1 -15,0 -29,-2 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -36,18 -13,4 -26,6 -40,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -10,-34 -10,-53 0,-19 3,-36 10,-52 7,-17 17,-31 29,-43 12,-12 26,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,43 7,16 11,34 11,52 0,16 -3,31 -8,45 -5,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
341 | + <path id="Curve10_x0020_" fill="#797979" d="M583 686c9,0 19,0 28,0 0,13 0,27 0,41 -35,0 -70,0 -106,0 0,-14 0,-28 0,-41 10,0 19,0 28,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,13 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-28 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -42,-12 -6,0 -12,1 -17,2 -6,1 -11,3 -16,6 8,14 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,4 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -34,-7 -11,0 -22,2 -33,7 -11,4 -20,11 -28,19 -6,7 -12,15 -16,24 -4,10 -6,19 -6,28 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -28,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -24,13 -36,17 -12,4 -26,6 -40,6 -19,0 -37,-3 -53,-11 -17,-7 -31,-16 -43,-29 -12,-12 -22,-27 -29,-43 -7,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 17,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 52,-10 19,0 37,3 54,10 16,7 31,17 43,29 12,12 22,27 29,43 8,16 11,34 11,53 0,15 -2,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
342 | + <path id="Curve9" fill="#747474" d="M582 685c10,0 19,0 29,0 0,14 0,28 0,42 -36,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,129 -72,193 -11,0 -23,0 -35,0 -24,-64 -49,-129 -73,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,58 0,117 0,176zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -12,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 19,24 32,32 13,7 28,10 43,10zm-85 -81c8,-3 15,-5 23,-6 7,-2 15,-3 23,-3 11,0 21,2 31,5 9,2 18,6 27,11 8,5 17,11 24,17 8,7 16,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -17,-14 -27,-18 -11,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -4,9 -7,18 -7,28 1,4 1,9 1,13zm255 67c0,22 0,44 0,65 -5,1 -10,1 -15,2 -15,0 -29,-2 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -37,18 -12,4 -25,6 -39,6 -19,0 -37,-4 -54,-11 -16,-7 -30,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -10,-34 -10,-53 0,-19 3,-36 10,-52 7,-17 17,-31 29,-43 12,-12 26,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,43 7,16 11,34 11,52 0,16 -3,31 -8,45 -5,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
343 | + <path id="Curve8" fill="#6F6F6F" d="M582 685c9,0 19,0 28,0 0,13 0,27 0,41 -35,0 -70,0 -106,0 0,-14 0,-28 0,-41 10,0 19,0 28,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,13 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-28 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -43,-12 -5,0 -11,1 -16,2 -6,1 -11,3 -16,6 8,14 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,4 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -34,-7 -11,0 -22,2 -33,7 -11,4 -20,11 -28,19 -6,7 -12,15 -16,24 -4,10 -6,19 -6,28 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -29,-2 -42,-6 -14,-4 -26,-11 -38,-20 -11,8 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-3 -53,-11 -17,-7 -31,-16 -43,-29 -12,-12 -22,-27 -29,-43 -7,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 16,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 52,-10 19,0 37,3 54,10 16,7 31,17 43,29 12,12 22,27 29,43 8,16 11,34 11,53 0,15 -3,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
344 | + <path id="Curve7_x0020_" fill="#6A6A6A" d="M581 684c10,0 19,0 29,0 0,14 0,28 0,42 -36,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,128 -72,193 -11,0 -23,0 -35,0 -24,-65 -49,-129 -73,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,58 0,117 0,176zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -13,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 19,24 32,32 13,7 27,10 43,10zm-85 -81c7,-3 15,-5 23,-6 7,-2 15,-3 23,-3 11,0 21,2 31,5 9,2 18,6 27,11 8,5 17,11 24,17 8,7 16,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -17,-14 -27,-18 -11,-5 -22,-7 -34,-7 -12,0 -23,2 -33,6 -11,5 -20,11 -28,20 -7,7 -12,15 -16,24 -5,9 -7,18 -7,28 1,4 1,9 1,13zm255 67c0,22 0,44 0,65 -5,1 -10,1 -15,2 -15,0 -29,-3 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -37,18 -12,4 -25,6 -39,6 -19,0 -37,-4 -54,-11 -16,-7 -31,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -11,-34 -11,-53 0,-19 4,-36 11,-52 7,-17 17,-31 29,-43 12,-12 26,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,43 7,16 11,33 11,52 0,16 -3,31 -8,45 -5,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 15,4 0,-8 0,-16 0,-24 13,0 25,0 37,0z"/> |
345 | + <path id="Curve6" fill="#656565" d="M581 684c9,0 19,0 28,0 0,13 0,27 0,41 -35,0 -70,0 -106,0 0,-14 0,-28 0,-41 10,0 19,0 28,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,13 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-28 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -43,-12 -5,0 -11,1 -16,2 -6,1 -11,3 -16,6 8,13 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 22,1 31,4 10,3 19,7 27,12 9,4 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -34,-7 -11,0 -22,2 -33,7 -11,4 -20,11 -28,19 -6,7 -12,15 -16,24 -4,10 -6,19 -6,28 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -14,0 -29,-2 -42,-6 -14,-4 -26,-11 -38,-20 -12,8 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-3 -53,-11 -17,-7 -31,-16 -43,-29 -12,-12 -22,-27 -29,-43 -7,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 16,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 52,-10 19,0 37,3 54,10 16,7 31,17 43,29 12,12 22,27 29,43 7,16 11,34 11,53 0,15 -3,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
346 | + <path id="Curve5" fill="#606060" d="M580 683c10,0 19,0 29,0 0,14 0,28 0,42 -36,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,128 -72,193 -11,0 -23,0 -35,0 -24,-65 -49,-129 -73,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-176 -9,0 -19,0 -28,0 0,-14 0,-28 0,-42 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,42 -10,0 -19,0 -29,0 0,58 0,117 0,176zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -13,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 19,24 32,31 13,8 27,11 43,11zm-85 -81c7,-3 15,-5 23,-6 7,-2 15,-3 23,-3 11,0 21,2 31,5 9,2 18,6 27,11 8,5 17,11 24,17 8,7 15,14 23,22 12,-15 18,-31 18,-50 0,-12 -2,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -17,-14 -27,-19 -11,-4 -22,-6 -34,-6 -12,0 -23,2 -34,6 -10,5 -19,11 -27,20 -7,7 -12,15 -16,24 -5,9 -7,18 -7,28 1,4 1,9 1,13zm255 67c0,22 0,44 0,65 -5,1 -10,1 -15,2 -15,0 -29,-3 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -37,18 -12,4 -25,6 -39,6 -19,0 -37,-4 -54,-11 -16,-7 -31,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -11,-34 -11,-53 0,-19 4,-36 11,-53 7,-16 17,-30 29,-42 12,-12 26,-22 43,-29 16,-7 34,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,42 7,17 11,34 11,53 0,16 -3,31 -8,45 -5,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 15,4 0,-8 0,-16 0,-24 13,0 25,0 37,0z"/> |
347 | + <path id="Curve4_x0020_" fill="#5C5C5C" d="M580 683c9,0 19,0 28,0 0,13 0,27 0,41 -35,0 -70,0 -106,0 0,-14 0,-28 0,-41 10,0 19,0 28,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,13 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-28 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -43,-12 -5,0 -11,1 -16,2 -6,1 -11,3 -16,6 7,13 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 21,1 31,4 10,3 19,7 27,12 9,4 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-34 -5,-11 -11,-20 -18,-28 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -34,-7 -11,0 -22,2 -33,7 -11,4 -20,11 -28,19 -6,7 -12,15 -16,24 -4,9 -6,19 -6,28 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -15,0 -29,-2 -42,-6 -14,-4 -26,-11 -38,-20 -12,8 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-3 -53,-11 -17,-7 -31,-17 -43,-29 -12,-12 -22,-27 -29,-43 -7,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 16,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 52,-10 19,0 37,3 54,10 16,7 31,17 43,29 12,12 22,27 29,43 7,16 11,34 11,53 0,15 -3,30 -8,45 -5,15 -13,28 -23,40 5,3 9,5 14,7 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
348 | + <path id="Curve3_x0020_" fill="#575757" d="M579 682c10,0 19,0 29,0 0,14 0,28 0,42 -36,0 -71,0 -106,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-50 0,-100 0,-151 -24,64 -48,128 -72,193 -11,0 -23,0 -35,0 -24,-65 -49,-129 -73,-193 0,51 0,101 0,151 10,0 20,0 30,0 0,14 0,28 0,42 -36,0 -72,0 -108,0 0,-14 0,-28 0,-42 9,0 19,0 28,0 0,-59 0,-118 0,-177 -9,0 -19,0 -28,0 0,-13 0,-27 0,-41 32,0 65,0 97,0 24,61 47,122 71,183 23,-61 47,-122 70,-183 33,0 65,0 98,0 0,14 0,28 0,41 -10,0 -19,0 -29,0 0,59 0,118 0,177zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -13,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 19,24 32,31 13,8 27,11 43,11zm-85 -81c7,-3 15,-5 23,-6 7,-2 15,-3 23,-3 11,0 21,2 31,5 9,2 18,6 27,11 8,5 17,11 24,17 8,7 15,14 22,22 13,-15 19,-31 19,-50 0,-12 -3,-23 -7,-34 -4,-11 -10,-20 -18,-28 -7,-8 -17,-14 -27,-19 -11,-4 -22,-6 -34,-6 -12,0 -23,2 -34,6 -10,5 -19,11 -27,20 -7,7 -12,15 -16,24 -5,9 -7,18 -7,28 1,4 1,9 1,13zm255 67c0,22 0,44 0,65 -5,1 -10,1 -15,2 -15,0 -29,-3 -43,-7 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -37,18 -12,4 -25,6 -39,6 -20,0 -37,-4 -54,-11 -16,-7 -31,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -11,-34 -11,-53 0,-19 4,-36 11,-53 7,-16 17,-30 29,-42 12,-12 26,-22 43,-29 16,-7 33,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,42 7,17 11,34 11,53 0,16 -3,31 -8,45 -5,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 15,4 0,-8 0,-16 0,-24 13,0 25,0 37,0z"/> |
349 | + <path id="Curve2_x0020_" fill="#525252" d="M579 682c9,0 19,0 28,0 0,13 0,27 0,41 -35,0 -70,0 -106,0 0,-14 0,-28 0,-41 10,0 19,0 28,0 0,-51 0,-101 0,-151 -23,64 -47,128 -71,192 -12,0 -23,0 -35,0 -25,-64 -49,-128 -74,-192 0,50 0,100 0,151 10,0 20,0 30,0 0,13 0,27 0,41 -36,0 -72,0 -108,0 0,-14 0,-28 0,-41 10,0 19,0 29,0 0,-59 0,-118 0,-177 -10,0 -19,0 -29,0 0,-14 0,-28 0,-41 33,0 65,0 98,0 23,61 47,122 70,183 24,-61 47,-122 71,-183 32,0 65,0 97,0 0,13 0,27 0,41 -9,0 -19,0 -28,0 0,59 0,118 0,177zm178 -3c7,0 13,-1 19,-3 6,-1 12,-4 17,-7 -11,-11 -22,-21 -35,-28 -12,-8 -26,-12 -43,-12 -5,0 -11,1 -16,2 -6,1 -11,3 -16,6 7,13 18,24 31,31 14,7 28,11 43,11zm-84 -81c7,-3 14,-5 22,-7 8,-1 16,-2 23,-2 11,0 21,1 31,4 10,3 19,7 27,12 9,4 17,10 25,17 8,6 15,13 22,21 12,-14 18,-31 18,-49 0,-12 -2,-24 -6,-35 -5,-10 -11,-19 -18,-27 -8,-8 -17,-14 -28,-19 -10,-5 -21,-7 -34,-7 -11,0 -22,2 -33,7 -11,4 -20,11 -28,19 -6,7 -12,15 -16,24 -4,9 -6,19 -6,28 0,5 1,9 1,14zm254 66c0,22 0,44 0,66 -5,0 -10,1 -15,1 -15,0 -29,-2 -42,-6 -14,-4 -26,-11 -38,-20 -12,8 -24,13 -36,17 -13,4 -26,6 -40,6 -19,0 -37,-3 -53,-11 -17,-7 -31,-17 -43,-29 -12,-12 -22,-27 -29,-43 -7,-17 -10,-35 -10,-54 0,-18 4,-36 11,-52 7,-16 16,-31 29,-43 12,-12 26,-21 42,-29 17,-7 34,-10 52,-10 19,0 37,3 54,10 16,7 31,17 43,29 12,12 22,27 29,43 7,16 11,34 11,53 0,15 -3,30 -8,45 -5,15 -13,28 -23,39 4,4 9,6 14,8 5,2 10,4 16,4 0,-8 0,-16 0,-24 12,0 24,0 36,0z"/> |
350 | + <path id="Curve1" fill="#4D4D4D" fill-rule="nonzero" d="M578 681l29 0 0 42 -106 0 0 -42 28 0 0 -151 -72 193 -35 0 -73 -193 0 151 30 0 0 42 -108 0 0 -42 28 0 0 -177 -28 0 0 -41 97 0 71 183 70 -183 98 0 0 41 -29 0 0 177zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -13,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 18,24 32,31 13,8 27,11 43,11zm-85 -81c7,-3 15,-5 23,-6 7,-2 15,-3 23,-3 11,0 21,2 31,5 9,2 18,6 27,11 8,5 17,11 24,17 8,7 15,14 22,22 13,-15 19,-31 19,-50 0,-12 -3,-23 -7,-34 -4,-11 -10,-20 -18,-28 -8,-8 -17,-14 -27,-19 -11,-4 -22,-6 -34,-6 -12,0 -23,2 -34,6 -10,5 -19,11 -27,20 -7,7 -12,15 -16,24 -5,9 -7,18 -7,28l1 13zm255 67l0 65 -15 1c-15,0 -29,-2 -43,-6 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -37,18 -12,4 -25,6 -39,6 -20,0 -37,-4 -54,-11 -16,-7 -31,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -11,-35 -11,-53 0,-19 4,-36 11,-53 7,-16 17,-30 29,-42 12,-12 26,-22 43,-29 16,-7 33,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,42 7,17 11,34 11,53 0,16 -3,31 -8,45 -6,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 15,4l0 -24 37 0z"/> |
351 | + <path id="Curve0_x0020_" fill="white" fill-rule="nonzero" d="M578 681l29 0 0 42 -106 0 0 -42 28 0 0 -151 -72 193 -35 0 -73 -193 0 151 30 0 0 42 -108 0 0 -42 28 0 0 -177 -28 0 0 -41 97 0 71 183 70 -183 98 0 0 41 -29 0 0 177zm179 -3c6,0 12,-1 18,-2 6,-2 12,-4 18,-8 -11,-11 -23,-20 -35,-28 -13,-8 -27,-12 -43,-12 -6,0 -11,1 -17,2 -6,2 -11,4 -16,6 8,14 18,24 32,31 13,8 27,11 43,11zm-85 -81c7,-3 15,-5 23,-6 7,-2 15,-3 23,-3 11,0 21,2 31,5 9,2 18,6 27,11 8,5 17,11 24,17 8,7 15,14 22,22 13,-15 19,-31 19,-50 0,-12 -3,-23 -7,-34 -4,-11 -10,-20 -18,-28 -8,-8 -17,-14 -27,-19 -11,-4 -22,-6 -34,-6 -12,0 -23,2 -34,6 -10,5 -19,11 -27,20 -7,7 -12,15 -16,24 -5,9 -7,18 -7,28l1 13zm255 67l0 65 -15 1c-15,0 -29,-2 -43,-6 -13,-4 -26,-10 -37,-20 -12,8 -24,14 -37,18 -12,4 -25,6 -39,6 -20,0 -37,-4 -54,-11 -16,-7 -31,-17 -43,-29 -12,-13 -21,-27 -28,-44 -7,-17 -11,-35 -11,-53 0,-19 4,-36 11,-53 7,-16 17,-30 29,-42 12,-12 26,-22 43,-29 16,-7 33,-11 52,-11 19,0 37,4 53,11 17,7 31,16 44,29 12,12 22,26 29,42 7,17 11,34 11,53 0,16 -3,31 -8,45 -6,15 -13,28 -23,40 4,3 9,6 14,8 5,2 10,3 15,4l0 -24 37 0z"/> |
352 | + <path fill="black" fill-opacity="0.600000" d="M375 198c0,103 -84,187 -187,187 -104,0 -188,-84 -188,-187 0,-104 84,-188 188,-188 103,0 187,84 187,188l0 0z"/> |
353 | + <path fill="whitesmoke" fill-rule="nonzero" d="M375 188c0,103 -84,187 -187,187 -104,0 -188,-84 -188,-187 0,-104 84,-188 188,-188 103,0 187,84 187,188l0 0z"/> |
354 | + <path fill="#DD4814" fill-rule="nonzero" d="M344 188c0,86 -70,156 -156,156 -87,0 -157,-70 -157,-156 0,-87 70,-157 157,-157 86,0 156,70 156,157l0 0z"/> |
355 | + <path fill="whitesmoke" fill-rule="nonzero" d="M255 280c-5,5 -60,-23 -67,-23 -7,0 -62,28 -68,24 -5,-4 4,-65 2,-72 -2,-7 -46,-50 -44,-56 3,-7 63,-17 69,-21 6,-4 33,-59 40,-59 7,0 35,55 41,59 6,4 66,13 69,20 2,7 -42,50 -44,57 -2,7 8,67 2,71z"/> |
356 | + </g> |
357 | + </g> |
358 | +</svg> |
359 | |
360 | === added file 'charms/trusty/ibm-mq/metadata.yaml' |
361 | --- charms/trusty/ibm-mq/metadata.yaml 1970-01-01 00:00:00 +0000 |
362 | +++ charms/trusty/ibm-mq/metadata.yaml 2015-03-11 04:53:46 +0000 |
363 | @@ -0,0 +1,12 @@ |
364 | +name: ibm-mq |
365 | +summary: IBM MQ Messaging product |
366 | +maintainer: jujusupp@us.ibm.com |
367 | +description: | |
368 | + IBM MQ provides for messaging services to transport multiple types of |
369 | + data. |
370 | +categories: |
371 | + - misc |
372 | +subordinate: false |
373 | +provides: |
374 | + messaging: |
375 | + interface: ibm-mq |
376 | |
377 | === added file 'charms/trusty/ibm-mq/revision' |
378 | --- charms/trusty/ibm-mq/revision 1970-01-01 00:00:00 +0000 |
379 | +++ charms/trusty/ibm-mq/revision 2015-03-11 04:53:46 +0000 |
380 | @@ -0,0 +1,1 @@ |
381 | +1 |
The modifications required by the user (sysctl.conf, limits.conf, adduser) are still causing a problem for me. Charm hooks do run as root, so permissions should not be a problem. The hooks here are doing package installs which require root permissions.
I've found other charms that do modify the sysctl.conf (like Ceph) so it's something that others are doing. The charmhelper package provides a function to add a user, so that should definitely be doable.
Even if it's not possible in LXC, the charm still needs to be able to do this. LXC isn't really how charms would be actually used, so a different testing method needs to be employed when a limit of LXC prevents function. We were unable to fully test the GPFS charm under LXC because of the requirement to load a module, which LXC can't do.
If you'd like to open a bug for fixing this, I'd be ok with doing this merge with that bug pending, but I think it will have to be resolved before we can attempt to publish this to the charm store.