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

Flexible SQL instance names #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change log information for Veeam Cookbook

## Version 4.1.0
2020-09-02

- UPDATE: SQL instance names are now flexible trough an attribute.

## Version 4.0.3
2020-08-14

Expand Down
3 changes: 1 addition & 2 deletions attributes/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
default['veeam']['server']['vbr_service_port'] = nil
default['veeam']['server']['vbr_secure_connections_port'] = nil
# SQL Server Connection Details
default['veeam']['server']['vbr_sqlserver_server'] = nil
default['veeam']['server']['vbr_sqlserver_server'] = ".\\VeeamSQL2016"
default['veeam']['server']['vbr_sqlserver_database'] = nil
default['veeam']['server']['vbr_sqlserver_auth'] = nil
default['veeam']['server']['vbr_sqlserver_username'] = nil
default['veeam']['server']['vbr_sqlserver_password'] = nil

default['veeam']['server']['pf_ad_nfsdatastore'] = nil
default['veeam']['server']['keep_media'] = false

Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email '[email protected]'
license 'Apache-2.0'
description 'Installs/Configures Veeam Backup and Recovery'
version '4.0.3'
version '4.1.0'
chef_version '>= 13.0'

supports 'windows'
Expand Down
1 change: 1 addition & 0 deletions recipes/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
accept_eula node['veeam']['server']['accept_eula']
evaluation node['veeam']['server']['evaluation']
install_dir node['veeam']['server']['install_dir']
vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server']
vbr_service_user node['veeam']['server']['vbr_service_user']
vbr_service_password node['veeam']['server']['vbr_service_password']
vbr_service_port node['veeam']['server']['vbr_service_port']
Expand Down
1 change: 1 addition & 0 deletions recipes/server_with_catalog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
accept_eula node['veeam']['server']['accept_eula']
evaluation node['veeam']['server']['evaluation']
install_dir node['veeam']['server']['install_dir']
vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server']
vbr_service_user node['veeam']['server']['vbr_service_user']
vbr_service_password node['veeam']['server']['vbr_service_password']
vbr_service_port node['veeam']['server']['vbr_service_port']
Expand Down
1 change: 1 addition & 0 deletions recipes/server_with_console.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
accept_eula node['veeam']['server']['accept_eula']
evaluation node['veeam']['server']['evaluation']
install_dir node['veeam']['server']['install_dir']
vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server']
vbr_service_user node['veeam']['server']['vbr_service_user']
vbr_service_password node['veeam']['server']['vbr_service_password']
vbr_service_port node['veeam']['server']['vbr_service_port']
Expand Down
1 change: 1 addition & 0 deletions recipes/standalone_complete.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
accept_eula node['veeam']['server']['accept_eula']
evaluation node['veeam']['server']['evaluation']
install_dir node['veeam']['server']['install_dir']
vbr_sqlserver_server node['veeam']['server']['vbr_sqlserver_server']
vbr_service_user node['veeam']['server']['vbr_service_user']
vbr_service_password node['veeam']['server']['vbr_service_password']
vbr_service_port node['veeam']['server']['vbr_service_port']
Expand Down
1 change: 1 addition & 0 deletions resources/prerequisites.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ def install_sql_express(downloaded_file_name)
source ::File.join('sql_server', 'ConfigurationFile.ini.erb')
provider Chef::Provider::File::Template
variables(
sqlInstanceName: node['veeam']['server']['vbr_sqlserver_server'].split('\\')[-1],
sqlSysAdminList: sql_sys_admin_list
)
end
Expand Down
2 changes: 1 addition & 1 deletion templates/sql_server/ConfigurationFile.ini.erb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ SQMREPORTING="False"

; Specify a default or named instance. MSSQLSERVER is the default instance for non-Express editions and SQLExpress for Express editions. This parameter is required when installing the SQL Server Database Engine (SQL), Analysis Services (AS), or Reporting Services (RS).

INSTANCENAME="VeeamSQL2012"
INSTANCENAME="<%= @sqlInstanceName %>"

; Agent account name

Expand Down