Skip to content

Commit e548467

Browse files
committed
Merge pull request #26 from bstopp/enhance/puppetlabs-release
Updating all documentation and configs to prep for push to Puppetforge.
2 parents 41f97af + 0817006 commit e548467

File tree

4 files changed

+99
-48
lines changed

4 files changed

+99
-48
lines changed

.pmtignore

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
.vagrant/
2+
coverage/
3+
files/
4+
junit/
5+
log/
6+
pkg/
7+
.brackets.json
8+
.codeclimate.yml
9+
.fixtures.yml
10+
.gitignore
11+
.project
12+
.rubocop.yml
13+
.sync.yml
14+
.travis.yml
15+
cw.sh
16+
Gemfile.lock

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
##2015-07-28 - Release 1.0.0
2+
###Summary
3+
Fully functional AEM installation module management. Installs and allows changing of standard AEM run configuration options.
4+
5+
####Features:
6+
- README Updates.
7+
- Significant unit test implementations.
8+
- Support parameters: `context_root`, `debug_port`, `group`, `jvm_mem_opts`, `jvm_opts`, `port`, `runmodes`, `samplecontent`, `snooze`, `timeout`, `user`, `version`.
9+
- Numerous bug fixes.
10+
11+
##2015-07-29 - Release 0.1.0
12+
###Summary
13+
Initial release of functionality supporting definition and management of an AEM Installation.
14+
15+
####Features:
16+
- Specify `type` and `user`.

README.md

+29-28
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
#### Table of Contents
99

10-
1. [Overview](#overview)
11-
2. [Module Description - What the module does and why it is useful](#module-description)
12-
3. [Setup - The basics of getting started with aem](#setup)
13-
* [What aem affects](#what-aem-affects)
10+
1. [Overview - What is the AEM module?](#overview)
11+
2. [Module Description - What does the module do?](#module-description)
12+
3. [Setup - The basics of getting started with AEM module](#setup)
13+
* [What AEM affects](#what-aem-affects)
1414
* [Setup requirements](#setup-requirements)
15-
* [Beginning with aem](#beginning-with-aem)
16-
4. [Usage - Configuration options and additional functionality](#usage)
17-
5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
15+
* [Beginning with AEM](#beginning-with-aem)
16+
4. [Usage - How to use the module](#usage)
17+
5. [Reference - AEM Module type and providers](#reference)
1818
5. [Limitations - OS compatibility, etc.](#limitations)
19-
6. [Development - Guide for contributing to the module](#development)
19+
6. [Development - Contributing to the module](#development)
2020

2121
## Overview
2222

@@ -30,7 +30,7 @@ The AEM module introduces the `aem` resource which is used to manage and configu
3030

3131
### What AEM affects
3232

33-
* AEM Installations
33+
* AEM Installations may be modified by using this module. See [warnings](#warnings), for how existing instances are affected by enabling a this module.
3434

3535
### Setup Requirements
3636

@@ -127,48 +127,47 @@ This type enables you to manage AEM instances within Puppet.
127127
####Providers
128128
**Note:** Not all features are available with all providers.
129129

130-
* `linux`: Linux type provider
131-
* Supported features:
130+
* `linux`: Linux provider
132131

133132
**Autorequires:**
134133

135134
If Puppet is managing the home directory, user, or group parameters, the aem resource will autorequire those resources.
136135

137136
####Parameters
138137

139-
* `name`: name of the AEM resource.
138+
* `name`: (namevar) Required. Specifies the name of the AEM resource.
140139

141-
* `ensure`: Ensures that the resource is present. Valid values are `present`, `absent`.
140+
* `ensure`: Required. Ensures that the resource is present. Valid values are `present`, `absent`.
142141

143-
* `source`: Source jar file to use, provided by user.
142+
* `context_root`: Optional. Specifies the URL context root for the AEM application. [Sling documentation](https://sling.apache.org/documentation/the-sling-engine/the-sling-launchpad.html). Defaults to `/`.
144143

145-
* `version`: Optional. Version of AEM. If not specified, will be found via _quickstart_ jar name.
144+
* `debug_port`: Optional. Specifies the port on which to listen for remote debugging connections. Setting this will add the following JVM options: `-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=<<port>>` Valid options: any port number.
146145

147-
* `home`: Home directory in which AEM will be installed. Default to `/opt/aem` or `C:/opt/aem` depending on platform.
146+
* `group`: Optional. Sets the group for installation. Valid options: any valid group. Default: puppet executor group.
148147

149-
* `port`: Port on which AEM will listen. [AEM documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/custom-standalone-install.html#Changing the Port Number by Renaming the File)
148+
* `home`: Required. Sets the directory in which AEM will be installed. Valid options: Any absolute system path. Default: `/opt/aem` or `C:/opt/aem`.
150149

151-
* `user`: User for installation. Defaults to puppet user.
150+
* `jvm_mem_opts`: Optional. Specifies options for the JVM memory. This is separated from the JVM opts to simplify configurations. Valid options: any valid JVM parameter string. Default: `-Xmx1024m -XX:MaxPermSize=256M`.
152151

153-
* `group`: Group for installation. Defaults to puppet group.
152+
* `jvm_opts`: Optional. Specifies options to pass to the JVM. Valid options: any valid JVM parameter string. Default: None, but the following value is always passed, and cannot be overwritten: `-server -Djava.awt.headless=true`
154153

155-
* `type`: AEM installation type, one of `author` or `publish`. [AEM documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/configuring/configure-runmodes.html#Installation Run Modes)
154+
* `port`: Optional. Specifies the port on which AEM will listen. Valid options: any valid port. Default: 4502. [AEM documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/custom-standalone-install.html#Changing the Port Number by Renaming the File)
156155

157-
* `runmodes`: An array of runmodes to apply to the AEM instance [AEM documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/configuring/configure-runmodes.html). Do not use this to set options available via `type` configuration.
156+
* `runmodes`: Optional. Sets the array of runmodes to apply to the AEM instance. Do not use this to set options available via `type` configuration, or a `samplecontent` runmode. Valid options: any string array. [AEM documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/configuring/configure-runmodes.html).
158157

159-
* `jvm_mem_opts`: Specify options for the JVM memory. This is separated from the JVM opts to simplify configurations. Defaults to `-Xmx1024m -XX:MaxPermSize=256M`.
158+
* `samplecontent`: Optional. Sets whether or not to include the sample content (e.g. Geometrixx). Valid options: `true` or `false`. Default: `true`. [AEM Documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/configuring/configure-runmodes.html#Using samplecontent and nosamplecontent).
160159

161-
* `jvm_opts`: Options to pass to the JVM. There is no default for this property, but the following value is always passed: `-server -Djava.awt.headless=true`
160+
* `snooze`: Optional. Sets the wait period between checks for installation completion. When monitoring the system for up state, this is the wait period between checks. Value is specified in seconds. Valid options: any number. Default: `10`.
162161

163-
* `debug_port`: Port on which to listen for remote debugging connections. Setting this will add the following JVM options: `-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=<<port>>`
162+
* `source`: Required. Sets the source jar file to use, provided by user. Valid options: any absolute file.
164163

165-
* `context_root`: The URL context root for the AEM applicaton. [Sling documentation](https://sling.apache.org/documentation/the-sling-engine/the-sling-launchpad.html). Defaults to `/`.
164+
* `timeout`: Optional. Sets the timeout allowed for startup monitoring. If the installation doesn't finish by the timeout, an error will be generated. Value is specified in seconds. Valid option: any number. Default: `600`.
166165

167-
* `samplecontent`: Whether or not to include the sample content (Geometrixx). [AEM Documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/configuring/configure-runmodes.html#Using samplecontent and nosamplecontent). Defaults to `true`.
166+
* `type`: Optional. Specifies the AEM installation type. Valid options: `author` or `publish`. Default: `author`. [AEM documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/configuring/configure-runmodes.html#Installation Run Modes)
168167

169-
* `timeout`: Timeout allowed for startup monitoring. If the installation doesn't finish by the timeout, an error will be generated. Value is specified in seconds. Default value: `10 minutes`.
168+
* `user`: Optional. Sets the user for installation. Valid options: any valid group. Defaults: puppet executor user.
170169

171-
* `snooze`: Wait period between checks for installation completion. When monitoring the system for up state, this is the wait period between checks. Value is specified in seconds. Default value: `10 seconds`.
170+
* `version`: Optional. Sets the version of AEM. If not specified, will be found via _quickstart_ jar name. Valid options: any semantic version.
172171

173172
## Limitations
174173

@@ -189,6 +188,8 @@ This module has been tested with the following AEM versions:
189188

190189
### Warnings
191190

191+
It is up to the consumer to ensure that the correct version of Java is installed based on the AEM version. See [AEM Documentation](https://docs.adobe.com/docs/en/aem/6-1/deploy/technical-requirements.html) for compatibility.
192+
192193
Defining an AEM resource as absent will remove the instance from the system, regardless of whether or not it was originally managed by puppet.
193194

194195
## Development

metadata.json

+38-20
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
11
{
2-
"name": "bstopp-aem",
3-
"version": "0.1.0",
4-
"author": "bstopp",
5-
"summary": "Install and configure Adobe Experience Manager instances.",
6-
"license": "Apache-2.0",
7-
"source": "git://github.com/bstopp/puppet-aem-module.git",
8-
"project_page": "https://github.com/bstopp/puppet-aem-module",
9-
"issues_url": "https://github.com/bstopp/puppet-aem-module/issues",
10-
"requirements": [
11-
{
12-
"name": "puppet",
13-
"version_requirement": ">= 4.x"
14-
}
15-
],
16-
"dependencies": [
17-
{
18-
"name": "puppetlabs-stdlib",
19-
"version_requirement": ">= 4.6.0"
20-
}
21-
]
2+
"name": "bstopp-aem",
3+
"version": "1.0.0",
4+
"author": "Bryan Stopp ([email protected])",
5+
"license": "Apache-2.0",
6+
"summary": "Install and configure Adobe Experience Manager instances.",
7+
"source": "https://github.com/bstopp/puppet-aem",
8+
"project_page": "https://github.com/bstopp/puppet-aem",
9+
"issues_url": "https://github.com/bstopp/puppet-aem/issues",
10+
"dependencies": [{
11+
"name": "puppetlabs/stdlib",
12+
"version_requirement": "4.x"
13+
}
14+
],
15+
"requirements": [{
16+
"name": "puppet",
17+
"version_requirement": ">= 3.8.1"
18+
}
19+
],
20+
"operatingsystem_support": [{
21+
"operatingsystem": "CentOS",
22+
"operatingsystemrelease": [ "6.8",
23+
"7"
24+
]
25+
},{
26+
"operatingsystem": "Ubuntu",
27+
"operatingsystemrelease": [ "10.04",
28+
"12.04"
29+
]
30+
},{
31+
"operatingsystem": "Debian",
32+
"operatingsystemrelease": [ "6.0",
33+
"7.8"
34+
]
35+
}
36+
],
37+
"tags": [ "aem",
38+
"cq"
39+
]
2240
}

0 commit comments

Comments
 (0)