Commit Graph

3917 Commits

Author SHA1 Message Date
Megan Marsh aeedc9af7a
Merge pull request #8879 from mbrancato/specify_keyvault_sku
Add support for configurable KeyVault SKU
2020-03-12 13:47:51 -07:00
Joshua Foster 8eac9f9634 add boot order documentation based on feedback 2020-03-12 11:29:20 -04:00
Wilken Rivera 7b705545d9
docs: Various doc clean-ups to fix code block formatting and syntax highlighting (#8868) 2020-03-12 15:05:08 +01:00
Mike Brancato 6a141c7695 add generated documentation 2020-03-11 21:52:36 -04:00
Mike Brancato ebb161ae41 Fix config documentation 2020-03-11 21:43:37 -04:00
Mike Brancato 926e3ac2e4 Add support for configurable KeyVault SKU 2020-03-11 20:33:57 -04:00
r_takaishi 4bb4f7617f need white spaces 2020-03-11 11:04:59 +09:00
r_takaishi 0230c078e0 write docs 2020-03-11 10:53:59 +09:00
Megan Marsh e518a0a8b7
Merge branch 'master' into update_go-cty_regex 2020-03-10 10:52:42 -07:00
Megan Marsh 68e083603d
Update website/source/docs/configuration/from-1.5/functions/string/replace.html.md
Co-Authored-By: Wilken Rivera <dev@wilkenrivera.com>
2020-03-10 10:51:25 -07:00
Megan Marsh 8a1caaa804
Merge pull request #8837 from hashicorp/fix_8730
Fix crash when an unset variable is used
2020-03-10 10:40:48 -07:00
Adrien Delorme 0c45bd8b4f import new replace and regex replace funcs from go-cty + documentation 2020-03-10 16:14:25 +01:00
Adrien Delorme d4d30127a3 Update variables.html.md 2020-03-10 14:53:48 +01:00
Adrien Delorme c4349f5a33 document variables behaviours with tables 2020-03-10 14:51:17 +01:00
Jaspal Chauhan b204687de9
Add VBoxManage config section to VirtualBox OVF builder docs (#8861) 2020-03-10 11:11:27 +01:00
Megan Marsh 7873cabf63
Merge pull request #8858 from hashicorp/fix_8791
update spot price docs
2020-03-09 09:31:56 -07:00
Sylvia Moss 76f13deaf4
Make template variables SSHPublicKey and SSHPrivateKey as strings (#8829) 2020-03-09 17:25:05 +01:00
Megan Marsh 4133acbdf3 update spot price docs 2020-03-09 08:46:30 -07:00
Sylvia Moss 4bdf30165a
Fix example json format in ansible provisioner doc (#8856) 2020-03-09 16:40:56 +01:00
jnsc 764b4cb50a
updated link to GuestOsIdentifier (#8849)
Co-authored-by: Adrien Delorme <adrien.delorme@icloud.com>
2020-03-06 15:30:11 +01:00
Wilken Rivera 698924f246
vSphere ISO supports more common options (#8845)
The `convert_to_template` and `create_snapshot` are supported across
both builders, but currently only shown in the vSphere Clone docs, this adds
them to it.
2020-03-05 15:04:15 -05:00
Megan Marsh 8832b3e2ca
Merge pull request #8787 from jhawk28/vsphere_iso_multiple_disks
(vsphere-iso) add ability to define multiple disks
2020-03-04 15:17:54 -08:00
Sylvia Moss 717b9047db
Fix boot command link in ssh communicator doc (#8839) 2020-03-04 16:28:39 +01:00
Joshua Foster 1dbe5abc14 update documentation based on feedback 2020-03-04 09:48:01 -05:00
Joshua Foster d7230827cd (vsphere-iso) add ability to define multiple disks
Closes #8749
2020-03-04 09:48:01 -05:00
Noel Quiles 4ed896fc99
Update middleman-hashicorp to 0.3.44 (#8836) 2020-03-03 22:59:24 -05:00
rjhornsby b91c4d32cc
Additional clarity
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2020-03-03 15:19:13 -06:00
Rick Hornsby 0a2fb8c383 Clarify `expect_disconnect` behavior 2020-03-03 12:44:58 -06:00
Megan Marsh d422d81dec
Merge pull request #8823 from hashicorp/d-provisioners-update-index
docs/provisioners/index: Add link to Template Provisioners section
2020-03-02 15:00:43 -08:00
Wilken Rivera 5dfeddc3a4 guides/hcl: Add link to HCL2 issues tracked on the Packer repo
This change adds a partial that contains a link to the HCL2 issues currently being tracked on GitHub. The partial has been added to the majority of the HCL2 guide documents as a way to help users learn about any open or recently resolved issues pertaining to the HCL2 support in Packer.
2020-03-02 17:13:35 -05:00
Megan Marsh 0f9c3e2cb4
Merge pull request #8784 from kirannhegde/bugfix-4295
Citrix XenServer packer plugin-#4295
2020-03-02 12:53:11 -08:00
Megan Marsh 9c9826ee4b
Merge pull request #8714 from williamb1024/hyperv-gen1-boot-order
WIP: Add Hyper-V builder `first_boot_device` setting to allow the selection of the initial device or device class used for booting the VM.
2020-03-02 12:27:25 -08:00
Wilken Rivera 433c9e8276 docs/provisioners/index: Add link to Template Provisioners section 2020-03-02 15:05:00 -05:00
Larry Eichenbaum b45ed4c4f1
Update build-image-in-cicd.html.md (#8813)
typo
2020-03-02 04:10:51 -05:00
Megan Marsh 60d952033e
Merge pull request #8798 from EnMod/nq.add-x-frame-options-header
[Website] Set security-focused page headers
2020-02-28 11:42:24 -08:00
Megan Marsh 7d065d9030
Merge pull request #8793 from hashicorp/dependabot/bundler/website/nokogiri-1.10.8
Bump nokogiri from 1.10.4 to 1.10.8 in /website
2020-02-28 11:41:10 -08:00
andretorres-codurance 5d4e9af9cd
Update ansible.html.md.erb 2020-02-26 10:38:40 +00:00
Noel Quiles 806e799945
[Website] Set security-focused page headers
- Sets X-Frame-Options to SAMEORIGIN
- Sets Strict-Transport-Security to:
  max-age=31536000; includeSubDomains; preload
2020-02-25 19:11:47 -05:00
dependabot[bot] dbb884deb3
Bump nokogiri from 1.10.4 to 1.10.8 in /website
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-02-25 08:03:20 +00:00
Kiran Hegde 31665dc8c3
Citrix XenServer packer plugin
Updating the GitHub reference to the packer plugins for the Citrix XenServer/Citrix Hypervisor to the official Github repository
2020-02-21 16:53:02 +05:30
William Brooks 5e1e4ec701 fmt && generate 2020-02-21 01:07:58 -06:00
Rens Sikma 3d8bda31a4 modify docstring 2020-02-20 12:54:35 +01:00
Megan Marsh dde74232f2
Clearly document all template-engine-enabled options (#8770) 2020-02-20 11:05:27 +01:00
Adrien Delorme a8fcb2d91a
HCL2: add support for dynamic blocks, document for loops and splat expressions (#8720) 2020-02-20 10:51:34 +01:00
Megan Marsh eb35617985
Merge pull request #8756 from aeber/feature_eagerly_scrub_disks
vsphere-iso: add support for eagerly zeroed / scrubbed disks
2020-02-19 09:47:49 -08:00
Jason A. Beranek 9cbb49bacb
builder/vmware/iso: Expand `guest_os_type` docs (#8760) 2020-02-18 11:11:20 +01:00
Mark Lewis 70752e0488
Add prompt to use a specific directory for *.pkr.hcl (#8757)
This improves usability as many users will still expect
to use `packer build config.pkr.hcl` having run
`packer build config.json` in the past.
2020-02-18 10:55:30 +01:00
Anselm Eberhardt 94130b5def
add autogenerated help for disk_eagerly_scrub 2020-02-17 17:01:00 +01:00
William 807f39284d
Merge pull request #2 from hashicorp/master
merge from hashicorp/packer
2020-02-15 23:13:38 -06:00
Megan Marsh c9b011145d cut version 1.5.4 2020-02-14 14:55:03 -08:00
Megan Marsh c229607ee3 update to v1.5.3 2020-02-14 10:30:18 -08:00
jhawk28 7f0de5fc8d
add ability to define multiple NICs for vsphere-iso (#8739) 2020-02-14 17:51:57 +01:00
Mark Lewis 2d0c796837
Fix typos in Input and Local Variables guide (#8741) 2020-02-14 15:30:25 +01:00
Megan Marsh 4f7670a1e6
Merge pull request #8690 from daxgames/vsphere_iso_remove_cdrom
vsphere iso remove cdroms
2020-02-13 11:00:47 -08:00
Aayush Sarva c2ad9481f6
Fix typo in Dockerfiles section (#8728)
`an container runner` => `a container runner`
2020-02-13 15:39:45 +01:00
Wilken Rivera 746b7cbf0f cut release 1.5.2 2020-02-12 13:36:35 -05:00
Dax T. Games 78012dc56f add autogenerated help for vsphere iso remove cdrom 2020-02-12 11:31:46 -05:00
Wilken Rivera c99dc56544 Update Azure ARM documentation
* Change generated documentation to indicate what image selection
options are required, and when.

* Refactor the structure of the documentation to highlight required
options for different types of builds
2020-02-10 21:14:11 -05:00
Wilken Rivera 8b482933cf docs/azure-arm: Refactor docs to clear up required options
This changes separates the required configurations options needed when using Azure Marketplace images vs Custom user built Images.
2020-02-10 21:10:07 -05:00
Megan Marsh a90f75585b
Merge pull request #8709 from hashicorp/aws_max_retries
add max_retries option to aws builders
2020-02-10 14:58:44 -08:00
Wilken Rivera c86c193721
Merge pull request #8718 from treehouseops/nf.bump-middleman-version
Website: bump middleman version
2020-02-10 15:50:17 -05:00
nicolelyn 1a78821ca0 website: bump middleman version 2020-02-10 14:45:58 -05:00
Wilken Rivera 7e45a10e90
Merge pull request #8717 from luba239/master
Add service account ID to config #8716
2020-02-10 14:27:59 -05:00
Megan Marsh dfefe7e8d9
Merge pull request #8704 from hashicorp/custom_vault_azure
Custom vault azure
2020-02-10 10:51:06 -08:00
Luba Grinkevich a067b23e6d Execute `make generate` #8716 2020-02-10 18:51:29 +03:00
William Brooks 61f5f867eb make generate 2020-02-09 16:41:07 -06:00
Adrien Delorme 7d5f0c11af add max_retries option to aws builders 2020-02-07 16:36:14 +01:00
Megan Marsh bfa8b17039 regenerate docs 2020-02-06 17:02:01 -08:00
Megan Marsh 7dd1fa44db regenerate code 2020-02-06 16:41:28 -08:00
Adrien Delorme 193dad46e6
Hcl2 input variables, local variables and functions (#8588)
Mainly redefine or reused what Terraform did.

* allow to used `variables`, `variable` and `local` blocks
* import the following functions and their docs from Terraform: abs, abspath, basename, base64decode, base64encode, bcrypt, can, ceil, chomp, chunklist, cidrhost, cidrnetmask, cidrsubnet, cidrsubnets, coalesce, coalescelist, compact, concat, contains, convert, csvdecode, dirname, distinct, element, file, fileexists, fileset, flatten, floor, format, formatdate, formatlist, indent, index, join, jsondecode, jsonencode, keys, length, log, lookup, lower, max, md5, merge, min, parseint, pathexpand, pow, range, reverse, rsadecrypt, setintersection, setproduct, setunion, sha1, sha256, sha512, signum, slice, sort, split, strrev, substr, timestamp, timeadd, title, trim, trimprefix, trimspace, trimsuffix, try, upper, urlencode, uuidv4, uuidv5, values, yamldecode, yamlencode, zipmap.
2020-02-06 11:49:21 +01:00
Rens Sikma c8062cc8b3 fix #8679 with source_image_project_id as list 2020-02-06 10:30:04 +01:00
Dax T. Games 90eee3829d add docs 2020-02-05 11:13:00 -05:00
Dax T. Games 76680ac1c6 add docs 2020-02-05 11:10:50 -05:00
Megan Marsh c6dddb75cf
clarify artifice postprocessor wording to make it clear that it will not clean up old artifacts (#8676)
fix #5451
2020-01-31 16:45:18 +01:00
Megan Marsh 3b5780f98c
add jq example for basic manifest parsing (#8677)
fix #5413
2020-01-31 16:43:52 +01:00
Megan Marsh 69fe131571
switch trilean to boolean in docs to prevent confusion (#8673) 2020-01-31 16:42:16 +01:00
Moss f44eee11b3 Add custom-builders sharing info with post-processors doc 2020-01-30 18:16:55 +01:00
Megan Marsh 4b29131d9c
update docs with warning about timestamp drift (#8666) 2020-01-29 10:29:35 +01:00
Megan Marsh 817957fe4f
Merge pull request #8616 from hashicorp/packer-plugin-path
add PACKER_PLUGIN_PATH for plugin discovery
2020-01-28 12:09:55 -08:00
Megan Marsh 6a07d76416
Merge pull request #8654 from hashicorp/fix_8583
Extract http ip discover to a new step
2020-01-28 08:50:48 -08:00
Moss 7194e92930 Add template engine variables doc for amazon-chroot 2020-01-28 14:58:05 +01:00
Moss 0566f1f999 Extract http ip discover to a new step 2020-01-27 17:06:56 +01:00
chrisL 63cba2dc00 google compute builder documentation example code cleanup (#8551) 2020-01-27 15:53:17 +01:00
Zian Ke dd5893ec23 Fix grammatical error (#8643) 2020-01-23 10:03:39 +01:00
Lei Tu e4aca6298d update website 2020-01-21 21:56:15 +09:00
Calle Pettersson 8e4c165173 Proxmox upload ISO 2020-01-17 22:17:28 +01:00
Sylvia Moss fce24ca71d
Add extend packer build template engine docs (#8615) 2020-01-17 11:21:52 +01:00
Megan Marsh 83ecebbf37 add PACKER_PLUGIN_PATH for plugin discovery 2020-01-16 13:13:29 -08:00
Sylvia Moss 0677b02e18
Share SourceImageName with provisioners and manifest post-processor (#8603) 2020-01-16 12:04:03 +01:00
Megan Marsh fac320d290
Merge pull request #8480 from hashicorp/merge-vsphere-builder
Merge the vSphere builder
2020-01-15 14:11:20 -08:00
Sylvia Moss d6a351b173
Rename communicator config variables and remove deprecated code (#8584) 2020-01-09 08:37:30 -08:00
Sylvia Moss baa203bb53
Adds acpi_shutdown to virtualbox builder (#8587) 2020-01-09 08:36:19 -08:00
Moss 6a2d73a0e9 Add missing doc variable description 2020-01-08 15:28:53 -08:00
Megan Marsh 49a33c04cd
Merge pull request #8511 from TJM/vsphere_template_markas
[post-processor/vsphere-template] Simplify method to use vm.MarkAsTemplate (optionally)
2020-01-08 09:41:43 -08:00
Shengyu Liu c3c2622204 builder/tencentcloud: Correct the image name length validation, the max length of image name is 60 (#8536) 2020-01-08 12:05:37 +01:00
Megan Marsh 073eda76aa remove extraneous files from when vsphere builder was a plugin, and move README into packer website as separated docs for vsphere-clone and vsphere-iso. Move option descriptions into struct code, and generate documentation directly from those structs as we do inside of the other builders 2020-01-07 16:59:31 -08:00
Megan Marsh 21edd085c7
Merge pull request #8560 from alexyueer/feature/support_aliyun_profile_20200103
support aliyun profile
2020-01-07 12:45:54 -08:00
Megan Marsh af2c4346f8
Merge pull request #8561 from ata18/ata18-end-of-life
Set expiry for image versions in SIG
2020-01-07 09:53:14 -08:00
hairesis bb71db6b39 docs/provisioners/ansible: Add playbook to basic example. (#8508) 2020-01-07 11:07:05 +01:00
Aishwarya Thangappa 9569d35d14 Set expiry for image versions in SIG
Updates azure builder to support setting end-of-life-date for
image versions in shared image gallery. In addition, this change adds
the ability to set the global replica count for the image version
and allows the vms deployed from the latest version of the Image
Definition to exclude this Image Version.
2020-01-06 22:58:26 -08:00
Tommy McNeely e101676e29 Doc update for markAsTemplate 2020-01-06 15:55:01 -07:00
Megan Marsh b7ee807cf1
Merge pull request #8571 from hashicorp/fix_8565
fix ssh interface docs for amazon builders
2020-01-06 14:34:40 -08:00
Megan Marsh 6655f93b59 fix typo and regenerate code 2020-01-06 14:12:29 -08:00
Megan Marsh 76251e5fd2 fix ssh interface docs for amazon builders 2020-01-06 12:01:30 -08:00
alexyueer ec4a7b6af0 support aliyun profile 2020-01-03 12:17:34 +08:00
Trevor Pounds 47e48ebc24 Add source AMI owner ID/name to build template. 2019-12-30 14:04:49 -05:00
Megan Marsh 0649c3f7dc update plugin configspec docs 2019-12-20 13:00:29 -08:00
Megan Marsh 61023f31fd update to v1.5.1 2019-12-20 10:07:24 -08:00
Adrien Delorme 1b532fc816 link to guides in HCL docs (#8526) 2019-12-20 11:23:48 +01:00
dependabot[bot] da8e215536 Bump rack from 1.6.11 to 1.6.12 in /website (#8524)
Bumps [rack](https://github.com/rack/rack) from 1.6.11 to 1.6.12.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/1.6.11...1.6.12)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-20 10:50:47 +01:00
Megan Marsh 4059ed75f5 update docs to mention ssh auth sock env var (#8523)
Closes #8358

Add some docs to alleviate confusion.
2019-12-20 08:27:14 +01:00
zhuzhih2017 66445ecd2d
Merge pull request #8425 from haoshuwei/master
add show expired arg when describe image
2019-12-20 13:33:55 +08:00
haoshuwei 37dc411f30 add skip_image_validation arg to use an expired image as the soure image
Signed-off-by: haoshuwei <haoshuwei24@gmail.com>
2019-12-20 11:28:31 +08:00
Megan Marsh bbc5bc0658
Merge pull request #8501 from hashicorp/hcl_docs
Better docs for HCL
2019-12-19 09:55:52 -08:00
Ferenc Fabian 04b269461c
Update website/source/partials/builders/_community_builders.html.md
Co-Authored-By: Adrien Delorme <azr@users.noreply.github.com>
2019-12-19 16:24:48 +01:00
Adrien Delorme 46ce0529dd docs ++ 2019-12-19 16:23:30 +01:00
Adrien Delorme fbd3796377 Update index.html.md.erb 2019-12-19 15:40:08 +01:00
Adrien Delorme 31cad234f2 Update index.html.md.erb 2019-12-19 15:34:26 +01:00
Adrien Delorme 1d066082a5 Update index.html.md.erb 2019-12-19 15:28:29 +01:00
Adrien Delorme 4c3fa0ef26 document split files & main building blocks in guide 2019-12-19 14:58:44 +01:00
PumpkinSeed 6a185b7c64 Add Huawei Cloud ECS 2019-12-19 10:16:51 +01:00
Megan Marsh a6c56aa4e2 fix build func docs 2019-12-18 16:53:17 -08:00
Megan Marsh 2d335a16f7 cut packer release v1.5.0 2019-12-18 10:08:52 -08:00
Adrien Delorme 7fe51022ca add expression 2019-12-18 18:16:10 +01:00
Adrien Delorme 0436457fd7 fix sidebar current 2019-12-18 17:14:02 +01:00
Adrien Delorme 8cdf8ca442 add syntax-json for HCL 2019-12-18 17:10:59 +01:00
Adrien Delorme bb72a0c0ce document hcl language & syntax 2019-12-18 16:57:36 +01:00
Adrien Delorme 26ceea0c36 update custon provider docs 2019-12-18 16:13:52 +01:00
Adrien Delorme 04a8758811
Update website/source/guides/hcl/from-json-v1/index.html.md.erb
Co-Authored-By: Wilken Rivera <dev@wilkenrivera.com>
2019-12-18 15:59:53 +01:00
Adrien Delorme 978af9188f
Update website/source/guides/hcl/component-object-spec/index.html.md.erb
Co-Authored-By: Wilken Rivera <dev@wilkenrivera.com>
2019-12-18 15:59:33 +01:00
Adrien Delorme da12c73726
Update website/source/guides/hcl/component-object-spec/index.html.md.erb
Co-Authored-By: Wilken Rivera <dev@wilkenrivera.com>
2019-12-18 15:59:26 +01:00
Adrien Delorme 971eac1701
Update website/source/guides/hcl/component-object-spec/index.html.md.erb
Co-Authored-By: Wilken Rivera <dev@wilkenrivera.com>
2019-12-18 15:59:16 +01:00
Adrien Delorme 9219a606a3 move "Installing Packer" a little lower in the nav bar 2019-12-18 15:57:28 +01:00
Adrien Delorme f3629dbaf7 Update index.html.md.erb
fix sidebar_current
2019-12-18 15:57:01 +01:00
Adrien Delorme 8dc587967e Update guides.erb 2019-12-18 15:51:38 +01:00
Adrien Delorme 93b9f3cb80 rename 2019-12-18 15:51:32 +01:00
Adrien Delorme da90c22c35 Update index.html.md.erb
better title
2019-12-18 15:51:13 +01:00
Adrien Delorme 1ada06b2d7 fix sidebar_current of guide/hcl/from-json-v1 2019-12-18 15:22:48 +01:00
Adrien Delorme 8c21916606 add guide on how to make ones component HCL2 enabled 2019-12-18 15:01:48 +01:00
Wilken Rivera ba36201f89 docs/guides/hcl: Update sample configuration (#8499) 2019-12-18 10:17:47 +01:00
Adrien Delorme 4b7132c87c Merge remote-tracking branch 'origin/master' into sharing_info 2019-12-17 11:57:09 +01:00
Adrien Delorme 65cc5fe823
fix missing typo correction (#8494)
I left this change on my local branch
2019-12-17 11:31:57 +01:00
Adrien Delorme 0785c2f6fc
build using HCL2 (#8423)
This follows #8232 which added the code to generate the code required to parse
HCL files for each packer component.

All old config files of packer will keep on working the same. Packer takes one
argument. When a directory is passed, all files in the folder with a name
ending with  “.pkr.hcl” or “.pkr.json” will be parsed using the HCL2 format.
When a file ending with “.pkr.hcl” or “.pkr.json” is passed it will be parsed
using the HCL2 format. For every other case; the old packer style will be used.

## 1. the hcl2template pkg can create a packer.Build from a set of HCL (v2) files

I had to make the packer.coreBuild (which is our one and only packer.Build ) a public struct with public fields

## 2. Components interfaces get a new ConfigSpec Method to read a file from an HCL file.

  This is a breaking change for packer plugins.

a packer component can be a: builder/provisioner/post-processor

each component interface now gets a `ConfigSpec() hcldec.ObjectSpec`
which allows packer to tell what is the layout of the hcl2 config meant
to configure that specific component.

This ObjectSpec is sent through the wire (RPC) and a cty.Value is now
sent through the already existing configuration entrypoints:

 Provisioner.Prepare(raws ...interface{}) error
 Builder.Prepare(raws ...interface{}) ([]string, error)
 PostProcessor.Configure(raws ...interface{}) error

close #1768


Example hcl files:

```hcl
// file amazon-ebs-kms-key/run.pkr.hcl
build {
    sources = [
        "source.amazon-ebs.first",
    ]

    provisioner "shell" {
        inline = [
            "sleep 5"
        ]
    }

    post-processor "shell-local" {
        inline = [
            "sleep 5"
        ]
    }
}

// amazon-ebs-kms-key/source.pkr.hcl

source "amazon-ebs" "first" {

    ami_name = "hcl2-test"
    region = "us-east-1"
    instance_type = "t2.micro"

    kms_key_id = "c729958f-c6ba-44cd-ab39-35ab68ce0a6c"
    encrypt_boot = true
    source_ami_filter {
        filters {
          virtualization-type = "hvm"
          name =  "amzn-ami-hvm-????.??.?.????????-x86_64-gp2"
          root-device-type = "ebs"
        }
        most_recent = true
        owners = ["amazon"]
    }
    launch_block_device_mappings {
        device_name = "/dev/xvda"
        volume_size = 20
        volume_type = "gp2"
        delete_on_termination = "true"
    }
    launch_block_device_mappings {
        device_name = "/dev/xvdf"
        volume_size = 500
        volume_type = "gp2"
        delete_on_termination = true
        encrypted = true
    }

    ami_regions = ["eu-central-1"]
    run_tags {
        Name = "packer-solr-something"
        stack-name = "DevOps Tools"
    }
    
    communicator = "ssh"
    ssh_pty = true
    ssh_username = "ec2-user"
    associate_public_ip_address = true
}
```
2019-12-17 11:25:56 +01:00
Megan Marsh 6bc5a95c3a tweak docs; change to 2019-12-16 21:35:42 -08:00
Sylvia Moss c57f093efe
Remove unnecessary source_path validation for virtualbox-ovf (#8489) 2019-12-16 16:50:21 +01:00
Megan Marsh 1679d9fb9d docs 2019-12-14 03:53:22 -08:00
Kris Hicks 40357e2534 docs/builder/azure-arm: Remove errant html comment (#8484)
* Remove errant html comment from source

* make generate
2019-12-13 10:35:24 -05:00
Megan Marsh fbd1958ca5
Merge pull request #8462 from mkaczanowski/master
update documentation for arm images builder
2019-12-12 09:21:54 -08:00
Megan Marsh 0ca7c9f397 fix tests 2019-12-11 16:29:35 -08:00
Mateusz Kaczanowski f1765dfd79
Update _community_builders.html.md 2019-12-11 15:25:23 +01:00
Megan Marsh 822aa02500
Merge pull request #8468 from pfuender/master
Add version selection for chef-client provisioner
2019-12-10 12:29:32 -08:00
Mateusz Kaczanowski a645b1d48e
Update _community_builders.html.md 2019-12-10 20:41:00 +01:00
Megan Marsh 2b4a6f0479
Merge pull request #8442 from borgstrom/patch-1
iam:GetInstanceProfile is now required
2019-12-10 10:56:39 -08:00
Oded Priva 5e81c6f44e added the option to skip IAM instance profile validation (#8457) 2019-12-10 09:17:38 +01:00
pfuender ffb9272fb2 adding version-override for chef-client provisioner 2019-12-09 20:58:04 +01:00
Kaczanowski Mateusz 9d3c718c2e update documentation for arm images builder 2019-12-07 10:44:32 +01:00
Sylvia Moss 096cab9b48 Fix floppy doc markdown typo (#8458) 2019-12-06 14:12:11 +01:00
Sylvia Moss 5ff5623433
Add disable_shutdown option to VirtualBox builder (#8449) 2019-12-05 14:34:56 +01:00
Megan Marsh 05b972e550
Merge pull request #8444 from ad-m/hyperone-builder
Fix tags & modernize config for HyperOne builder
2019-12-03 10:30:26 -08:00
Megan Marsh 9fc37f9456
Merge pull request #8438 from hashicorp/fix_qemu_sizes
make sure we continue to default to Megabytes for qemu disk size to p…
2019-12-03 09:58:21 -08:00
Adam Dobrawy 3b091e6046 builder/hyperone: fix & add tests for tags 2019-12-03 14:57:40 +01:00
Megan Marsh fcda07ee6a clarify docs by removing unclear string (#8439)
the docs generator from code PR #7724  mis scrapped it
2019-12-03 10:07:46 +01:00
Borgstrom ♕ 5be5cc146b
iam:GetInstanceProfile is now required 2019-12-03 10:06:01 +08:00
Megan Marsh 5fb2899c3f
Merge pull request #8434 from tacoman/patch-2
Update sidebar + remove cruft for WinRM page
2019-12-02 16:23:24 -08:00
Megan Marsh f5806afda8 update docs 2019-12-02 16:04:29 -08:00
tacoman cf6058b8fb Fixed the formatting for one of the examples. (#8433) 2019-12-02 10:32:57 +01:00
Indy Griffiths 82a1242b58 Fix bad header indentation (#8435)
Caused header to show up on https://www.packer.io/docs/provisioners/puppet-server.html as a code block
2019-12-02 10:29:54 +01:00
tacoman 13c315d03e
Update sidebar + remove cruft for WinRM page 2019-11-30 23:14:41 -05:00
Megan Marsh 29d6c05ef8
Merge pull request #8401 from hashicorp/do_8838
use shell struct in shell-local provisioner and post-processor.
2019-11-25 11:49:08 -08:00
Mike Dziedziela 7c3e032fb7 amazon docs: update block-device-configuration docs (#8395)
So that it works for all builders as some use it with the following field names: launch_block_device_mappings, ami_block_device_mappings or ebs_volumes. the refactored docs weird being to specific.
2019-11-25 11:58:30 +01:00
Megan Marsh e92783f303 add docs about efi mode (#8400)
Document what needs to happen if you're launching an efi vm.

Closes #7081
2019-11-22 11:17:08 +01:00
Megan Marsh 7d4353864f use shell struct in shell-local provisioner and post-processor. 2019-11-21 16:47:29 -08:00
Megan Marsh 59e6e1d4d5
Merge pull request #8393 from hashicorp/fix_8362
Add no_ephemeral template option to nuke ephemeral drives from launch mappings
2019-11-21 16:08:50 -08:00
Megan Marsh 6c1cb2a099 add unique kms case to permissions docs 2019-11-21 13:24:44 -08:00
Megan Marsh 67c3373107 enable no_ephemeral for spot devices, clean up ranging behavior, update docs 2019-11-21 12:46:31 -08:00
Megan Marsh 08e97ba4d8 generate code for no_ephemeral option 2019-11-20 13:49:04 -08:00
Megan Marsh 161be0adcd update docs with note about ssh/winrm 2019-11-08 11:09:16 -08:00
Megan Marsh 6e2456d028 make error messaging around ResourceNotReady better, update docs with other possible issues (#8349) 2019-11-08 11:15:24 +01:00
Megan Marsh 98c94ab8cb
Merge pull request #7676 from ltrager/master
Add display template option for qemu.
2019-11-07 15:41:17 -08:00
Megan Marsh 4a3f5318e2
Merge pull request #8347 from rjspiker/rj.font-smooth
website - add -moz-osx-font-smoothing for smooth firefox osx fonts
2019-11-07 14:14:48 -08:00
RJ Spiker b7561e3915 website - add -moz-osx-font-smoothing for smooth firefox osx fonts 2019-11-07 13:01:05 -07:00
nywilken 821d6d4f54 getting-started/build-image: Remove reference to Redis install
The deleted paragraph seems like a carry over from a previous version of the document as Redis is no longer mentioned as part of the base image template.
2019-11-07 11:48:54 -05:00
Megan Marsh d5ba530b26 make it clear we expect pem format not some other formate (#8344) 2019-11-07 10:30:51 +01:00
Megan Marsh a13b61a07d
Merge pull request #8339 from hashicorp/fix_8323
add kms policies to amazon docs
2019-11-06 14:52:03 -08:00
nywilken 3522e13b1e provisioner/shell: Add `env_var_format` support to shell provisioner
* Move setting of default EnvVarFormat to the Prepare function
* Add generated hcl2 structure for the updated Shell provisioner config
* Move `EnvVarFormat` field to shared common shell type
* Add description for the `env_var_format` parameter
* Update `env_var_format` when used with `use_env_var_file`
2019-11-06 16:28:56 -05:00
Megan Marsh 0cfa471d24
Update website/source/docs/builders/amazon.html.md
Co-Authored-By: Wilken Rivera <dev@wilkenrivera.com>
2019-11-06 12:11:48 -08:00
Megan Marsh b98f6e0db8 add kms policies to amazon docs 2019-11-06 10:37:01 -08:00
Bryan Stenson fdae3f14f7 more typos 2019-11-06 01:15:19 -08:00
Bryan Stenson 8aec4a6665
typo 2019-11-05 10:19:32 -08:00
Adrien Delorme 7108f6d07e
Merge pull request #8295 from rjspiker/rj.fonts
website - font and brand updates
2019-11-05 15:40:03 +01:00
Adrien Delorme 44a7c49334
Merge pull request #8320 from hashicorp/do_8228
re-add backwards incompatible changes to 1.5.0
2019-11-05 14:40:48 +01:00
Adrien Delorme fe2aac6952
Merge pull request #8324 from shawnmssu/fix_docs
fix ucloud-import docs index
2019-11-05 14:20:05 +01:00
mingsheng.su ba90606581 fix docs index 2019-11-05 19:07:09 +08:00
Megan Marsh d010762dbf Revert "Revert "Qemu builder disk size as a string""
This reverts commit 9c782f4d04.
2019-11-04 14:28:48 -08:00
Megan Marsh 517834d528 Revert "Revert "remove clean_ami_name and clean_image_name; complete the deprecation for these functions in favor of clean_resource_name""
This reverts commit 44f91c9afc.
2019-11-04 14:28:40 -08:00
Megan Marsh 4d4e2c39f8 add some docs explaining ansible + docker 2019-11-04 14:19:41 -08:00
RJ Spiker 8ab89b5ed7 feedback updates and some style cleanup 2019-11-04 13:11:13 -07:00
Adrien Delorme bc0325c33f
Merge pull request #8313 from hashicorp/release-1.4.5
Packer 1.4.5 release
2019-11-04 17:59:02 +01:00
Adrien Delorme 14243ce56a
Merge pull request #8305 from hashicorp/fix_8301
allow nvme, since virtualbox 6.0 allows it
2019-11-04 17:58:18 +01:00
Kévin Rauscher a39fef5178
Fix incorrect variable name galaxy_command 2019-11-04 14:42:39 +00:00
Adrien Delorme a23801d4a9 builder.virtualbox.iso: document that EFI mode needs to be enabled for pcie/nvme to work too 2019-11-04 14:30:59 +01:00
Adrien Delorme b467027972 Update config.rb
for 1.4.5
2019-11-04 11:50:52 +01:00
Megan Marsh 974eba443a update docs to include warning about extension pack 2019-11-01 09:48:35 -07:00
Megan Marsh 65ad3105b3 udpdate generated code 2019-10-31 15:28:36 -07:00
Adrien Delorme 819329228a Change back to make sure all durations are a time.Duration
It is simply the best/simplest solution and trying to prevent users from passing and integer here would be like opening a can of worms. Because:

* we cannot make mapstructure validate our duration string ( with an UnmarshalJSON func etc.)
* we cannot make mapstructure spit a string instead of a duration and packer will decode-encode-decode config.
* the hcl2 generated code asks for a string, so this will be enforced by default.
2019-10-31 16:12:07 +01:00
Adrien Delorme bf3d9841c6 Force durations to be passed a strings
Before this commit it was possible to set a duration using an integer or a float. Go's time.Duration is an int64 internally an mapstructure will take advantage of this and load the number as a int64 but `1` means one ns which is unexpected/confusing. To avoid confusion and enforce readability this forces users to pass a string with a unit for a duration; ex "56s".
2019-10-31 11:47:19 +01:00
Adrien Delorme ada9821897
Merge pull request #8294 from hashicorp/do_7974
add insert_key option for toggling whether to add Vagrant's insecure key
2019-10-31 10:27:27 +01:00
RJ Spiker 4e873649ed website - font and brand updates 2019-10-30 16:04:27 -06:00
Megan Marsh 8f996cd4de update docs 2019-10-30 13:36:56 -07:00
Megan Marsh 3b3aa562ed add insert_key option for toggling whether to add Vagrant's insecure key 2019-10-30 13:27:34 -07:00
mingsheng.su 4f140d0071 fix docs of ucloud-uhost 2019-10-30 15:05:54 +08:00
mingsheng.su 545575b879 optimize code about ufile config 2019-10-29 16:11:44 -07:00
mingsheng.su 934698c7d1 Update website/source/docs/post-processors/ucloud-import.html.md
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-10-29 16:11:44 -07:00
mingsheng.su 94fbdd52bc Update website/source/docs/post-processors/ucloud-import.html.md
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-10-29 16:11:44 -07:00
mingsheng.su 313723e03b Update website/source/docs/post-processors/ucloud-import.html.md
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-10-29 16:11:44 -07:00
mingsheng.su 6b29e3a892 Update website/source/docs/post-processors/ucloud-import.html.md
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-10-29 16:11:44 -07:00
mingsheng.su ece6702afb Update website/source/docs/post-processors/ucloud-import.html.md
Co-Authored-By: Megan Marsh <megan@hashicorp.com>
2019-10-29 16:11:44 -07:00
mingsheng.su fb9c624281 update docs 2019-10-29 16:11:43 -07:00
mingsheng.su 1099777978 update bucket about no create 2019-10-29 16:11:43 -07:00
mingsheng.su 083d7896f4 update message of ucloud import 2019-10-29 16:11:43 -07:00
mingsheng.su 2c513fce64 update ucloud packer 2019-10-29 16:11:43 -07:00
mingsheng.su 61f9d3a9fe add ucloud import 2019-10-29 16:11:43 -07:00
Andrey Kaipov 5da5b00e1c [builder/openstack] adds option to discover provisioning network 2019-10-29 13:02:27 -04:00
Michael Bochkaryov da7e72246c Add instance_display_name parameter for Cloudstack builder
This change introduce instance_display_name optional parameter
for Cloudstack builder to set custom VM display name.
By default it is set to "Created by Packer".
2019-10-26 21:13:45 -07:00
Megan Marsh eccdb44e3b
Merge pull request #8246 from hashicorp/fix_8089
Add the additional_disk_size option tho the hyperv vmcx builder.
2019-10-24 11:50:58 -07:00
Megan Marsh 7928b5b045 fix transcription error from when we moved to generated docs 2019-10-24 10:19:03 -07:00
Megan Marsh 8ac97de8b2 remove vnc config options from virtualbox docs; virtualbox does not implement the vncconfig struct 2019-10-22 12:11:27 -07:00
Megan Marsh d15f43e4eb
Merge pull request #8232 from hashicorp/artifact-tree
HCL2 configs - part one
2019-10-22 11:54:34 -07:00
Megan Marsh abcbce0c4f
Merge pull request #8253 from hashicorp/plugin_docs
update website to hopefully make community builders and provisioners …
2019-10-22 11:52:15 -07:00
Megan Marsh ca095ecb28
Merge pull request #8257 from hashicorp/vagrant_pp_docs
update vagrant docs to explain that the builder and postprocessor are…
2019-10-22 11:51:45 -07:00
Megan Marsh 5301f4613d update vagrant docs to explain that the builder and postprocessor are mutually exclusive 2019-10-22 09:54:33 -07:00
Megan Marsh cdc3fdf926
Merge pull request #8247 from b-b3rn4rd/master
New Feature: allow to specify  IAM policy for a temporary instance profile
2019-10-22 09:33:23 -07:00
Bernard Baltrusaitis ec1d70dc44 adding required changes 2019-10-22 21:40:18 +11:00
Megan Marsh de360df259 update website to hopefully make community builders and provisioners easier to find 2019-10-21 16:04:34 -07:00
Megan Marsh 0c2fba089d
Merge pull request #8250 from tencentyun/master
tencentcloud-cvm builder: we added retry on remote api call to improve the user experience
2019-10-21 14:45:37 -07:00
Megan Marsh 7b428f8c68 switch hyperv vmcx docs to use generated partials 2019-10-21 14:31:39 -07:00
Megan Marsh 34f5bfa498 regenerated things 2019-10-21 14:21:15 -07:00
Megan Marsh 9eee63a659 regenerate docs based on new struct format 2019-10-21 14:11:45 -07:00
Megan Marsh 836aaafaa3
Merge pull request #8203 from sumit-kalra/master
Azure-ARM builder: Deploy NSG if list of IP addresses is provided in config
2019-10-21 11:10:58 -07:00
Li Kexian 6fb8988d08
we added retry on remote api call to improve the user experience 2019-10-21 13:21:56 +08:00
Bernard Baltrusaitis 6e2146324f Merge branch 'master' of github.com:b-b3rn4rd/packer 2019-10-19 20:56:49 +11:00
Bernard Baltrusaitis 8b83cca064 adding temporary instance profile document policy 2019-10-19 20:56:18 +11:00
Megan Marsh a3ec70c03d
Merge pull request #8240 from HofmeisterAn/feature/8225-extend-documentation-docker-shell-exec-form
#8225 Add Docker shell and exec format documentation for CMD and ENTRYPOINT
2019-10-16 11:42:49 -07:00
Andre Hofmeister a66de11c31 #8225 Add Docker shell and exec format documentation for CMD and ENTRYPOINT 2019-10-16 19:09:11 +02:00
Megan Marsh 4b9ceb402a update docs to link to master branch template instead of a static, old, link. 2019-10-16 09:54:29 -07:00
Adrien Delorme c027e9b367
Merge pull request #8236 from keenan-v1/patch-1
Fix "Acces" typo in amazon-ebs.html.md.erb
2019-10-16 10:42:47 +02:00
Adrien Delorme cf1555bf17 Merge remote-tracking branch 'origin/master' into artifact-tree 2019-10-16 10:22:56 +02:00
Paul Meyer 575de8659e
Merge pull request #8226 from larohra/IncreasePollingDuration
[azure] Increase polling duration
2019-10-15 16:25:36 -07:00
Paul Meyer 015c194986 clarify docs 2019-10-15 22:29:09 +00:00
Paul Meyer ade95350d6 Use sudo in docs 2019-10-15 21:14:20 +00:00
Paul Meyer fe584f4448 Format updates 2019-10-15 21:14:20 +00:00
Paul Meyer 19a3502b36 Add 'vm' template function 2019-10-15 21:14:20 +00:00
Paul Meyer f72c4ec7a3 Update example and docs 2019-10-15 21:14:20 +00:00
Paul Meyer 97e48153bc fixup! Default for Gen 1 VMs 2019-10-15 21:14:20 +00:00
Paul Meyer 37931c551f add example 2019-10-15 21:14:20 +00:00
Paul Meyer cf8688ec40 doc updates after Dan's review 2019-10-15 21:14:20 +00:00
Paul Meyer 8c73450f3d fixup! Add documentation to config struct 2019-10-15 21:14:20 +00:00
Paul Meyer e05d6a223e fixup! Documentation update 2019-10-15 21:14:20 +00:00
Paul Meyer 066ae0aa07 Documentation update 2019-10-15 21:14:20 +00:00
Paul Meyer cb729e5a38 Add documentation to config struct 2019-10-15 21:13:37 +00:00
Jonathan Walker (Keenan) 6c486c4ab8
Fix "Acces" typo in amazon-ebs.html.md.erb
Found and fixed a typo in the Amazon EBS documentation for "Access"
2019-10-15 15:42:43 -04:00
Adrien Delorme 71f80e2ad2 Update amazon-chroot.html.md.erb
unlink removed type
2019-10-15 15:17:05 +02:00
Adrien Delorme 078ba7c8c3 commit old code generation tool
for history
2019-10-15 12:56:42 +02:00
Joakim Westin 8628c75de1
Changed from jq to JMESPath queries
Changed the examples to use AZ CLI built-in JMESPath query instead of needing `jq` tool installed (functionally they are the same)
2019-10-15 10:34:48 +02:00
Megan Marsh 9c782f4d04 Revert "Qemu builder disk size as a string"
This reverts commit 1ecfa032ba.
2019-10-14 13:09:22 -07:00
Megan Marsh 44f91c9afc Revert "remove clean_ami_name and clean_image_name; complete the deprecation for these functions in favor of clean_resource_name"
This reverts commit 0026792d2f.
2019-10-14 13:08:15 -07:00
larohra 9dc622af05 Fixed circleCi test 2019-10-14 19:31:44 +00:00
Megan Marsh a45c7cfc3d
Merge pull request #8223 from lsmith130/patch-1
Update user-variables.html.md
2019-10-14 10:54:36 -07:00
Megan Marsh 985c49502e
Merge pull request #8224 from tencentyun/master
change links to english version
2019-10-14 10:42:44 -07:00
Landon Smith 4ea3460617
Update user-variables.html.md
Looks like the vault variables description was copied from the environment variables section, and someone left a reference to a environment variables.
2019-10-13 16:32:47 -07:00
Megan Marsh 90573a97dd
Merge pull request #8208 from psinghal20/conventional-format-isotime
feat: add strftime function in templates
2019-10-11 12:50:40 -07:00
Etienne Deneuve f9aebe1c9c Change: Update doc, windows vm need ``/mode:vm`` to be syspreped correctly 2019-10-11 14:52:59 +02:00
psinghal20 6492995a20
feat: add strftime function in templates
This commit adds strfttime function in templates to provide conventional format for ISO time based on C standard.

Signed-off-by: psinghal20 <psinghal20@gmail.com>
2019-10-11 14:35:39 +05:30
Sumit Kalra 4bd09f381e
Fixing documentation (#6) 2019-10-10 11:30:28 -07:00
Li Kexian 7fd2006d35
change links to english version 2019-10-10 17:06:21 +08:00
Sumit Kalra 97f33647da
Adding auto-generated documentation (#5) 2019-10-08 16:02:39 -07:00
Lee Trager 63bc9e8a9a Run make generate 2019-10-08 12:04:54 -07:00
Adrien Delorme ef4db8b158
Merge branch 'master' into f-proxmox-cpu-type-support 2019-10-08 10:34:53 +02:00
Megan Marsh deda067355
Merge pull request #8199 from brickstool/f-proxmox-add-scsi-controller-support
[Proxmox] Add support for SCSI controller selection
2019-10-07 10:37:54 -07:00
Samuel Noordhuis 5add6cc6c8
Add ability to select CPU type 2019-10-06 21:39:53 +11:00
Samuel Noordhuis d3f369494a
Add support for SCSI controller selection 2019-10-06 20:14:04 +11:00
amree 7dbcefaf20 Update "Build an Image" Documentation
We defined a user variable for the region but we're not using it. This
PR will update the template to use that particular variable
2019-10-06 04:29:36 +08:00
Megan Marsh 0026792d2f remove clean_ami_name and clean_image_name; complete the deprecation for these functions in favor of clean_resource_name 2019-10-03 15:49:01 -07:00
Megan Marsh 928c6a3615
Merge pull request #8183 from hashicorp/communicator_docs
Communicator docs
2019-10-03 09:49:39 -07:00
Megan Marsh ccf58f0c98 major rework of communicator docs and addition of preseed guides 2019-10-03 09:18:03 -07:00
Ash Jindal 9d17a7f136
Fixed CPE in description of `file` builder
The description seems to be a CPE from the `null` builder.
2019-10-03 11:36:10 +01:00
Megan Marsh 19a9d7149f fix structs and regenerate partials 2019-10-01 13:36:55 -07:00
Kevin Faulkner 1ecfa032ba Qemu builder disk size as a string 2019-10-01 13:27:02 -07:00
Megan Marsh dfaded3f80
Merge pull request #8172 from neumayer/definedtags
Support defined tags for oci builder
2019-10-01 12:26:16 -07:00
Megan Marsh ce29b3c629 cut v1.4.4 2019-10-01 11:10:11 -07:00
Megan Marsh 5be06912a7 add docs for error provisioner 2019-10-01 11:08:15 -07:00
Calle Pettersson 8a443a7e21 Allow running the template VM in a Proxmox resource pool 2019-09-29 19:28:21 +02:00
Megan Marsh e31a28bb77 fix generated files for update I committed directly to master 2019-09-27 13:51:38 -07:00
Robert Neumayer 70b2d300e6 Support defined tags for oci builder 2019-09-27 15:10:04 +02:00
Paul Meyer 698c9c44d4
Merge pull request #8121 from paulmey/clientconfig
[azure] Refactor client config
2019-09-26 10:49:13 -07:00
Megan Marsh 72d393c95a update docs to show a use case for block device mappings 2019-09-25 16:48:04 -07:00
Paul Meyer feeae1514e Refactor client config 2019-09-25 20:33:38 +00:00
Megan Marsh e5e864c624
Merge pull request #8143 from hashicorp/google_vault_oauth
Google vault oauth
2019-09-25 10:12:29 -07:00
Gennady Lipenkov ad7feedb08 Remove 'yandex.html.md', 'yandex.html.md.erb' would be used
Signed-off-by: Gennady Lipenkov <xgen@yandex-team.ru>
2019-09-25 16:27:01 +03:00
Gennady Lipenkov d070b4868a Wrap values with backticks
Signed-off-by: Gennady Lipenkov <xgen@yandex-team.ru>
2019-09-25 16:04:45 +03:00