Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(FM-6026) Release 1.1.5 #199

Merged
merged 3 commits into from Feb 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,19 @@
## 2017-02-15 - Supported Release 1.1.5

### Summary

- Small release with several bug fixes and a minor feature.

#### Features

- Obfuscate passwords in logs if sqlserver_instance raises an error ([MODULES-4255](https://tickets.puppet.com/browse/MODULES-4255)).

#### Bug Fixes

- Fix issues with installing .Net 3.5 in acceptance tests
- Fix various issues with test environment in AppVeyor, Travis CI and Jenkins
- Fix documentation for localization

## 2016-08-31 - Supported Release 1.1.4

### Summary
Expand Down
18 changes: 9 additions & 9 deletions README.md
Expand Up @@ -42,7 +42,7 @@ The sqlserver module requires the following:
To get started with the sqlserver module, include in your manifest:

```puppet
sqlserver_instance{'MSSQLSERVER':
sqlserver_instance{ 'MSSQLSERVER':
features => ['SQL'],
source => 'E:/',
sql_sysadmin_accounts => ['myuser'],
Expand All @@ -54,7 +54,7 @@ This example installs MS SQL and creates an MS SQL instance named MSSQLSERVER. I
A more advanced configuration, including installer switches:

```puppet
sqlserver_instance{'MSSQLSERVER':
sqlserver_instance{ 'MSSQLSERVER':
source => 'E:/',
features => ['SQL'],
security_mode => 'SQL',
Expand Down Expand Up @@ -106,7 +106,7 @@ sqlserver::database{ 'minviable':

```puppet
SQL Login
sqlserver::login{'vagrant':
sqlserver::login{ 'vagrant':
instance => 'MSSQLSERVER',
password => 'Pupp3t1@',
}
Expand All @@ -121,8 +121,8 @@ sqlserver::login{ 'WIN-D95P1A3V103\localAccount':
### Create a new login and a user for a given database

```puppet
sqlserver::login{'loggingUser':
password => 'Pupp3t1@',
sqlserver::login{ 'loggingUser':
password => 'Pupp3t1@',
}

sqlserver::user{ 'rp_logging-loggingUser':
Expand All @@ -136,10 +136,10 @@ sqlserver::user{ 'rp_logging-loggingUser':

```puppet
sqlserver::user::permissions{'INSERT-loggingUser-On-rp_logging':
user => 'loggingUser',
database => 'rp_logging',
user => 'loggingUser',
database => 'rp_logging',
permissions => 'INSERT',
require => Sqlserver::User['rp_logging-loggingUser'],
require => Sqlserver::User['rp_logging-loggingUser'],
}

sqlserver::user::permissions{ 'Deny the Update as we should only insert':
Expand Down Expand Up @@ -411,7 +411,7 @@ Stores credentials for Puppet to use when managing a given SQL Server instance.

##### `admin_login_type`

Specifies the type of login used to manage to SQL Server instace. The login type affects the `admin_user` and `admin_pass` parameters which are described below. Valid options: 'SQL_LOGIN' and 'WINDOWS_LOGIN'.
Specifies the type of login used to manage to SQL Server instance. The login type affects the `admin_user` and `admin_pass` parameters which are described below. Valid options: 'SQL_LOGIN' and 'WINDOWS_LOGIN'.

Default: 'SQL_LOGIN'.

Expand Down
2 changes: 1 addition & 1 deletion metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-sqlserver",
"version": "1.1.4",
"version": "1.1.5",
"author": "Puppet Inc",
"summary": "The `sqlserver` module installs and manages MS SQL Server 2012 and 2014 on Windows systems.",
"license": "proprietary",
Expand Down
1 change: 1 addition & 0 deletions spec/defines/role/permissions_spec.rb
@@ -1,4 +1,5 @@
require 'spec_helper'
require File.expand_path(File.join(File.join(File.dirname(__FILE__),'..'),'manifest_shared_examples.rb'))

RSpec.describe 'sqlserver::role::permissions' do
include_context 'manifests' do
Expand Down
1 change: 1 addition & 0 deletions spec/functions/sqlserver_is_domain_user_spec.rb
@@ -1,3 +1,4 @@
require 'spec_helper'
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib/puppet_x/sqlserver/server_helper'))

RSpec.describe 'sqlserver_is_domain_or_local_user?' do
Expand Down