Merge lp:~umasv1987/charms/trusty/was-base/was-basefix into lp:~ibmcharmers/charms/trusty/was-base/devel
- Trusty Tahr (14.04)
- was-basefix
- Merge into devel
Proposed by
Uma
Status: | Merged |
---|---|
Merged at revision: | 8 |
Proposed branch: | lp:~umasv1987/charms/trusty/was-base/was-basefix |
Merge into: | lp:~ibmcharmers/charms/trusty/was-base/devel |
Diff against target: |
888 lines (+810/-0) 15 files modified
README.md (+109/-0) config.yaml (+45/-0) copyright (+13/-0) hooks/config-changed (+383/-0) hooks/install (+36/-0) hooks/start (+21/-0) hooks/stop (+14/-0) hooks/website-relation-changed (+3/-0) hooks/website-relation-joined (+12/-0) icon.svg (+53/-0) metadata.yaml (+11/-0) tests/00-setup (+19/-0) tests/10-bundles-test.py (+78/-0) tests/bundles.yaml (+10/-0) tests/local.yaml (+3/-0) |
To merge this branch: | bzr merge lp:~umasv1987/charms/trusty/was-base/was-basefix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
neha verma (community) | Approve | ||
Review via email: mp+255637@code.launchpad.net |
Commit message
Description of the change
WAS Base Charm
To post a comment you must log in.
- 2. By Uma
-
Commiting Test suite
- 3. By Uma
-
Commiting Test suite
- 4. By Uma
-
Removed extra unwanted file
- 5. By Uma Veeranna <email address hidden>
-
commitng review comment changes
- 6. By Uma Veeranna <email address hidden>
-
Updated icon.svg
- 7. By Prabakaran
-
WAS Base charm code checkin
- 8. By Uma
-
WAS Base charm code checkin
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'README.md' |
2 | --- README.md 1970-01-01 00:00:00 +0000 |
3 | +++ README.md 2015-07-13 10:17:33 +0000 |
4 | @@ -0,0 +1,109 @@ |
5 | +# Overview |
6 | + |
7 | +WebSphere Application Server Base |
8 | + |
9 | +WebSphere Application Server is a proven, high-performance transaction engine that can help build, run, integrate, and manage dynamic web applications. |
10 | +For details on IBM Websphere Application Server please visit "http://www-03.ibm.com/software/products/en/appserv-was". |
11 | + |
12 | + |
13 | +# Usage |
14 | + |
15 | +Download your licensed IBM Installation Manager software version 1.5 and above and upload to your apache repository. |
16 | + |
17 | +Download your licensed IBM Websphere Base software 8.5.5.0 version and upload to your apache repository. |
18 | + |
19 | +Download your licensed IBM Websphere Base software WAS fixpack version 8.5.5.4 and upload to your apache repository. |
20 | + |
21 | +Put up all the downloaded contents on the web server like Apache and configure apache to serve these packages. These packages can be accessed using a URL from the web server. |
22 | + |
23 | + |
24 | +#Creating the repositories in Apache |
25 | + |
26 | +Run steps below with admin access |
27 | + |
28 | +Install needed packages |
29 | + apt-get install dpkg-dev apache2 |
30 | + |
31 | +Create the repository on apache server Under your apache repository directory. |
32 | +Configure apache server to allow access to the repository. |
33 | + |
34 | +To install IBM Websphere Application Server Base you need to install IBM Installation Manager software as prerequisite. |
35 | +To install IBM Installation Manager you need to get the packages for ubuntu, for information about the software and builds please visit (http://www-01.ibm.com/software/passportadvantage/). |
36 | + |
37 | +To install the downloaded binaries you must agree to the IBM license. You can view the full license for IBM Installation Manager and IBM WebSphere Application Server Base by visiting the [Software license agreements search website](http://www-03.ibm.com/software/sla/sladb.nsf/search). Search for "IBM Installation Manager" and "IBM Websphere Application Server" and choose the license that applies to the version you are using. |
38 | + |
39 | + |
40 | +Run the following to deploy this charm: |
41 | + |
42 | + juju deploy was-base |
43 | + |
44 | +At this point the charm will wait until the user accepts the license. If you |
45 | +agree to the license, run the following command: |
46 | + |
47 | +If the was_url and im_filename is configured in the config.yaml: |
48 | + |
49 | + juju set was-base accept-ibm-im-license=True accept-ibm-websphere-license=True |
50 | + |
51 | +If not, |
52 | + |
53 | + juju set was-base accept-ibm-im-license=True accept-ibm-websphere-license=True was_url=<Web server URL> im_file_name=<IM package name> im_install_path=<IM Installation Path> |
54 | + |
55 | + |
56 | +You can then browse to "http://was-base unit's ip-address:9060/ibm/cinsole" to view WAS Console. |
57 | + |
58 | + |
59 | +# Configuration |
60 | + |
61 | +`accept-ibm-im-license` |
62 | +The IBM Installation Manager software comes with special terms and conditions from IBM. |
63 | +The IBM Installation Manager software can only be used by accepting the terms and |
64 | +conditions found in the IBM-Installation-Manager-license.txt file. |
65 | + |
66 | +Setting this option to True indicates that you have read and accept the |
67 | +IBM Installation Manager terms and conditions found in the license file. |
68 | +The license file(s) can be found in the product binaries you downloaded. |
69 | + |
70 | +`accept-ibm-websphere-license` |
71 | +Before you can use, extract, or install IBM WebSphere Application Server |
72 | +for Developers V8.5.5, you must accept the terms of International License |
73 | +Agreement for Non-Warranted Programs and additional license information. |
74 | +Please read the license agreement carefully. |
75 | + |
76 | +Check the Usage section on getting the license agreement. |
77 | + |
78 | +**The WebSphere software cannot be installed until the terms and |
79 | +contions are accepted. The charm will not function correctly until the |
80 | +this configuration option is set to True.** |
81 | + |
82 | +`was_url` |
83 | +The web server URL from which IBM IM, IBM WAS Base and fixpack packages can be downloaded. |
84 | + |
85 | +`im_install_path` |
86 | +Install Location for Installation Manager. Ex : "/opt/IBM/InstallationManager". Here IM will install at this location, It can be changed if IM needs to be installed at some other place. |
87 | + |
88 | + |
89 | +`im_file_name` |
90 | +The IBM Installation Manager Package name. If not set, It is assigned the value "Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip" for x86_64 based machine. |
91 | + |
92 | +`sha_im` |
93 | +Checksum value to check integrity of IBM Installation Manager package. The Charm uses sha1sum to check the integrity. If empty, it does not carry out the integrity check. Use `sha1sum <Package Location/Package Name> | cut -d" " -f1` to find out Checksum value for downloaded package. Cryptographic value should be altered by the user only when the package name is change. Else it should not be altered. |
94 | + |
95 | +#IBM WAS Base Information |
96 | + |
97 | +(1) General Information |
98 | +Information on IBM WAS available at the [WAS Infocenter] (http://www-01.ibm.com/support/knowledgecenter/SSAW57_8.5.5/as_ditamaps/was855_welcome_ndmp.html?lang=en). |
99 | + |
100 | +(2) Download Information |
101 | +Information on procuring WAS product is available at the [Passport Advantage Site](http://www-01.ibm.com/software/passportadvantage/). |
102 | + |
103 | +Refer this URL for WAS 8.5.5.0 download (http://www-01.ibm.com/support/docview.wss?uid=swg27038625). |
104 | + |
105 | +Refer this URL for WAS 8.5.5.4 fixpack download (http://www-01.ibm.com/support/docview.wss?uid=swg24038539). |
106 | + |
107 | +A trial version is available [here] ( http://www.ibm.com/developerworks/downloads/ws/was/index.html). |
108 | + |
109 | +Refer this URL for more information about Downloadable files (http://www-01.ibm.com/support/docview.wss?uid=swg24038380). |
110 | + |
111 | +(3) Contact Information |
112 | + |
113 | +For issues with this charm, please contact jujusupp@us.ibm.com |
114 | |
115 | === added file 'config.yaml' |
116 | --- config.yaml 1970-01-01 00:00:00 +0000 |
117 | +++ config.yaml 2015-07-13 10:17:33 +0000 |
118 | @@ -0,0 +1,45 @@ |
119 | +options: |
120 | + was_url: |
121 | + type: string |
122 | + default: "" |
123 | + description: | |
124 | + Download url for WAS Base packages, This is the URL containing WAS Base packages, |
125 | + mention till the folder which contains packages ex: http://9.124.100.99/debs/WAS-BASE/. |
126 | + im_install_path: |
127 | + type: string |
128 | + default: "/opt/IBM/InstallationManager" |
129 | + description: | |
130 | + Install Location for Installation Manager.Please enter the path |
131 | + where you wants to install Install Manager ex : /opt/IBM/InstallationManager |
132 | + here IM will install at this location, It Can be changed if IM needs to be installed at some other place. |
133 | + im_file_name: |
134 | + type: string |
135 | + default: "" |
136 | + description: | |
137 | + Name of the IBM IM package. If not set, the Charm uses a predefined |
138 | + package name for download from the url location. If the predefined |
139 | + package is not available at url location or if set incorrectly, |
140 | + the charm cannot install the IBM IM software. |
141 | + accept-ibm-websphere-license: |
142 | + type: boolean |
143 | + default: False |
144 | + description: | |
145 | + The IBM WebSphere Application Server software comes with special terms and |
146 | + conditions from IBM. The WebSphere software can only be used by |
147 | + accepting the license terms and conditions. |
148 | + accept-ibm-im-license: |
149 | + type: boolean |
150 | + default: False |
151 | + description: | |
152 | + The IBM Installation Manager software comes with special terms and |
153 | + conditions from IBM. The Installation Manager software can only be used by |
154 | + accepting the license terms and conditions. |
155 | + sha_im: |
156 | + type: string |
157 | + default: "" |
158 | + description: | |
159 | + Checksum value to check integrity of IBM IM pacakage. The Charm uses |
160 | + sha1sum to check the integrity. For example, run the command: |
161 | + <sha1sum Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip | cut -d " " -f1> |
162 | + to get the checksum value for IBM Installation Manager pacakage. |
163 | + If empty, it does not carry out the integrity check. |
164 | |
165 | === added file 'copyright' |
166 | --- copyright 1970-01-01 00:00:00 +0000 |
167 | +++ copyright 2015-07-13 10:17:33 +0000 |
168 | @@ -0,0 +1,13 @@ |
169 | +Copyright 2015 IBM Corporation |
170 | + |
171 | +This Charm is licensed under the Apache License, Version 2.0 (the "License"); |
172 | +you may not use this file except in compliance with the License. |
173 | +You may obtain a copy of the License at |
174 | + |
175 | + http://www.apache.org/licenses/LICENSE-2.0 |
176 | + |
177 | +Unless required by applicable law or agreed to in writing, software |
178 | +distributed under the License is distributed on an "AS IS" BASIS, |
179 | +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
180 | +See the License for the specific language governing permissions and |
181 | +limitations under the License. |
182 | |
183 | === added directory 'files' |
184 | === added directory 'files/archives' |
185 | === added directory 'hooks' |
186 | === added file 'hooks/config-changed' |
187 | --- hooks/config-changed 1970-01-01 00:00:00 +0000 |
188 | +++ hooks/config-changed 2015-07-13 10:17:33 +0000 |
189 | @@ -0,0 +1,383 @@ |
190 | +#!/bin/bash |
191 | +# config-changed occurs everytime a new configuration value is updated (juju set) |
192 | +set -e |
193 | + |
194 | +WAS_BASE_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/BASE |
195 | +ARCHIVE_DIR=files/archives |
196 | + |
197 | +# Check whether IM is installed |
198 | +is_im_installed() |
199 | +{ |
200 | + if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then |
201 | + echo "True" |
202 | + else |
203 | + echo "False" |
204 | + fi |
205 | + |
206 | +} |
207 | + |
208 | + |
209 | +# Check whether WAS BASE is installed |
210 | +is_was_base_installed() |
211 | +{ |
212 | + if [ -d $WAS_BASE_INSTALL_PATH/bin ]; then |
213 | + echo "True" |
214 | + else |
215 | + echo "False" |
216 | + fi |
217 | + |
218 | +} |
219 | + |
220 | + |
221 | +# Remove was base, if installed |
222 | +remove_was_base_software() |
223 | +{ |
224 | + |
225 | + was_base_installed=`is_was_base_installed` |
226 | + if [ $was_base_installed == True ]; then |
227 | + juju-log "IBM WAS Base: Removing WAS BASE Installation" |
228 | + juju-log "IBM WAS Base: Server stopping" |
229 | + $WAS_BASE_INSTALL_PATH/profiles/test/bin/stopServer.sh server1 |
230 | + if [ "$?" -ne "0" ]; then |
231 | + juju-log "IBM WAS Base: Error while stoping the server" |
232 | + else |
233 | + juju-log "IBM WAS Base: Server stopped successfully" |
234 | + fi |
235 | + |
236 | + # Uninstalling WAS BASE |
237 | + $IM_INSTALL_PATH/eclipse/tools/imcl uninstall com.ibm.websphere.BASE.v85 -installationDirectory $WAS_BASE_INSTALL_PATH |
238 | + if [ -d /root/IBM/WebSphere/AppServer/V85/BASE ]; then |
239 | + juju-log "IBM WAS Base: Removing install dir" |
240 | + cd /root |
241 | + rm -rf IBM/WebSphere/AppServer/V85/BASE |
242 | + else |
243 | + juju-log "IBM WAS Base: Install directory is not exist" |
244 | + fi |
245 | + fi |
246 | + juju-log "IBM WAS Base: Uninstalling WAS BASE software completed" |
247 | +} |
248 | + |
249 | +#Remove IM, if installed |
250 | +remove_im_software() |
251 | +{ |
252 | + im_installed=`is_im_installed` |
253 | + if [ $im_installed == True ]; then |
254 | + juju-log "IBM WAS Base: Removing IBM IM software." |
255 | + /root/var/ibm/InstallationManager/uninstall/uninstallc |
256 | + juju-log "IBM WAS Base: Removed IBM IM software" |
257 | + fi |
258 | + |
259 | +} |
260 | + |
261 | +# Remove WAS BASE if license not accpeted |
262 | +remove_unaccepted_software() |
263 | +{ |
264 | + |
265 | + if [ $1 == False ]; then |
266 | + juju-log "IBM WAS Base: Removing IBM WebSphere (if installed) as the license agreement is not accepted." |
267 | + if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then |
268 | + juju-log "IBM WAS Base: IBM IM exists " |
269 | + remove_was_base_software |
270 | + else |
271 | + juju-log "IBM WAS Base: IBM IM not exists and hence exiting from WAS unistalling" |
272 | + exit 0 |
273 | + fi |
274 | + fi |
275 | + if [ $2 == False ]; then |
276 | + juju-log "IBM WAS Base: Removing IBM IM (if installed) as the license agreement is not accepted." |
277 | + |
278 | + #Check any dependent products exists like WAS |
279 | + |
280 | + if [ -d $WAS_BASE_INSTALL_PATH/bin ]; then |
281 | + juju-log "IBM WAS Base: Can not uninstall IM as its has WAS product installed" |
282 | + exit 0 |
283 | + else |
284 | + juju-log "IBM WAS Base: Uninstall IBM IM software" |
285 | + remove_im_software |
286 | + fi |
287 | + fi |
288 | + |
289 | +} |
290 | + |
291 | +# Download IM Package |
292 | + |
293 | +download_IM(){ |
294 | +#Exit if URL to download package is null |
295 | + if [ "$WAS_URL" == "" ]; then |
296 | + juju-log "IBM WAS Base: URL to download IBM WAS Base package is not configured." |
297 | + exit 0 |
298 | + fi |
299 | + |
300 | + # If an install IM done, get the name of the package from which it was done |
301 | + if [ -f $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip ]; then |
302 | + im_pkg_name=`ls $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip` |
303 | + if [ $? == 0 ]; then |
304 | + im_pkg_name=`basename $im_pkg_name` |
305 | + fi |
306 | + fi |
307 | + |
308 | + # Get the package name to check whether the user wants to install a different package |
309 | + cfg_im_pkg_name=$im_file_name |
310 | + |
311 | + # Set package name to a predefined value if the user has not provided a package name |
312 | + if [ "$cfg_im_pkg_name" == "" ]; then |
313 | + ARCHITECTURE=`uname -m` |
314 | + if [ "$ARCHITECTURE" = "x86_64" ] || [ "$ARCHITECTURE" = "ppc64le" ]; then |
315 | + cfg_im_pkg_name="Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip" |
316 | + else |
317 | + juju-log "IBM WAS Base: Platform not supported for IM." |
318 | + exit 1 |
319 | + fi |
320 | + fi |
321 | + |
322 | + # The user has configured a different package name |
323 | + if [ "$im_pkg_name" != "$cfg_im_pkg_name" ]; then |
324 | + |
325 | + #Download the new IM package |
326 | + set +e |
327 | + juju-log "IBM WAS Base: Downloading IM package." |
328 | + |
329 | + wget -t 2 -P $CHARM_DIR/$ARCHIVE_DIR/IM $WAS_URL/$cfg_im_pkg_name |
330 | + |
331 | + if [ $? == 0 ]; then |
332 | + juju-log "IBM WAS Base: Downloaded IM package." |
333 | + # Delete previously downloaded and installed IM software |
334 | + if [ "$im_pkg_name" != "" ]; then |
335 | + juju-log "IBM WAS Base: Deleting the older IM package." |
336 | + rm $CHARM_DIR/$ARCHIVE_DIR/IM/$im_pkg_name |
337 | + remove_was_base_software |
338 | + remove_im_software |
339 | + fi |
340 | + |
341 | + else |
342 | + juju-log "IBM WAS Base: Download of IM package failed." |
343 | + juju-log "IBM WAS Base: Ensure the download URL and package name are correctly set in the charm configuration." |
344 | + exit 0 |
345 | + fi |
346 | + set -e |
347 | + |
348 | + fi |
349 | + |
350 | + # Check integrity of downloaded package |
351 | + SHA_IM=`config-get sha_im` |
352 | + if [ "$SHA_IM" == "" ]; then |
353 | + juju-log "IBM WAS Base: Ignored integrity check for IM package as sha_im checksum is null." |
354 | + elif [ "$SHA_IM" != "`sha1sum $ARCHIVE_DIR/IM/$cfg_im_pkg_name | cut -d" " -f1`" ]; then |
355 | + juju-log "IBM WAS Base: IBM IM package is corrupt." |
356 | + exit 0 |
357 | + fi |
358 | +} |
359 | + |
360 | +#download WAS-Base |
361 | + |
362 | +download_WAS() |
363 | +{ |
364 | +#Exit if URL to download package is null |
365 | + if [ "$WAS_URL" == "" ]; then |
366 | + juju-log "IBM WAS Base: URL to download IBM WAS Base package is not configured." |
367 | + exit 0 |
368 | + else |
369 | + juju-log "Downloading WAS Base Packages" |
370 | + was_base_pkg1="WAS_V8.5.5_1_OF_3.zip" |
371 | + was_base_pkg2="WAS_V8.5.5_2_OF_3.zip" |
372 | + was_base_pkg3="WAS_V8.5.5_3_OF_3.zip" |
373 | + was_base_fixpack1="8.5.5-WS-WAS-FP0000004-part1.zip" |
374 | + was_base_fixpack2="8.5.5-WS-WAS-FP0000004-part2.zip" |
375 | + if [ -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg1 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg2 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg3 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_fixpack1 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_fixpack2 ];then |
376 | + juju-log " IBM WAS Base:Reinstalling WAS Base, Downloaded Packages already exists in Archive Dir. " |
377 | + else |
378 | + wget $WAS_URL/$was_base_pkg1 $WAS_URL/$was_base_pkg2 $WAS_URL/$was_base_pkg3 $WAS_URL/$was_base_fixpack1 $WAS_URL/$was_base_fixpack2 |
379 | + if [ $? == 0 ]; then |
380 | + juju-log "IBM WAS Base: Downloaded WAS Base packages sucessfully" |
381 | + fi |
382 | + fi |
383 | + fi |
384 | + |
385 | + # Check integrity of downloaded package |
386 | + if [ "b9cc0b783b482de2092d5c387de05cda2e922413" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WAS_V8.5.5_1_OF_3.zip | cut -d" " -f1`" ]; then |
387 | + juju-log "IBM WAS Base: IBM WAS package1 is corrupt." |
388 | + exit 0 |
389 | + fi |
390 | + if [ "74a52b1b5aaedd67c0727db90aff9dc63ff28f4e" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WAS_V8.5.5_2_OF_3.zip | cut -d" " -f1`" ]; then |
391 | + juju-log "IBM WAS Base: IBM WAS package2 is corrupt." |
392 | + exit 0 |
393 | + fi |
394 | + if [ "e6943fa4a4a7a1384fad1faa54289106f0e57979" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/WAS_V8.5.5_3_OF_3.zip | cut -d" " -f1`" ]; then |
395 | + juju-log "IBM WAS Base: IBM WAS package3 is corrupt." |
396 | + exit 0 |
397 | + fi |
398 | + if [ "895863b932334a78cccce6c73ec98d35ba98639b" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS-FP0000004-part1.zip | cut -d" " -f1`" ]; then |
399 | + juju-log "IBM WAS Base: IBM WAS Fix Pack part1 is corrupt." |
400 | + exit 0 |
401 | + fi |
402 | + if [ "8f8560746c6fb0f87cd47801a014e7c34fccc4cc" != "`sha1sum $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS-FP0000004-part2.zip | cut -d" " -f1`" ]; then |
403 | + juju-log "IBM WAS Base: IBM WAS Fix Pack part2 is corrupt." |
404 | + exit 0 |
405 | + fi |
406 | +} |
407 | + |
408 | + |
409 | + |
410 | + |
411 | + |
412 | +juju-log "IBM WAS BASE: Begin config-change hook" |
413 | +was_base_license_accepted=`config-get accept-ibm-websphere-license` |
414 | +im_license_accepted=`config-get accept-ibm-im-license` |
415 | +IM_INSTALL_PATH=`config-get im_install_path` |
416 | +WAS_URL=`config-get was_url` |
417 | +im_file_name=`config-get im_file_name` |
418 | + |
419 | +# Remove IM and WAS if license not accepted abase exit. Else install it |
420 | +remove_unaccepted_software $was_base_license_accepted $im_license_accepted |
421 | +if [ $im_license_accepted == False ]; then |
422 | + juju-log "IBM WAS Base: Websphere IM License not accepted." |
423 | + |
424 | +elif [ $im_license_accepted == True ]; then |
425 | + juju-log "IBM WAS Base: IBM IM License accepted" |
426 | + juju-log "IBM WAS Base: downloading and extracting IM packages" |
427 | + cd $CHARM_DIR/$ARCHIVE_DIR |
428 | + if [ -d $CHARM_DIR/$ARCHIVE_DIR/IM ];then |
429 | + juju-log "IBM WAS Base: Removing Existing IM DIR. Cresting new IM DIR" |
430 | + rm -rf $CHARM_DIR/$ARCHIVE_DIR/IM |
431 | + fi |
432 | + mkdir IM |
433 | + cd IM |
434 | + download_IM |
435 | + if [ -f $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip ]; then |
436 | + unzip $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip -d $CHARM_DIR/$ARCHIVE_DIR/IM |
437 | + if [ $? != 0 ]; then |
438 | + juju-log "IBM WAS Base: Unable to extract the IM package content. Verify whether the package is corrupt." |
439 | + # Remove corrupt archive file |
440 | + rm -f $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip |
441 | + exit 0 |
442 | + fi |
443 | + fi |
444 | + |
445 | + im_inst=`is_im_installed` |
446 | + if [ $im_inst == False ]; then |
447 | + juju-log "IBM WAS Base: IM installation start" |
448 | + # Check IM package availability |
449 | + juju-log $CHARM_DIR/$ARCHIVE_DIR |
450 | + if [ -f $CHARM_DIR/$ARCHIVE_DIR/IM/userinstc ]; |
451 | + then |
452 | + juju-log "IBM WAS Base: IM Packages available for installation." |
453 | + cp $CHARM_DIR/$ARCHIVE_DIR/IM/install.xml $CHARM_DIR/$ARCHIVE_DIR/IM/silent_install.xml |
454 | + sed -i "2 a \<profile kind='self' installLocation='$IM_INSTALL_PATH' id='IBM Installation Manager'>\n <data key='eclipseLocation' value='$IM_INSTALL_PATH' />\n</profile>" $CHARM_DIR/$ARCHIVE_DIR/IM/silent_install.xml |
455 | + $CHARM_DIR/$ARCHIVE_DIR/IM/userinstc -input $CHARM_DIR/$ARCHIVE_DIR/IM/silent_install.xml -acceptlicense |
456 | + |
457 | + |
458 | + if [ $? == 0 ] |
459 | + then |
460 | + juju-log "IBM WAS Base: IM Is installed successfully" |
461 | + else |
462 | + juju-log "IBM WAS Base: Error while installing IM" |
463 | + exit 1 |
464 | + fi |
465 | + |
466 | + else |
467 | + juju-log "IBM WAS Base: IM Packages missing. Please check README file" |
468 | + juju-log "IBM WAS Base: Upgrade IM charm after adding the IM packages"; |
469 | + exit 1 |
470 | + fi |
471 | + fi |
472 | +else |
473 | + juju-log " IBM WAS Base: Acceptable values for license is 'True' or 'False'" |
474 | + |
475 | +fi |
476 | + |
477 | +if [ $was_base_license_accepted == False ]; then |
478 | + juju-log "IBM WAS Base: Websphere BASE License not accepted." |
479 | + |
480 | +elif [ $was_base_license_accepted == True ]; then |
481 | + juju-log "IBM WAS Base: Check WAS Base package availability" |
482 | + cd $CHARM_DIR/$ARCHIVE_DIR |
483 | + download_WAS |
484 | + if [ -d "$CHARM_DIR/$ARCHIVE_DIR/disk1" ];then |
485 | + juju-log "IBM WAS Base: Reinstalling WAS BASE, unzipped package contents aavailable" |
486 | + else |
487 | + unzip 'WAS_*.zip' |
488 | + if [ $? != 0 ]; then |
489 | + juju-log "IBM WAS Base: Unable to extract the WAS packages content. Verify whether the package is corrupt." |
490 | + # Remove corrupt archive file |
491 | + rm -f $CHARM_DIR/$ARCHIVE_DIR/'WAS_*.zip' |
492 | + exit 0 |
493 | + else |
494 | + juju-log "IBM WAS Base: Downloaded and Extracted WAS Base Packages Sucessfully" |
495 | + fi |
496 | + fi |
497 | + if [ -d $CHARM_DIR/$ARCHIVE_DIR/was_fixpack ];then |
498 | + juju-log "IBM WAS Base: WAS Base Fixpack packages are available for upgrading" |
499 | + else |
500 | + mkdir was_fixpack |
501 | + unzip '8.5.5-WS-WAS*.zip' -d $CHARM_DIR/$ARCHIVE_DIR/was_fixpack |
502 | + if [ $? != 0 ]; then |
503 | + juju-log "IBM WAS Base: Unable to extract the WAS Base fixpack packages content. Verify whether the package is corrupt." |
504 | + # Remove corrupt archive file |
505 | + rm -f $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS*.zip |
506 | + exit 0 |
507 | + else |
508 | + juju-log "IBM WAS Base: Downloaded and Extracted WAS Base fixpack Packages Sucessfully" |
509 | + fi fi |
510 | + |
511 | + |
512 | + # check WAS package availability |
513 | + if [ -d "$CHARM_DIR/$ARCHIVE_DIR/disk1" ]; then |
514 | + juju-log "IBM WAS Base: WAS BASE Packages available for installation."; |
515 | + #Check IM installation |
516 | + im_installed=`is_im_installed` |
517 | + if [ $im_installed == True ]; then |
518 | + |
519 | + juju-log "IBM WAS Base: Installing WAS BASE " |
520 | + $IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.BASE.v85 -acceptLicense -repositories $CHARM_DIR/$ARCHIVE_DIR/ -installationDirectory $WAS_BASE_INSTALL_PATH -showProgress |
521 | + if [ $? == 0 ]; |
522 | + then |
523 | + juju-log " IBM WAS Base: WAS Base is installed successfully" |
524 | + else |
525 | + juju-log "IBM WAS Base: Error while installing WAS" |
526 | + exit 1 |
527 | + fi |
528 | + else |
529 | + juju-log "IBM WAS Base: IM is not installaed to install WAS" |
530 | + exit 0 |
531 | + fi |
532 | + |
533 | + juju-log "IBM WAS Base: creating a profile" |
534 | + #sh does not work in ubuntu so linking to bash |
535 | + |
536 | + juju-log "IBM WAS Base: Unlink /bin/sh" |
537 | + unlink /bin/sh |
538 | + ln -s /bin/bash /bin/sh |
539 | + juju-log "IBM WAS Base: creating a profile" |
540 | + |
541 | + $WAS_BASE_INSTALL_PATH/bin/manageprofiles.sh -create -profileName "test" -profilePath "$WAS_BASE_INSTALL_PATH/profiles/test" -templatePath "$WAS_BASE_INSTALL_PATH/profileTemplates/default" -nodeName "node1" -cellName "cell1" -serverName "server1" -adminUserName "wasadmin" -adminPassword "wasadmin" |
542 | + juju-log "IBM WAS Base: Profile creation completed" |
543 | + |
544 | + #Apply fixpack 8.5.5.4 to upgrade was base version from 8.5.5.0 to 8.5.5.4 |
545 | + |
546 | + juju-log "IBM WAS Base: Upgrading WAS Base by installing WAS fixpack" |
547 | + $IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.BASE.v85_8.5.5004.20141119_1746 -repositories $CHARM_DIR/files/archives/was_fixpack -installationDirectory $WAS_BASE_INSTALL_PATH -acceptLicense -showProgress |
548 | + if [ $? == 0 ]; |
549 | + then |
550 | + juju-log " IBM WAS Base: WAS fixpack installed successfully" |
551 | + else |
552 | + juju-log "IBM WAS Base: Error while installing WAS fixpack" |
553 | + exit 1 |
554 | + fi |
555 | + else |
556 | + juju-log "IBM WAS Base: WAS BASE Packages are not available" |
557 | + fi |
558 | +else |
559 | + juju-log "IBM WAS Base: Acceptable values for license is 'True' or 'False'" |
560 | +fi |
561 | + |
562 | +#starting the server |
563 | + cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/ |
564 | + juju-log "IBM WAS Base: Server Starting" |
565 | + ./startServer.sh server1 |
566 | + if [ "$?" -ne "0" ]; then |
567 | + juju-log "IBM WAS Base: Error while starting the server" |
568 | + else |
569 | + juju-log "IBM WAS Base: Server started successfully" |
570 | + |
571 | + fi |
572 | + |
573 | |
574 | === added file 'hooks/install' |
575 | --- hooks/install 1970-01-01 00:00:00 +0000 |
576 | +++ hooks/install 2015-07-13 10:17:33 +0000 |
577 | @@ -0,0 +1,36 @@ |
578 | +#!/bin/bash |
579 | +# Here do anything needed to install the service |
580 | + |
581 | +set -e |
582 | +juju-log "IBM WAS Base: Begin Install." |
583 | + |
584 | +# Install wget |
585 | +juju-log "IBM WAS Base: Downloading and installng wget package" |
586 | +apt-get install -y wget |
587 | +juju-log "IBM WAS Base: wget downloaded and installed." |
588 | + |
589 | +# Need to update hostname in /etc/hosts |
590 | + private_address=`unit-get private-address` |
591 | + juju-log "private_address : $private_address" |
592 | + echo "$private_address `hostname`" >> /etc/hosts |
593 | + if [ $? == 0 ]; |
594 | + then |
595 | + juju-log "hostname updated" |
596 | + else |
597 | + juju-log "Error while updating /etc/hosts" |
598 | + fi |
599 | + |
600 | +#Install unzip |
601 | +juju-log "IBM WAS Base: Downloading and installng unzip." |
602 | +apt-get install -y unzip |
603 | +juju-log "IBM WAS Base: unzip downloaded and installed." |
604 | + |
605 | +ARCHITECTURE=`uname -m` |
606 | +if [ "$ARCHITECTURE" != "x86_64" ] || [ "$ARCHITECTURE" = "ppc64le" ]; then |
607 | +juju-log "IBM WAS Base: Unsupported platform. IBM WAS Base installed with this Charm supports only the x86_64 and ppc64le platforms." |
608 | +exit 1 |
609 | +fi |
610 | + |
611 | +juju-log "IBM WAS Base: IM and WAS packages downloaded. Awaiting acceptance of license (see README on how to accept the license)." |
612 | + |
613 | +juju-log "IBM WAS Base: End Install." |
614 | |
615 | === added file 'hooks/start' |
616 | --- hooks/start 1970-01-01 00:00:00 +0000 |
617 | +++ hooks/start 2015-07-13 10:17:33 +0000 |
618 | @@ -0,0 +1,21 @@ |
619 | +#!/bin/bash |
620 | +WAS_BASE_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/BASE |
621 | + |
622 | +#starting the server |
623 | +#server_status=` ps -ef | grep '$WAS_BASE_INSTALL_PATH'` |
624 | +netstat -nltp | grep 9060 |
625 | +if [ "$?" -eq "0" ];then |
626 | +juju-log "IBM WAS Base: WAS Base Server already started" |
627 | +else |
628 | +cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/ |
629 | + ./startServer.sh server1 |
630 | + if [ "$?" -ne "0" ]; then |
631 | + juju-log "IBM WAS Base: Error while starting the server" |
632 | + else |
633 | + juju-log "IBM WAS Base: Server started successfully" |
634 | + |
635 | + fi |
636 | +fi |
637 | + |
638 | +open-port 9060 |
639 | +open-port 9443 |
640 | |
641 | === added file 'hooks/stop' |
642 | --- hooks/stop 1970-01-01 00:00:00 +0000 |
643 | +++ hooks/stop 2015-07-13 10:17:33 +0000 |
644 | @@ -0,0 +1,14 @@ |
645 | +#!/bin/bash |
646 | + |
647 | +set -e |
648 | +WAS_BASE_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/BASE |
649 | + |
650 | +cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/ |
651 | + ./stopServer.sh server1 |
652 | + if [ "$?" -ne "0" ]; then |
653 | + juju-log "Error while stoping the server" |
654 | + else |
655 | + juju-log "Server stopped successfully" |
656 | + fi |
657 | +close-port 9060 |
658 | +close-port 9443 |
659 | |
660 | === added file 'hooks/website-relation-changed' |
661 | --- hooks/website-relation-changed 1970-01-01 00:00:00 +0000 |
662 | +++ hooks/website-relation-changed 2015-07-13 10:17:33 +0000 |
663 | @@ -0,0 +1,3 @@ |
664 | +#!/bin/sh |
665 | + |
666 | +relation-set hostname=`unit-get private-address` port=9060 |
667 | |
668 | === added file 'hooks/website-relation-joined' |
669 | --- hooks/website-relation-joined 1970-01-01 00:00:00 +0000 |
670 | +++ hooks/website-relation-joined 2015-07-13 10:17:33 +0000 |
671 | @@ -0,0 +1,12 @@ |
672 | +#!/bin/sh |
673 | + |
674 | +juju-log "IBM WAS Base: Begin website-relation-joined hook." |
675 | +set -e |
676 | +was_base_license_accepted=`config-get accept-ibm-websphere-license` |
677 | +if [ "$was_base_license_accepted" == "False" ]; then |
678 | + juju-log "IBM WAS Base: IBM WAS Base License is not accepted." |
679 | + juju-log "Delete the relation. Accept the IBM WAS Base License, as per the README, before setting up any relation." |
680 | + exit 0 |
681 | +fi |
682 | +relation-set hostname=`unit-get private-address` port=9060 |
683 | +juju-log "IBM WAS Base: End website-relation-joined hook." |
684 | |
685 | === added file 'icon.svg' |
686 | --- icon.svg 1970-01-01 00:00:00 +0000 |
687 | +++ icon.svg 2015-07-13 10:17:33 +0000 |
688 | @@ -0,0 +1,53 @@ |
689 | +<?xml version="1.0" encoding="UTF-8"?> |
690 | +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> |
691 | +<!-- Creator: CorelDRAW X6 --> |
692 | +<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1in" height="0.999996in" version="1.1" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" |
693 | +viewBox="0 0 1116 1116" |
694 | + xmlns:xlink="http://www.w3.org/1999/xlink"> |
695 | + <defs> |
696 | + <linearGradient id="id0" gradientUnits="userSpaceOnUse" x1="558.139" y1="0" x2="558.139" y2="1116.27"> |
697 | + <stop offset="0" stop-color="#BFA6E6"/> |
698 | + <stop offset="1" stop-color="#6C5393"/> |
699 | + </linearGradient> |
700 | + <mask id="id1"> |
701 | + <linearGradient id="id2" gradientUnits="userSpaceOnUse" x1="558.139" y1="65.2803" x2="558.139" y2="342.715"> |
702 | + <stop offset="0" stop-opacity="1" stop-color="white"/> |
703 | + <stop offset="0.141176" stop-opacity="-10.5451" stop-color="white"/> |
704 | + <stop offset="1" stop-opacity="0" stop-color="white"/> |
705 | + </linearGradient> |
706 | + <rect fill="url(#id2)" width="1116" height="408"/> |
707 | + </mask> |
708 | + </defs> |
709 | + <g id="Layer_x0020_1"> |
710 | + <metadata id="CorelCorpID_0Corel-Layer"/> |
711 | + <path id="Background" fill="url(#id0)" d="M0 754l0 -392c0,-317 45,-362 362,-362l393 0c316,0 361,45 361,362l0 392c0,317 -45,362 -361,362l-393 0c-317,0 -362,-45 -362,-362z"/> |
712 | + <path fill="#999999" mask="url(#id1)" d="M0 408l0 -46c0,-317 45,-362 362,-362l393 0c316,0 361,45 361,362l0 46c0,-317 -45,-362 -361,-362l-393 0c-317,0 -362,45 -362,362z"/> |
713 | + <g id="_195711952"> |
714 | + <path fill="#CCCCCC" fill-rule="nonzero" d="M426 711l-54 0 -54 -195 -55 195 -53 0 -71 -249 -29 0 0 -47 120 0 0 47 -32 0 41 156 54 -203 48 0 57 201 39 -154 -33 0 0 -47 121 0 0 47 -33 0 -66 249zm210 -231l-1 0 -37 102 75 0 -37 -102zm36 190l33 0 -18 -44 -104 0 -17 44 32 0 0 41 -121 0 0 -47 32 0 86 -202 -33 0 0 -47 100 0 103 249 32 0 0 47 -125 0 0 -41zm201 -47c0,7 1,12 3,18 2,5 5,10 8,14 4,5 9,8 14,10 5,3 12,4 19,4 12,0 22,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-14 -5,-18 -3,-5 -7,-9 -12,-13 -5,-3 -10,-5 -16,-7 -6,-2 -12,-4 -18,-6 -10,-3 -20,-6 -30,-9 -9,-4 -19,-9 -28,-16 -21,-16 -32,-38 -32,-65 0,-12 2,-23 7,-34 5,-10 12,-19 20,-27 8,-8 18,-13 29,-18 10,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18l0 -17 44 0 0 80 -51 0c0,-11 -4,-21 -11,-28 -8,-7 -17,-11 -28,-11 -11,0 -20,3 -28,10 -8,6 -12,15 -12,27 0,7 1,13 4,18 3,5 7,9 12,12 4,3 10,5 15,7 6,2 12,3 18,5 11,3 22,7 33,10 10,4 20,10 30,17 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -8,37 -4,12 -11,21 -19,30 -8,8 -18,14 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -10,-4 -18,-10 -25,-19l0 19 -45 0 0 -88 52 0z"/> |
715 | + <g> |
716 | + <path fill="#C8C8C8" d="M425 711c-17,0 -35,0 -53,0 -18,-65 -37,-130 -55,-196 -18,66 -36,131 -55,196 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -10,0 -21,0 -32,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 15,0 31,0 47,0 19,67 38,134 57,201 13,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -25,68 -38,101 25,0 51,0 76,0 -13,-33 -25,-67 -38,-101zm37 189c10,0 21,0 32,0 -5,-14 -11,-29 -17,-44 -35,0 -70,0 -104,0 -6,15 -12,30 -17,44 10,0 21,0 32,0 0,14 0,28 0,42 -41,0 -81,0 -121,0 0,-16 0,-32 0,-47 10,0 21,0 31,0 29,-68 58,-135 87,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 10,0 21,0 31,0 0,15 0,31 0,47 -41,0 -83,0 -124,0 0,-14 0,-28 0,-42zm200 -46c0,6 1,12 3,17 2,6 5,11 9,15 4,4 8,7 14,10 5,2 11,3 18,3 12,0 23,-3 31,-11 8,-7 13,-17 13,-29 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-2 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -33,-38 -33,-65 0,-12 3,-24 8,-34 5,-11 11,-20 19,-27 9,-8 18,-14 29,-18 11,-4 22,-7 34,-7 10,0 20,2 29,6 10,3 18,9 24,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,9 -8,7 -11,16 -11,28 0,7 1,13 4,17 3,5 7,9 11,12 5,3 10,6 16,7 6,2 11,4 17,6 12,3 23,6 33,10 11,4 21,9 31,17 9,7 17,16 22,27 5,11 7,22 7,35 0,13 -2,25 -7,37 -5,11 -11,21 -19,29 -9,9 -19,15 -30,20 -12,4 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-11 -26,-20 0,7 0,13 0,20 -15,0 -29,0 -44,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
717 | + <path fill="#C5C5C5" d="M425 710c-18,0 -36,0 -54,0 -18,-65 -36,-130 -54,-195 -19,65 -37,130 -55,195 -18,0 -35,0 -53,0 -24,-83 -47,-166 -71,-249 -10,0 -20,0 -29,0 0,-15 0,-31 0,-47 40,0 80,0 120,0 0,16 0,32 0,47 -11,0 -22,0 -32,0 14,52 28,104 42,156 17,-68 35,-135 53,-203 16,0 32,0 48,0 19,67 38,134 57,201 13,-51 26,-102 40,-154 -12,0 -23,0 -34,0 0,-15 0,-31 0,-47 40,0 81,0 121,0 0,16 0,32 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -26,68 -38,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-44 -34,0 -69,0 -104,0 -5,14 -11,29 -17,44 11,0 22,0 32,0 0,14 0,28 0,41 -40,0 -80,0 -121,0 0,-15 0,-31 0,-47 11,0 21,0 32,0 29,-67 57,-134 86,-202 -11,0 -22,0 -33,0 0,-15 0,-31 0,-47 34,0 67,0 100,0 34,83 69,166 103,249 11,0 22,0 32,0 0,16 0,32 0,47 -42,0 -83,0 -125,0 0,-13 0,-27 0,-41zm201 -46c0,6 1,11 3,17 2,5 5,10 8,14 4,5 9,8 14,10 5,3 12,4 19,4 12,0 22,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-14 -5,-18 -3,-5 -7,-9 -12,-12 -4,-4 -10,-6 -16,-8 -6,-2 -12,-4 -17,-6 -11,-3 -21,-6 -31,-9 -9,-4 -18,-9 -28,-16 -21,-16 -32,-37 -32,-65 0,-12 2,-23 7,-34 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 10,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18 0,-6 0,-11 0,-17 15,0 29,0 44,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -17,-11 -28,-11 -11,0 -20,3 -28,10 -8,6 -12,16 -12,27 0,7 2,13 4,18 3,5 7,9 12,12 5,3 10,5 15,7 6,2 12,3 18,5 11,3 22,7 33,10 10,4 20,10 30,17 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,21 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-58 0,-87 17,0 34,0 52,0z"/> |
718 | + <path fill="#C1C1C1" d="M424 710c-17,0 -35,0 -53,0 -18,-65 -37,-130 -55,-195 -18,65 -36,130 -55,195 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-32 0,-47 40,0 80,0 121,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 16,0 31,0 47,0 19,67 38,134 57,201 14,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -25,68 -38,102 25,0 51,0 76,0 -13,-34 -25,-68 -38,-102zm37 190c11,0 21,0 32,0 -5,-15 -11,-30 -17,-45 -35,0 -69,0 -104,0 -6,15 -12,30 -17,45 10,0 21,0 32,0 0,13 0,27 0,41 -41,0 -81,0 -121,0 0,-16 0,-32 0,-47 10,0 21,0 31,0 29,-68 58,-135 87,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 11,0 21,0 32,0 0,15 0,31 0,47 -42,0 -84,0 -125,0 0,-14 0,-28 0,-41zm200 -47c0,6 1,12 3,17 2,6 5,11 9,15 4,4 8,7 14,10 5,2 11,3 18,3 13,0 23,-3 31,-11 9,-7 13,-17 13,-29 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-2 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -32,-38 -32,-65 0,-12 2,-24 7,-34 5,-11 11,-20 20,-27 8,-8 17,-14 28,-18 11,-4 22,-7 34,-7 10,0 20,2 29,6 10,3 18,9 24,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,9 -7,7 -11,16 -11,28 0,7 1,13 4,18 3,4 7,8 11,11 5,3 10,6 16,7 6,2 11,4 17,6 12,3 23,6 33,10 11,4 21,9 31,17 9,7 17,17 22,27 5,11 7,22 7,35 0,13 -2,25 -7,37 -5,11 -11,21 -19,29 -9,9 -19,15 -30,20 -12,4 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-11 -26,-19 0,6 0,13 0,19 -14,0 -29,0 -44,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
719 | + <path fill="#BEBEBE" d="M424 710c-18,0 -36,0 -54,0 -18,-66 -36,-131 -54,-196 -19,65 -37,130 -55,196 -18,0 -35,0 -53,0 -24,-83 -47,-166 -71,-249 -10,0 -19,0 -29,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -22,0 -32,0 14,51 28,103 42,155 17,-67 35,-135 53,-203 16,0 32,0 48,0 19,67 38,134 57,202 13,-52 26,-103 40,-154 -11,0 -23,0 -34,0 0,-16 0,-32 0,-48 41,0 81,0 121,0 0,16 0,32 0,48 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -232c0,0 0,0 0,0 -13,34 -26,68 -38,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-44 -34,0 -69,0 -104,0 -5,14 -11,29 -17,44 11,0 22,0 32,0 0,14 0,28 0,42 -40,0 -80,0 -121,0 0,-16 0,-32 0,-48 11,0 21,0 32,0 29,-67 58,-134 86,-201 -11,0 -22,0 -32,0 0,-16 0,-32 0,-48 33,0 66,0 99,0 34,83 69,166 104,249 10,0 21,0 31,0 0,16 0,32 0,48 -42,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,11 3,17 2,6 5,10 8,15 4,4 9,7 14,9 6,3 12,4 19,4 12,0 22,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-14 -5,-18 -3,-5 -7,-9 -12,-12 -4,-4 -10,-6 -16,-8 -6,-2 -12,-4 -17,-5 -11,-4 -21,-7 -31,-10 -9,-4 -18,-9 -28,-16 -21,-16 -32,-37 -32,-65 0,-12 3,-23 7,-34 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 11,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18 0,-6 0,-11 0,-17 15,0 29,0 44,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -17,-11 -28,-11 -11,0 -20,4 -28,10 -8,7 -12,16 -12,27 0,7 2,13 4,18 3,5 7,9 12,12 5,3 10,5 15,7 6,2 12,3 18,5 11,3 22,7 33,11 10,3 21,9 30,16 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,22 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -9,-4 -18,-10 -25,-19 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-30 0,-59 0,-88 17,0 34,0 52,0z"/> |
720 | + <path fill="#BABABA" d="M424 709c-18,0 -36,0 -54,0 -18,-65 -37,-130 -55,-195 -18,65 -36,130 -55,195 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-32 0,-47 40,0 80,0 121,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 16,0 32,0 47,0 19,67 38,134 57,201 14,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -32,0 -22,83 -44,166 -66,249zm210 -231c-1,0 -1,0 -1,0 -12,34 -25,68 -38,102 26,0 51,0 76,0 -13,-34 -25,-68 -37,-102zm36 190c11,0 22,0 32,0 -5,-15 -11,-30 -17,-45 -35,0 -69,0 -104,0 -6,15 -12,30 -17,45 10,0 21,0 32,0 0,13 0,27 0,41 -40,0 -81,0 -121,0 0,-16 0,-31 0,-47 11,0 21,0 32,0 28,-67 57,-135 86,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 11,0 21,0 32,0 0,16 0,31 0,47 -42,0 -84,0 -125,0 0,-14 0,-28 0,-41zm200 -47c0,6 1,12 3,18 2,5 5,10 9,14 4,4 8,7 14,10 5,2 11,3 18,3 13,0 23,-3 31,-10 9,-8 13,-18 13,-30 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-1 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -32,-38 -32,-65 0,-12 2,-24 7,-34 5,-11 11,-20 20,-27 8,-8 17,-14 28,-18 11,-4 22,-7 34,-7 11,0 20,2 30,6 9,3 17,9 23,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -50,0 -1,-11 -4,-20 -12,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,10 -7,6 -11,15 -11,27 0,7 1,13 4,18 3,4 7,8 11,11 5,3 10,6 16,7 6,2 11,4 17,6 12,3 23,6 33,10 11,4 21,9 31,17 9,7 17,17 22,27 5,11 7,22 7,35 0,13 -2,26 -7,37 -5,11 -11,21 -19,29 -9,9 -19,15 -30,20 -12,5 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-11 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
721 | + <path fill="#B6B6B6" d="M423 709c-18,0 -36,0 -53,0 -19,-66 -37,-131 -55,-196 -19,65 -37,130 -55,196 -18,0 -35,0 -53,0 -23,-83 -47,-166 -71,-249 -10,0 -19,0 -29,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -21,0 -32,0 14,51 28,103 42,155 18,-67 35,-135 53,-203 16,0 32,0 48,0 19,67 38,134 57,202 13,-52 26,-103 40,-154 -11,0 -22,0 -34,0 0,-16 0,-32 0,-48 41,0 81,0 121,0 0,16 0,32 0,48 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -232c0,0 0,0 0,0 -13,34 -26,68 -38,102 25,0 50,0 75,0 -12,-34 -24,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-29 -17,-44 -35,0 -70,0 -105,0 -5,15 -11,29 -17,44 11,0 22,0 32,0 0,14 0,28 0,42 -40,0 -80,0 -120,0 0,-16 0,-32 0,-48 10,0 21,0 31,0 29,-67 58,-134 86,-201 -11,0 -21,0 -32,0 0,-16 0,-32 0,-48 33,0 66,0 99,0 34,83 69,166 104,249 10,0 21,0 31,0 0,16 0,32 0,48 -41,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,12 3,17 2,6 5,10 9,15 3,4 8,7 13,9 6,3 12,4 19,4 12,0 23,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-13 -4,-18 -4,-5 -8,-9 -13,-12 -4,-3 -10,-6 -16,-8 -6,-2 -12,-4 -17,-5 -11,-3 -21,-7 -31,-10 -9,-4 -18,-9 -27,-16 -22,-16 -33,-37 -33,-64 0,-13 3,-24 7,-35 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 11,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 24,18 0,-6 0,-11 0,-17 14,0 28,0 43,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -16,-11 -28,-11 -11,0 -20,4 -28,10 -8,7 -12,16 -12,27 0,7 2,13 5,18 2,5 6,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 11,3 22,7 33,11 10,3 21,9 30,16 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,22 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -9,-4 -18,-10 -25,-19 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-30 0,-59 0,-88 17,0 35,0 52,0z"/> |
722 | + <path fill="#B3B3B3" d="M423 708c-18,0 -36,0 -54,0 -18,-65 -36,-130 -55,-195 -18,65 -36,130 -55,195 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-31 0,-47 40,0 81,0 121,0 0,16 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 16,0 32,0 47,0 19,67 38,134 57,201 14,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-31 0,-47 40,0 80,0 120,0 0,16 0,31 0,47 -11,0 -21,0 -32,0 -22,83 -44,166 -66,249zm210 -231c-1,0 -1,0 -1,0 -12,34 -25,68 -38,102 26,0 51,0 76,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-45 -35,0 -69,0 -104,0 -6,15 -11,30 -17,45 11,0 21,0 32,0 0,13 0,27 0,41 -40,0 -81,0 -121,0 0,-16 0,-31 0,-47 11,0 21,0 32,0 28,-67 57,-135 86,-202 -11,0 -22,0 -33,0 0,-16 0,-31 0,-47 33,0 66,0 99,0 35,83 70,166 104,249 11,0 21,0 32,0 0,16 0,31 0,47 -42,0 -84,0 -125,0 0,-14 0,-28 0,-41zm200 -47c0,6 1,12 3,18 2,5 5,10 9,14 4,4 8,8 14,10 5,2 11,3 18,3 13,0 23,-3 31,-10 9,-8 13,-18 13,-30 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-7 -6,-2 -12,-4 -18,-6 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -32,-38 -32,-65 0,-12 2,-23 7,-34 5,-10 11,-20 20,-27 8,-8 18,-14 28,-18 11,-4 22,-6 34,-6 11,0 20,1 30,5 9,4 17,9 23,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -50,0 -1,-11 -4,-20 -12,-27 -7,-7 -16,-11 -27,-11 -11,0 -21,3 -28,10 -8,6 -12,15 -12,27 0,7 1,13 4,18 3,4 7,8 12,11 4,3 9,6 15,8 6,1 11,3 17,5 12,3 23,6 34,10 10,4 20,10 30,17 9,7 17,17 22,27 5,11 7,23 7,35 0,13 -2,26 -7,37 -4,11 -11,21 -19,29 -9,9 -18,15 -30,20 -11,5 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
723 | + <path fill="#AFAFAF" d="M422 708c-18,0 -36,0 -53,0 -19,-65 -37,-131 -55,-196 -18,65 -37,131 -55,196 -18,0 -35,0 -53,0 -23,-83 -47,-166 -71,-249 -10,0 -19,0 -29,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -21,0 -32,0 14,52 28,103 42,155 18,-67 35,-135 53,-203 16,0 32,0 48,0 19,67 38,135 57,202 13,-52 26,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -232c0,0 0,0 0,0 -13,34 -25,68 -38,102 25,0 50,0 76,0 -13,-34 -25,-68 -38,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-29 -17,-44 -35,0 -70,0 -105,0 -5,15 -11,29 -17,44 11,0 22,0 32,0 0,14 0,28 0,42 -40,0 -80,0 -120,0 0,-16 0,-32 0,-48 10,0 21,0 31,0 29,-67 58,-134 86,-201 -10,0 -21,0 -32,0 0,-16 0,-32 0,-48 33,0 66,0 99,0 34,83 69,166 104,249 10,0 21,0 31,0 0,16 0,32 0,48 -41,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,12 3,17 2,6 5,11 9,15 3,4 8,7 13,9 6,3 12,4 19,4 12,0 23,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-13 -4,-18 -4,-5 -8,-9 -12,-12 -5,-3 -11,-6 -17,-8 -6,-2 -11,-4 -17,-5 -11,-3 -21,-7 -31,-10 -9,-4 -18,-9 -27,-16 -22,-16 -33,-37 -33,-64 0,-13 3,-24 7,-34 5,-11 12,-20 20,-28 9,-7 18,-13 29,-17 11,-5 22,-7 34,-7 10,0 20,2 29,5 9,4 17,10 24,18 0,-6 0,-11 0,-17 14,0 28,0 43,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -16,-11 -27,-11 -12,0 -21,4 -29,10 -8,7 -12,16 -12,27 0,8 2,13 5,18 3,5 6,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 11,3 23,7 33,11 11,4 21,9 30,16 10,8 17,17 22,28 5,11 8,22 8,35 0,13 -3,25 -7,36 -5,12 -11,22 -20,30 -8,8 -18,15 -29,19 -12,5 -24,8 -38,8 -12,0 -22,-3 -32,-7 -9,-4 -18,-10 -25,-19 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-30 0,-59 0,-88 17,0 35,0 52,0z"/> |
724 | + <path fill="#ABABAB" d="M422 707c-18,0 -36,0 -54,0 -18,-65 -36,-130 -55,-195 -18,65 -36,130 -54,195 -18,0 -36,0 -53,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-31 0,-47 40,0 81,0 121,0 0,16 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-135 54,-203 16,0 32,0 48,0 19,67 37,134 56,201 14,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-31 0,-47 40,0 80,0 120,0 0,16 0,31 0,47 -10,0 -21,0 -32,0 -22,83 -44,166 -66,249zm210 -231c0,0 -1,0 -1,0 -12,34 -25,68 -37,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-45 -35,0 -69,0 -104,0 -6,15 -11,30 -17,45 11,0 21,0 32,0 0,14 0,27 0,41 -40,0 -81,0 -121,0 0,-16 0,-31 0,-47 11,0 21,0 32,0 28,-67 57,-135 86,-202 -11,0 -22,0 -33,0 0,-16 0,-31 0,-47 33,0 66,0 99,0 35,83 70,166 104,249 11,0 21,0 32,0 0,16 0,31 0,47 -42,0 -84,0 -125,0 0,-14 0,-27 0,-41zm200 -47c0,6 1,12 3,18 2,5 5,10 9,14 4,4 8,8 14,10 5,2 11,3 18,3 13,0 23,-3 31,-10 9,-8 13,-17 13,-30 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-5 -16,-7 -6,-2 -12,-4 -18,-6 -11,-3 -21,-6 -30,-10 -9,-3 -19,-8 -28,-15 -21,-16 -32,-38 -32,-65 0,-12 2,-23 7,-34 5,-10 11,-19 20,-27 8,-8 18,-14 28,-18 11,-4 23,-6 34,-6 11,0 20,1 30,5 9,4 17,9 23,17 0,-5 0,-11 0,-16 15,0 29,0 43,0 0,26 0,53 0,80 -17,0 -33,0 -50,0 -1,-12 -4,-21 -12,-28 -7,-7 -16,-11 -27,-11 -11,0 -20,3 -28,10 -8,6 -12,15 -12,27 0,7 1,13 4,18 3,4 7,8 12,11 4,3 9,6 15,8 6,1 12,3 17,5 12,3 23,6 34,10 10,4 20,10 30,17 10,8 17,17 22,27 5,11 7,23 7,35 0,13 -2,26 -7,37 -4,11 -11,21 -19,29 -9,9 -18,15 -30,20 -11,5 -24,7 -37,7 -12,0 -23,-2 -32,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-58 0,-88 17,0 34,0 51,0z"/> |
725 | + <path fill="#A8A8A8" d="M421 707c-18,0 -36,0 -53,0 -19,-65 -37,-131 -55,-196 -18,65 -37,131 -55,196 -18,0 -35,0 -53,0 -23,-83 -47,-166 -71,-249 -9,0 -19,0 -29,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -21,0 -32,0 14,52 28,103 42,155 18,-67 36,-135 53,-203 16,0 32,0 48,0 19,67 38,135 57,202 13,-52 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,33 -25,67 -38,101 25,0 50,0 76,0 -13,-34 -25,-68 -38,-101zm36 189c11,0 22,0 33,0 -6,-15 -11,-29 -17,-44 -35,0 -70,0 -104,0 -6,15 -12,29 -18,44 11,0 22,0 32,0 0,14 0,28 0,42 -40,0 -80,0 -120,0 0,-16 0,-32 0,-48 10,0 21,0 31,0 29,-67 58,-134 87,-201 -11,0 -22,0 -33,0 0,-16 0,-32 0,-48 33,0 66,0 99,0 35,83 69,166 104,249 10,0 21,0 31,0 0,16 0,32 0,48 -41,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,12 3,17 2,6 5,11 9,15 3,4 8,7 13,9 6,3 12,4 19,4 12,0 23,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-13 -4,-18 -4,-5 -8,-9 -12,-12 -5,-3 -11,-6 -17,-8 -6,-2 -11,-4 -17,-5 -11,-3 -21,-7 -31,-10 -9,-3 -18,-9 -27,-16 -22,-16 -33,-37 -33,-64 0,-13 3,-24 8,-34 4,-11 11,-20 19,-28 9,-7 18,-13 29,-17 11,-5 22,-7 34,-7 10,0 20,2 29,6 9,3 17,9 24,17 0,-6 0,-11 0,-17 14,0 28,0 43,0 0,27 0,54 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -16,-11 -27,-11 -11,0 -21,4 -29,10 -8,7 -12,16 -12,27 0,8 2,14 5,18 3,5 6,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 12,3 23,7 33,11 11,4 21,9 30,16 10,8 17,17 22,28 5,11 8,22 8,35 0,13 -2,25 -7,37 -5,11 -11,21 -20,29 -8,8 -18,15 -29,20 -12,4 -24,7 -38,7 -12,0 -22,-2 -32,-6 -9,-4 -18,-11 -25,-20 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-30 0,-59 0,-88 18,0 35,0 52,0z"/> |
726 | + <path fill="#A4A4A4" d="M421 706c-18,0 -36,0 -54,0 -18,-65 -36,-130 -55,-195 -18,65 -36,130 -54,195 -18,0 -36,0 -53,0 -24,-83 -47,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-31 0,-47 41,0 81,0 121,0 0,16 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-135 54,-203 16,0 32,0 48,0 19,67 38,134 56,201 14,-51 27,-102 40,-154 -11,0 -22,0 -33,0 0,-16 0,-31 0,-47 40,0 80,0 121,0 0,16 0,31 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 -1,0 -1,0 -12,34 -25,68 -37,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-45 -34,0 -69,0 -104,0 -6,15 -11,30 -17,45 11,0 21,0 32,0 0,14 0,27 0,41 -40,0 -81,0 -121,0 0,-15 0,-31 0,-47 11,0 21,0 32,0 29,-67 57,-135 86,-202 -11,0 -22,0 -33,0 0,-16 0,-31 0,-47 33,0 66,0 99,0 35,83 70,166 104,249 11,0 21,0 32,0 0,16 0,32 0,47 -42,0 -83,0 -125,0 0,-14 0,-27 0,-41zm200 -47c0,6 1,12 3,18 3,5 5,10 9,14 4,4 9,8 14,10 5,2 11,4 18,4 13,0 23,-4 32,-11 8,-7 12,-17 12,-30 0,-8 -2,-14 -5,-19 -3,-4 -7,-8 -12,-12 -5,-3 -10,-5 -16,-7 -6,-2 -12,-4 -18,-6 -10,-3 -21,-6 -30,-9 -9,-4 -19,-9 -28,-16 -21,-16 -32,-38 -32,-65 0,-12 2,-23 7,-34 5,-10 12,-19 20,-27 8,-8 18,-14 28,-18 11,-4 23,-6 34,-6 11,0 20,1 30,5 9,4 17,9 23,18 0,-6 0,-12 0,-17 15,0 29,0 43,0 0,26 0,53 0,80 -17,0 -33,0 -50,0 -1,-11 -4,-21 -11,-28 -8,-7 -17,-11 -28,-11 -11,0 -20,3 -28,10 -8,6 -12,15 -12,27 0,7 1,13 4,18 3,4 7,8 12,11 4,3 10,6 15,8 6,1 12,3 17,5 12,3 23,6 34,10 10,4 20,10 30,17 10,8 17,17 22,27 5,11 7,23 7,35 0,13 -2,26 -7,37 -4,11 -11,21 -19,30 -8,8 -18,14 -30,19 -11,5 -24,7 -37,7 -12,0 -23,-2 -32,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-58 0,-88 17,0 34,0 51,0z"/> |
727 | + <path fill="#A1A1A1" d="M420 706c-18,0 -35,0 -53,0 -19,-65 -37,-131 -55,-196 -18,65 -37,131 -55,196 -17,0 -35,0 -53,0 -23,-83 -47,-166 -71,-249 -9,0 -19,0 -29,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -10,0 -21,0 -32,0 14,52 28,104 42,155 18,-67 36,-135 53,-203 16,0 32,0 48,0 19,68 38,135 57,202 13,-52 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-48 40,0 80,0 120,0 0,16 0,32 0,48 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -25,67 -38,101 25,0 50,0 76,0 -13,-34 -25,-67 -38,-101zm36 189c11,0 22,0 33,0 -6,-14 -11,-29 -17,-44 -35,0 -70,0 -104,0 -6,15 -12,30 -17,44 10,0 21,0 32,0 0,14 0,28 0,42 -41,0 -81,0 -121,0 0,-16 0,-32 0,-47 10,0 21,0 31,0 29,-68 58,-135 87,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-48 33,0 66,0 99,0 35,83 69,166 104,250 10,0 21,0 31,0 0,15 0,31 0,47 -41,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,12 3,17 2,6 5,11 9,15 3,4 8,7 13,10 6,2 12,3 19,3 12,0 23,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-13 -4,-18 -3,-5 -7,-9 -12,-12 -5,-3 -11,-6 -17,-8 -5,-2 -11,-4 -17,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-9 -28,-16 -22,-16 -33,-37 -33,-64 0,-12 3,-24 8,-34 4,-11 11,-20 19,-27 9,-8 18,-14 29,-18 11,-5 22,-7 34,-7 10,0 20,2 29,6 10,3 17,9 24,17 0,-5 0,-11 0,-17 14,0 29,0 43,0 0,27 0,54 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,9 -8,7 -12,16 -12,27 0,8 2,14 5,18 3,5 6,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 12,3 23,7 33,11 11,4 21,9 30,16 10,8 17,17 22,28 5,11 8,22 8,35 0,13 -2,25 -7,37 -5,11 -11,21 -20,29 -8,8 -18,15 -29,20 -12,4 -24,7 -38,7 -11,0 -22,-2 -32,-6 -9,-4 -18,-11 -25,-20 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-30 0,-59 0,-88 18,0 35,0 52,0z"/> |
728 | + <path fill="#9D9D9D" d="M420 705c-18,0 -36,0 -54,0 -18,-65 -36,-130 -55,-195 -18,65 -36,130 -54,195 -18,0 -35,0 -53,0 -24,-83 -47,-166 -71,-249 -10,0 -20,0 -30,0 0,-15 0,-31 0,-47 41,0 81,0 121,0 0,16 0,32 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-135 54,-203 16,0 32,0 48,0 19,67 38,134 57,201 13,-51 26,-102 39,-154 -11,0 -22,0 -33,0 0,-15 0,-31 0,-47 40,0 80,0 121,0 0,16 0,32 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 -1,0 -12,34 -25,68 -37,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-45 -34,0 -69,0 -104,0 -6,15 -11,30 -17,45 11,0 21,0 32,0 0,14 0,28 0,41 -40,0 -80,0 -121,0 0,-15 0,-31 0,-47 11,0 21,0 32,0 29,-67 57,-134 86,-202 -11,0 -22,0 -33,0 0,-15 0,-31 0,-47 33,0 66,0 100,0 34,83 69,166 103,249 11,0 21,0 32,0 0,16 0,32 0,47 -42,0 -83,0 -125,0 0,-13 0,-27 0,-41zm200 -47c0,6 1,12 4,18 2,5 5,10 8,14 4,4 9,8 14,10 5,2 12,4 18,4 13,0 23,-4 32,-11 8,-7 12,-17 12,-30 0,-8 -2,-14 -5,-19 -3,-4 -7,-8 -12,-12 -5,-3 -10,-5 -16,-7 -6,-2 -12,-4 -18,-6 -10,-3 -21,-6 -30,-9 -9,-4 -19,-9 -28,-16 -21,-16 -32,-38 -32,-65 0,-12 2,-23 7,-34 5,-10 12,-19 20,-27 8,-8 18,-14 29,-18 10,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18 0,-6 0,-11 0,-17 15,0 29,0 43,0 0,27 0,53 0,80 -16,0 -33,0 -50,0 0,-11 -4,-21 -11,-28 -8,-7 -17,-11 -28,-11 -11,0 -20,3 -28,10 -8,6 -12,15 -12,27 0,7 1,13 4,18 3,5 7,8 12,11 4,4 10,6 15,8 6,2 12,3 17,5 12,3 23,6 34,10 10,4 20,10 30,17 10,8 17,17 22,28 5,10 7,22 7,34 0,13 -2,26 -7,37 -4,11 -11,21 -19,30 -8,8 -18,14 -30,19 -11,5 -24,7 -37,7 -12,0 -23,-2 -32,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-58 0,-88 17,0 34,0 51,0z"/> |
729 | + <path fill="#999999" d="M419 705c-18,0 -35,0 -53,0 -18,-65 -37,-130 -55,-196 -18,66 -37,131 -55,196 -17,0 -35,0 -53,0 -23,-83 -47,-166 -71,-249 -9,0 -19,0 -29,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -10,0 -21,0 -32,0 14,52 28,104 42,155 18,-67 36,-135 53,-202 16,0 32,0 48,0 19,67 38,134 57,201 13,-52 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -25,67 -38,101 25,0 51,0 76,0 -13,-34 -25,-67 -38,-101zm36 189c11,0 22,0 33,0 -6,-14 -11,-29 -17,-44 -35,0 -70,0 -104,0 -6,15 -12,30 -17,44 10,0 21,0 32,0 0,14 0,28 0,42 -41,0 -81,0 -121,0 0,-16 0,-32 0,-47 10,0 21,0 31,0 29,-68 58,-135 87,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 10,0 21,0 31,0 0,15 0,31 0,47 -41,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,12 3,17 2,6 5,11 9,15 4,4 8,7 13,10 6,2 12,3 19,3 12,0 23,-3 31,-11 8,-7 13,-17 13,-30 0,-7 -2,-13 -5,-18 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-2 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-9 -28,-15 -22,-17 -33,-38 -33,-65 0,-12 3,-24 8,-34 5,-11 11,-20 19,-27 9,-8 18,-14 29,-18 11,-5 22,-7 34,-7 10,0 20,2 29,6 10,3 17,9 24,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,9 -8,7 -12,16 -12,28 0,7 2,13 5,17 3,5 7,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 12,4 23,7 33,11 11,4 21,9 31,16 9,8 17,17 22,28 5,11 7,22 7,35 0,13 -2,25 -7,37 -5,11 -11,21 -20,29 -8,8 -18,15 -29,20 -12,4 -24,7 -38,7 -11,0 -22,-2 -32,-6 -9,-4 -17,-11 -25,-20 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-29 0,-59 0,-88 18,0 35,0 52,0z"/> |
730 | + <path fill="#969696" d="M419 704c-18,0 -36,0 -54,0 -18,-65 -36,-130 -54,-195 -19,65 -37,130 -55,195 -18,0 -35,0 -53,0 -24,-83 -47,-166 -71,-249 -10,0 -20,0 -29,0 0,-15 0,-31 0,-47 40,0 80,0 120,0 0,16 0,32 0,47 -11,0 -22,0 -32,0 14,52 27,104 41,156 18,-68 36,-135 54,-203 16,0 32,0 48,0 19,67 38,134 57,201 13,-51 26,-102 39,-154 -11,0 -22,0 -33,0 0,-15 0,-31 0,-47 40,0 81,0 121,0 0,16 0,32 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 -1,0 -12,34 -25,68 -37,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-44 -34,0 -69,0 -104,0 -5,14 -11,29 -17,44 11,0 21,0 32,0 0,14 0,28 0,41 -40,0 -80,0 -121,0 0,-15 0,-31 0,-47 11,0 21,0 32,0 29,-67 57,-134 86,-202 -11,0 -22,0 -33,0 0,-15 0,-31 0,-47 33,0 67,0 100,0 34,83 69,166 103,249 11,0 21,0 32,0 0,16 0,32 0,47 -42,0 -83,0 -125,0 0,-13 0,-27 0,-41zm201 -47c0,7 1,12 3,18 2,5 5,10 8,14 4,5 9,8 14,10 5,2 12,4 19,4 12,0 22,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-14 -5,-18 -3,-5 -7,-9 -12,-13 -5,-3 -10,-5 -16,-7 -6,-2 -12,-4 -18,-6 -10,-3 -20,-6 -30,-9 -9,-4 -19,-9 -28,-16 -21,-16 -32,-38 -32,-65 0,-12 2,-23 7,-34 5,-10 12,-19 20,-27 8,-8 18,-13 29,-18 10,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18 0,-6 0,-11 0,-17 15,0 29,0 44,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-21 -11,-28 -8,-7 -17,-11 -28,-11 -11,0 -20,3 -28,10 -8,6 -12,15 -12,27 0,7 1,13 4,18 3,5 7,9 12,12 4,3 10,5 15,7 6,2 12,3 18,5 11,3 22,7 33,10 10,4 20,10 30,17 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -8,37 -4,12 -11,21 -19,30 -8,8 -18,14 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-58 0,-88 17,0 34,0 52,0z"/> |
731 | + <path fill="#929292" d="M418 704c-17,0 -35,0 -53,0 -18,-65 -37,-130 -55,-196 -18,66 -36,131 -55,196 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -10,0 -21,0 -32,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 15,0 31,0 47,0 19,67 38,134 57,201 13,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -25,68 -38,101 25,0 51,0 76,0 -13,-33 -25,-67 -38,-101zm37 189c10,0 21,0 32,0 -5,-14 -11,-29 -17,-44 -35,0 -70,0 -104,0 -6,15 -12,30 -17,44 10,0 21,0 32,0 0,14 0,28 0,42 -41,0 -81,0 -121,0 0,-16 0,-32 0,-47 10,0 21,0 31,0 29,-68 58,-135 87,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 10,0 21,0 31,0 0,15 0,31 0,47 -41,0 -83,0 -124,0 0,-14 0,-28 0,-42zm200 -46c0,6 1,12 3,17 2,6 5,11 9,15 4,4 8,7 14,10 5,2 11,3 18,3 12,0 23,-3 31,-11 8,-7 13,-17 13,-29 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-2 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -33,-38 -33,-65 0,-12 3,-24 8,-34 5,-11 11,-20 19,-27 9,-8 18,-14 29,-18 11,-5 22,-7 34,-7 10,0 20,2 29,6 10,3 18,9 24,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,9 -8,7 -11,16 -11,28 0,7 1,13 4,17 3,5 7,9 11,12 5,3 10,6 16,7 6,2 11,4 17,6 12,3 23,6 33,10 11,4 21,9 31,17 9,7 17,16 22,27 5,11 7,22 7,35 0,13 -2,25 -7,37 -5,11 -11,21 -19,29 -9,9 -19,15 -30,20 -12,4 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-11 -26,-20 0,7 0,13 0,20 -15,0 -29,0 -44,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
732 | + <path fill="#8E8E8E" d="M418 703c-18,0 -36,0 -54,0 -18,-65 -36,-130 -54,-195 -19,65 -37,130 -55,195 -18,0 -35,0 -53,0 -24,-83 -47,-166 -71,-249 -10,0 -20,0 -29,0 0,-15 0,-31 0,-47 40,0 80,0 120,0 0,16 0,32 0,47 -11,0 -22,0 -32,0 14,52 28,104 42,156 17,-68 35,-135 53,-203 16,0 32,0 48,0 19,67 38,134 57,201 13,-51 26,-102 40,-154 -12,0 -23,0 -34,0 0,-15 0,-31 0,-47 40,0 81,0 121,0 0,16 0,32 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -26,68 -38,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-44 -34,0 -69,0 -104,0 -5,14 -11,29 -17,44 11,0 22,0 32,0 0,14 0,28 0,41 -40,0 -80,0 -121,0 0,-15 0,-31 0,-47 11,0 21,0 32,0 29,-67 57,-134 86,-202 -11,0 -22,0 -33,0 0,-15 0,-31 0,-47 34,0 67,0 100,0 34,83 69,166 103,249 11,0 22,0 32,0 0,16 0,32 0,47 -42,0 -83,0 -125,0 0,-13 0,-27 0,-41zm201 -47c0,7 1,12 3,18 2,5 5,10 8,14 4,5 9,8 14,10 5,3 12,4 19,4 12,0 22,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-14 -5,-18 -3,-5 -7,-9 -12,-12 -4,-4 -10,-6 -16,-8 -6,-2 -12,-4 -17,-6 -11,-3 -21,-6 -31,-9 -9,-4 -18,-9 -28,-16 -21,-16 -32,-37 -32,-65 0,-12 2,-23 7,-34 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 10,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18 0,-6 0,-11 0,-17 15,0 29,0 44,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -17,-11 -28,-11 -11,0 -20,3 -28,10 -8,6 -12,16 -12,27 0,7 2,13 4,18 3,5 7,9 12,12 5,3 10,5 15,7 6,2 12,3 18,5 11,3 22,7 33,10 10,4 20,10 30,17 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,21 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -10,-4 -18,-10 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-58 0,-88 17,0 34,0 52,0z"/> |
733 | + <path fill="#8B8B8B" d="M417 703c-17,0 -35,0 -53,0 -18,-65 -37,-130 -55,-195 -18,65 -36,130 -55,195 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-32 0,-47 40,0 80,0 121,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 16,0 31,0 47,0 19,67 38,134 57,201 14,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 -22,83 -44,166 -66,249zm210 -231c0,0 0,0 0,0 -13,34 -25,68 -38,102 25,0 51,0 76,0 -13,-34 -25,-68 -38,-102zm37 190c11,0 21,0 32,0 -5,-15 -11,-30 -17,-45 -35,0 -69,0 -104,0 -6,15 -12,30 -17,45 10,0 21,0 32,0 0,13 0,27 0,41 -41,0 -81,0 -121,0 0,-16 0,-32 0,-47 10,0 21,0 31,0 29,-68 58,-135 87,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 11,0 21,0 32,0 0,15 0,31 0,47 -42,0 -84,0 -125,0 0,-14 0,-28 0,-41zm200 -47c0,6 1,12 3,17 2,6 5,11 9,15 4,4 8,7 14,10 5,2 11,3 18,3 13,0 23,-3 31,-11 9,-7 13,-17 13,-29 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-2 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -32,-38 -32,-65 0,-12 2,-24 7,-34 5,-11 11,-20 20,-27 8,-8 17,-14 28,-18 11,-4 22,-7 34,-7 10,0 20,2 29,6 10,3 18,9 24,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,9 -7,7 -11,16 -11,28 0,7 1,13 4,18 3,4 7,8 11,11 5,3 10,6 16,7 6,2 11,4 17,6 12,3 23,6 33,10 11,4 21,9 31,17 9,7 17,17 22,27 5,11 7,22 7,35 0,13 -2,25 -7,37 -5,11 -11,21 -19,29 -9,9 -19,15 -30,20 -12,4 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-11 -26,-19 0,6 0,13 0,19 -14,0 -29,0 -44,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
734 | + <path fill="#878787" d="M417 703c-18,0 -36,0 -54,0 -18,-66 -36,-131 -54,-196 -19,65 -37,130 -55,196 -18,0 -35,0 -53,0 -24,-83 -47,-166 -71,-250 -10,0 -19,0 -29,0 0,-15 0,-31 0,-47 40,0 80,0 120,0 0,16 0,32 0,47 -11,0 -22,0 -32,0 14,52 28,104 42,156 17,-68 35,-135 53,-203 16,0 32,0 48,0 19,67 38,134 57,201 13,-51 26,-102 40,-154 -11,0 -23,0 -34,0 0,-15 0,-31 0,-47 41,0 81,0 121,0 0,16 0,32 0,47 -11,0 -22,0 -33,0 -22,84 -44,167 -66,250zm210 -232c0,0 0,0 0,0 -13,34 -26,68 -38,102 25,0 50,0 75,0 -12,-34 -25,-68 -37,-102zm36 190c11,0 22,0 33,0 -6,-15 -12,-30 -18,-44 -34,0 -69,0 -104,0 -5,14 -11,29 -17,44 11,0 22,0 32,0 0,14 0,28 0,42 -40,0 -80,0 -121,0 0,-16 0,-32 0,-48 11,0 21,0 32,0 29,-67 58,-134 86,-202 -11,0 -22,0 -32,0 0,-15 0,-31 0,-47 33,0 66,0 99,0 34,83 69,166 104,249 10,0 21,0 31,0 0,16 0,32 0,48 -42,0 -83,0 -125,0 0,-14 0,-28 0,-42zm201 -46c0,6 1,11 3,17 2,6 5,10 8,15 4,4 9,7 14,9 6,3 12,4 19,4 12,0 22,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-14 -5,-18 -3,-5 -7,-9 -12,-12 -4,-4 -10,-6 -16,-8 -6,-2 -12,-4 -17,-5 -11,-4 -21,-7 -31,-10 -9,-4 -18,-9 -28,-16 -21,-16 -32,-37 -32,-65 0,-12 3,-23 7,-34 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 11,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 23,18 0,-6 0,-11 0,-17 15,0 29,0 44,0 0,27 0,53 0,80 -17,0 -34,0 -51,0 0,-11 -4,-20 -11,-28 -7,-7 -17,-11 -28,-11 -11,0 -20,4 -28,10 -8,7 -12,16 -12,27 0,7 2,13 4,18 3,5 7,9 12,12 5,3 10,5 15,7 6,2 12,3 18,5 11,3 22,7 33,11 10,3 21,9 30,16 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,21 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -9,-4 -18,-10 -25,-19 0,7 0,13 0,20 -15,0 -30,0 -45,0 0,-30 0,-59 0,-88 17,0 34,0 52,0z"/> |
735 | + <path fill="#848484" d="M417 702c-18,0 -36,0 -54,0 -18,-65 -37,-130 -55,-195 -18,65 -36,130 -55,195 -17,0 -35,0 -52,0 -24,-83 -48,-166 -71,-249 -10,0 -20,0 -30,0 0,-16 0,-32 0,-47 40,0 80,0 121,0 0,15 0,31 0,47 -11,0 -22,0 -33,0 14,52 28,104 42,156 18,-68 36,-136 54,-203 16,0 32,0 47,0 19,67 38,134 57,201 14,-51 27,-103 40,-154 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 40,0 80,0 120,0 0,15 0,31 0,47 -11,0 -22,0 -32,0 -22,83 -44,166 -66,249zm210 -231c-1,0 -1,0 -1,0 -12,34 -25,68 -38,102 26,0 51,0 76,0 -13,-34 -25,-68 -37,-102zm36 190c11,0 22,0 32,0 -5,-15 -11,-30 -17,-45 -35,0 -69,0 -104,0 -6,15 -12,30 -17,45 10,0 21,0 32,0 0,13 0,27 0,41 -40,0 -81,0 -121,0 0,-16 0,-31 0,-47 11,0 21,0 32,0 28,-67 57,-135 86,-202 -11,0 -22,0 -33,0 0,-16 0,-32 0,-47 33,0 66,0 99,0 35,83 69,166 104,249 11,0 21,0 32,0 0,16 0,31 0,47 -42,0 -84,0 -125,0 0,-14 0,-28 0,-41zm200 -47c0,6 1,12 3,18 2,5 5,10 9,14 4,4 8,7 14,10 5,2 11,3 18,3 13,0 23,-3 31,-10 9,-8 13,-18 13,-30 0,-8 -2,-14 -5,-19 -3,-5 -7,-9 -12,-12 -5,-3 -10,-6 -16,-8 -6,-1 -12,-3 -18,-5 -11,-3 -21,-6 -30,-10 -10,-3 -19,-8 -28,-15 -22,-16 -32,-38 -32,-65 0,-12 2,-24 7,-34 5,-11 11,-20 20,-27 8,-8 17,-14 28,-18 11,-4 22,-7 34,-7 11,0 20,2 30,6 9,3 17,9 23,17 0,-5 0,-11 0,-16 14,0 29,0 43,0 0,26 0,53 0,79 -17,0 -34,0 -50,0 -1,-11 -4,-20 -12,-27 -7,-8 -16,-11 -27,-11 -11,0 -21,3 -29,10 -7,6 -11,15 -11,27 0,7 1,13 4,18 3,4 7,8 11,11 5,3 10,6 16,7 6,2 11,4 17,6 12,3 23,6 33,10 11,4 21,9 31,17 9,7 17,17 22,27 5,11 7,22 7,35 0,13 -2,26 -7,37 -5,11 -11,21 -19,29 -9,9 -19,15 -30,20 -12,5 -24,7 -38,7 -11,0 -22,-2 -31,-6 -10,-4 -18,-11 -25,-19 0,6 0,13 0,19 -15,0 -30,0 -45,0 0,-29 0,-59 0,-88 17,0 34,0 51,0z"/> |
736 | + </g> |
737 | + <path fill="gray" fill-rule="nonzero" d="M416 702l-54 0 -54 -196 -55 196 -53 0 -71 -249 -29 0 0 -48 120 0 0 48 -32 0 42 155 53 -203 48 0 57 202 40 -154 -34 0 0 -48 121 0 0 48 -33 0 -66 249zm210 -232l0 0 -38 102 75 0 -37 -102zm36 190l33 0 -17 -44 -105 0 -17 44 32 0 0 42 -120 0 0 -48 31 0 86 -201 -32 0 0 -48 99 0 104 249 31 0 0 48 -125 0 0 -42zm201 -46c0,6 1,12 3,17 2,6 5,10 9,15 3,4 8,7 13,9 6,3 12,4 19,4 12,0 23,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-13 -4,-18 -4,-5 -8,-9 -13,-12 -4,-3 -10,-6 -16,-8 -6,-2 -12,-4 -17,-5 -11,-3 -21,-7 -31,-10 -9,-4 -18,-9 -27,-16 -22,-16 -33,-37 -33,-64 0,-13 3,-24 7,-35 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 11,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 24,18l0 -17 43 0 0 80 -51 0c0,-11 -4,-20 -11,-28 -7,-7 -16,-11 -28,-11 -11,0 -20,4 -28,10 -8,7 -12,16 -12,27 0,7 2,13 5,18 2,5 6,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 11,3 22,7 33,11 10,3 21,9 30,16 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,22 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -9,-4 -18,-10 -25,-19l0 20 -45 0 0 -88 52 0z"/> |
738 | + <path fill="white" fill-rule="nonzero" d="M416 702l-54 0 -54 -196 -55 196 -53 0 -71 -249 -29 0 0 -48 120 0 0 48 -32 0 42 155 53 -203 48 0 57 202 40 -154 -34 0 0 -48 121 0 0 48 -33 0 -66 249zm210 -232l0 0 -38 102 75 0 -37 -102zm36 190l33 0 -17 -44 -105 0 -17 44 32 0 0 42 -120 0 0 -48 31 0 86 -201 -32 0 0 -48 99 0 104 249 31 0 0 48 -125 0 0 -42zm201 -46c0,6 1,12 3,17 2,6 5,10 9,15 3,4 8,7 13,9 6,3 12,4 19,4 12,0 23,-4 31,-11 8,-7 12,-17 12,-30 0,-7 -1,-13 -4,-18 -4,-5 -8,-9 -13,-12 -4,-3 -10,-6 -16,-8 -6,-2 -12,-4 -17,-5 -11,-3 -21,-7 -31,-10 -9,-4 -18,-9 -27,-16 -22,-16 -33,-37 -33,-64 0,-13 3,-24 7,-35 5,-10 12,-19 20,-27 8,-7 18,-13 29,-18 11,-4 22,-6 34,-6 10,0 20,2 29,5 9,4 17,10 24,18l0 -17 43 0 0 80 -51 0c0,-11 -4,-20 -11,-28 -7,-7 -16,-11 -28,-11 -11,0 -20,4 -28,10 -8,7 -12,16 -12,27 0,7 2,13 5,18 2,5 6,9 11,12 5,3 10,5 16,7 5,2 11,4 17,5 11,3 22,7 33,11 10,3 21,9 30,16 10,8 17,17 22,28 5,10 8,22 8,34 0,14 -3,26 -7,37 -5,12 -12,22 -20,30 -8,8 -18,15 -30,19 -11,5 -24,7 -37,7 -12,0 -22,-2 -32,-6 -9,-4 -18,-10 -25,-19l0 20 -45 0 0 -88 52 0z"/> |
739 | + </g> |
740 | + </g> |
741 | +</svg> |
742 | |
743 | === added file 'metadata.yaml' |
744 | --- metadata.yaml 1970-01-01 00:00:00 +0000 |
745 | +++ metadata.yaml 2015-07-13 10:17:33 +0000 |
746 | @@ -0,0 +1,11 @@ |
747 | +name: was-base |
748 | +summary: WebSphere Application Server Base Edition |
749 | +maintainer: IBM Juju Support Team <jujusupp@us.ibm.com> |
750 | +description: | |
751 | + WebSphere Application Server is a proven, high-performance transaction engine that can help build, run, integrate, and manage dynamic web applications. |
752 | +tags: ["applications"] |
753 | +subordinate: false |
754 | +provides: |
755 | + website: |
756 | + interface: http |
757 | + |
758 | |
759 | === added directory 'tests' |
760 | === added file 'tests/00-setup' |
761 | --- tests/00-setup 1970-01-01 00:00:00 +0000 |
762 | +++ tests/00-setup 2015-07-13 10:17:33 +0000 |
763 | @@ -0,0 +1,19 @@ |
764 | +#!/bin/bash |
765 | +# ATTENTION: ib_url must contain the repository with |
766 | +# your IB packages |
767 | +export WAS_URL="http://9.124.100.99/debs/WAS-BASE" |
768 | +export IM_FILE_NAME="Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip" |
769 | +WAS_URL=${WAS_URL?Error: IBM WAS Base repository must be defined in tests/00-setup} |
770 | +IM_FILE_NAME=${IM_FILE_NAME?Error: IBM IM package be defined in tests/00-setup} |
771 | + |
772 | +# Add a local configuration file |
773 | +sudo cat << EOF > local.yaml |
774 | +wasbase: |
775 | + was_url: "$WAS_URL" |
776 | + im_file_name: "$IM_FILE_NAME" |
777 | +EOF |
778 | + |
779 | +sudo add-apt-repository ppa:juju/stable -y |
780 | +sudo apt-get update |
781 | +sudo apt-get install amulet python3-requests -y |
782 | + |
783 | |
784 | === added file 'tests/10-bundles-test.py' |
785 | --- tests/10-bundles-test.py 1970-01-01 00:00:00 +0000 |
786 | +++ tests/10-bundles-test.py 2015-07-13 10:17:33 +0000 |
787 | @@ -0,0 +1,78 @@ |
788 | +#!/usr/bin/env python3 |
789 | + |
790 | +# This amulet test deploys the bundles.yaml file in this directory. |
791 | + |
792 | +import os |
793 | +import unittest |
794 | +import yaml |
795 | +import amulet |
796 | +import sys |
797 | +import requests |
798 | + |
799 | +# Lots of prereqs on this charm (eg: java), so give it a large timeout |
800 | +seconds_to_wait = 2400 |
801 | + |
802 | + |
803 | +class BundleTest(unittest.TestCase): |
804 | + """ Create a class for testing the charm in the unit test framework. """ |
805 | + @classmethod |
806 | + def setUpClass(cls): |
807 | + """ Set up an amulet deployment using the bundle. """ |
808 | + d=amulet.Deployment() |
809 | + |
810 | + local_path = os.path.join(os.path.dirname(__file__), 'local.yaml') |
811 | + with open(local_path, "r") as fd: |
812 | + config = yaml.safe_load(fd) |
813 | + |
814 | + url = config.get('wasbase').get('was_url') |
815 | + print('Using URL %s' % url) |
816 | + # Test if a IB url for the repository is defined |
817 | + if not url: |
818 | + print("You need to define a url for the WAS Base packages repository.\n" |
819 | + "Edit local.yaml or tests/00-setup and run it again.") |
820 | + sys.exit(1) |
821 | + |
822 | + pkg = config.get('wasbase').get('im_file_name') |
823 | + print('Using IBM IM package %s' % pkg) |
824 | + if not pkg: |
825 | + print("You need to define a package name for IBM IM.\n" |
826 | + "Edit local.yaml or tests/00-setup and run it again.") |
827 | + sys.exit(1) |
828 | + |
829 | + bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml') |
830 | + with open(bundle_path, 'r') as bundle_file: |
831 | + contents = yaml.safe_load(bundle_file) |
832 | + d.load(contents) |
833 | + d.add("haproxy") |
834 | + |
835 | + # Software doesn't actually install until you accept the license |
836 | + d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg }) |
837 | + d.configure('haproxy', {'enable_monitoring': True }) |
838 | + d.relate('haproxy:reverseproxy', 'was-base:website') |
839 | + d.setup(seconds_to_wait) |
840 | + d.sentry.wait(seconds_to_wait) |
841 | + cls.d = d |
842 | + |
843 | + def test_deployed(self): |
844 | + """ Test to see if the bundle deployed successfully. """ |
845 | + self.assertTrue(self.d.deployed) |
846 | + |
847 | + def test_website(self): |
848 | + unit = self.d.sentry.unit['was-base/0'] |
849 | + url = 'http://%s:9060/ibm/console' % unit.info['public-address'] |
850 | + response = requests.get(url) |
851 | + # Raise an exception if the url was not a valid web page. |
852 | + response.raise_for_status() |
853 | + |
854 | + def test_reverseproxy(self): |
855 | + unit = self.d.sentry.unit['haproxy/0'] |
856 | + url = 'http://%s:80/ibm/console' % unit.info['public-address'] |
857 | + response = requests.get(url) |
858 | + # Raise an exception if the url was not a valid web page. |
859 | + response.raise_for_status() |
860 | + |
861 | + |
862 | + |
863 | +if __name__ == '__main__': |
864 | + unittest.main() |
865 | + |
866 | |
867 | === added file 'tests/bundles.yaml' |
868 | --- tests/bundles.yaml 1970-01-01 00:00:00 +0000 |
869 | +++ tests/bundles.yaml 2015-07-13 10:17:33 +0000 |
870 | @@ -0,0 +1,10 @@ |
871 | +was-base-bundle: |
872 | + services: |
873 | + "was-base": |
874 | + charm: "was-base" |
875 | + num_units: 1 |
876 | + annotations: |
877 | + "gui-x": "300" |
878 | + "gui-y": "300" |
879 | + relations: [] |
880 | + series: trusty |
881 | |
882 | === added file 'tests/local.yaml' |
883 | --- tests/local.yaml 1970-01-01 00:00:00 +0000 |
884 | +++ tests/local.yaml 2015-07-13 10:17:33 +0000 |
885 | @@ -0,0 +1,3 @@ |
886 | +wasbase: |
887 | + was_url: "http://9.124.100.99/debs/WAS-BASE" |
888 | + im_file_name: "Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip" |
Since you have already taken care of the comments, given earlier(before branch recreation).So changes looks good