Remove 2016

Daniel DeGroff · Daniel DeGroff · commit 477b4850c7cf · 2018-10-16T22:57:42.000-06:00
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/chef-repo/cookbooks/2016-security-guide/recipes/default.rb b/chef-repo/cookbooks/2016-security-guide/recipes/default.rb
diff --git a/chef-repo/cookbooks/security-guide/.kitchen.yml b/chef-repo/cookbooks/security-guide/.kitchen.yml
@@ -14,5 +14,5 @@ platforms:
 suites:
   - name: default
     run_list:
-      - recipe[2016_security_guide::default]
+      - recipe[security_guide::default]
     attributes:
diff --git a/chef-repo/cookbooks/security-guide/Berksfile b/chef-repo/cookbooks/security-guide/Berksfile
diff --git a/chef-repo/cookbooks/security-guide/README.md b/chef-repo/cookbooks/security-guide/README.md
@@ -1,8 +1,8 @@
-# 2016_security_guide
+# security_guide
 
-This is the Chef Cookbook that models all of the server setup based on Inversoft's for the 2016 Security Guide located here:
+This is the Chef Cookbook that models all of the server setup based on FusionAuth's Guide to User Data Security found here:
 
-https://www.inversoft.com/guides/2016-guide-to-user-data-security
+https://fusionauth.io/resources/guide-to-user-data-security
 
 To use this Chef Cookbook, all you need to do is configure these required attributes:
 
diff --git a/chef-repo/cookbooks/security-guide/attributes/default.rb b/chef-repo/cookbooks/security-guide/attributes/default.rb
diff --git a/chef-repo/cookbooks/security-guide/chefignore b/chef-repo/cookbooks/security-guide/chefignore
diff --git a/chef-repo/cookbooks/security-guide/files/default/ssh-logins b/chef-repo/cookbooks/security-guide/files/default/ssh-logins
diff --git a/chef-repo/cookbooks/security-guide/files/default/sshd b/chef-repo/cookbooks/security-guide/files/default/sshd
@@ -4,7 +4,7 @@
 @include common-auth
 
 #
-# 2016-SECURITY-GUIDE ADDITION: Google Authenticator module
+# SECURITY-GUIDE ADDITION: Google Authenticator module
 #
 auth [success=done new_authtok_reqd=done default=die] pam_google_authenticator.so nullok
 
diff --git a/chef-repo/cookbooks/security-guide/metadata.rb b/chef-repo/cookbooks/security-guide/metadata.rb
@@ -1,9 +1,9 @@
-name '2016_security_guide'
+name 'security_guide'
 maintainer 'Inversoft'
 maintainer_email 'brian@inversoft.com'
 license 'all_rights'
-description 'Installs/Configures 2016_security_guide'
-long_description 'Installs/Configures 2016_security_guide'
+description 'Installs/Configures security_guide'
+long_description 'Installs/Configures security_guide'
 version '0.1.0'
 attribute 'security_guide/users',
           :display_name => 'Users',
diff --git a/chef-repo/cookbooks/security-guide/recipes/default.rb b/chef-repo/cookbooks/security-guide/recipes/default.rb
@@ -0,0 +1,14 @@
+#
+# Cookbook Name:: security_guide
+# Recipe:: default
+#
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
+
+include_recipe 'security_guide::users'
+include_recipe 'security_guide::strong-passwords'
+include_recipe 'security_guide::iptables'
+include_recipe 'security_guide::sshd'
+if node['security_guide']['two_factor_enabled']
+  include_recipe 'security_guide::two-factor'
+end
+include_recipe 'security_guide::monit'
diff --git a/chef-repo/cookbooks/security-guide/recipes/iptables.rb b/chef-repo/cookbooks/security-guide/recipes/iptables.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Recipe:: default
 #
-# Copyright (c) 2016 Inversoft, All Rights Reserved.
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
 
 # Configure the Debian answers for the iptables-persistent package
 ruby_block 'debconf-iptables-persistent' do 
diff --git a/chef-repo/cookbooks/security-guide/recipes/monit.rb b/chef-repo/cookbooks/security-guide/recipes/monit.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Recipe:: default
 #
-# Copyright (c) 2016 Inversoft, All Rights Reserved.
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
 
 # Validate the attributes
 unless node['security_guide']['monit'].attribute?('alert_email')
diff --git a/chef-repo/cookbooks/security-guide/recipes/sshd.rb b/chef-repo/cookbooks/security-guide/recipes/sshd.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Recipe:: default
 #
-# Copyright (c) 2016 Inversoft, All Rights Reserved.
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
 
 # Install the SSH server configuration file
 template '/etc/ssh/sshd_config' do
diff --git a/chef-repo/cookbooks/security-guide/recipes/strong-passwords.rb b/chef-repo/cookbooks/security-guide/recipes/strong-passwords.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Recipe:: default
 #
-# Copyright (c) 2016 Inversoft, All Rights Reserved.
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
 
 # Install all the security packages
 package 'libpam-cracklib'
diff --git a/chef-repo/cookbooks/security-guide/recipes/two-factor.rb b/chef-repo/cookbooks/security-guide/recipes/two-factor.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Recipe:: default
 #
-# Copyright (c) 2016 Inversoft, All Rights Reserved.
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
 
 # Install the two-factor library
 package 'ntp'
diff --git a/chef-repo/cookbooks/security-guide/recipes/users.rb b/chef-repo/cookbooks/security-guide/recipes/users.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Recipe:: default
 #
-# Copyright (c) 2016 Inversoft, All Rights Reserved.
+# Copyright (c) 2018 FusionAuth, All Rights Reserved.
 
 # Validate the attributes
 if node['security_guide']['users'].length == 0
diff --git a/chef-repo/cookbooks/security-guide/spec/spec_helper.rb b/chef-repo/cookbooks/security-guide/spec/spec_helper.rb
diff --git a/chef-repo/cookbooks/security-guide/spec/unit/recipes/default_spec.rb b/chef-repo/cookbooks/security-guide/spec/unit/recipes/default_spec.rb
@@ -1,12 +1,12 @@
 #
-# Cookbook Name:: 2016_security_guide
+# Cookbook Name:: security_guide
 # Spec:: default
 #
-# Copyright (c) 2016 The Authors, All Rights Reserved.
+# Copyright (c) 2018 The Authors, All Rights Reserved.
 
 require 'spec_helper'
 
-describe '2016_security_guide::default' do
+describe 'security_guide::default' do
   context 'When all attributes are default, on an unspecified platform' do
     let(:chef_run) do
       runner = ChefSpec::ServerRunner.new
diff --git a/chef-repo/cookbooks/security-guide/templates/default/common-password.erb b/chef-repo/cookbooks/security-guide/templates/default/common-password.erb
@@ -22,7 +22,7 @@
 # pam-auth-update(8) for details.
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Password complexity module
+# SECURITY-SCRIPT ADDITION: Password complexity module
 #
 password	requisite			pam_cracklib.so ucredit=-<%= node['security_guide']['strong_passwords']['uppercase'] %> lcredit=-<%= node['security_guide']['strong_passwords']['lowercase'] %> dcredit=-<%= node['security_guide']['strong_passwords']['numbers'] %> ocredit=-<%= node['security_guide']['strong_passwords']['other'] %> retry=<%= node['security_guide']['strong_passwords']['retry_attempts'] %> minlen=<%= node['security_guide']['strong_passwords']['min_length'] %> difok=<%= node['security_guide']['strong_passwords']['different_than_last_by'] %>
 
diff --git a/chef-repo/cookbooks/security-guide/templates/default/monit-slack-pushover.rb.erb b/chef-repo/cookbooks/security-guide/templates/default/monit-slack-pushover.rb.erb
diff --git a/chef-repo/cookbooks/security-guide/templates/default/monitrc.erb b/chef-repo/cookbooks/security-guide/templates/default/monitrc.erb
@@ -19,7 +19,7 @@
 #
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Check interval 5 seconds
+# SECURITY-SCRIPT ADDITION: Check interval 5 seconds
 #
   set daemon 5
 
@@ -81,7 +81,7 @@
 #
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Email server configuration
+# SECURITY-SCRIPT ADDITION: Email server configuration
 #
 set mailserver <%= node['security_guide']['monit']['email_server'] %> port <%= node['security_guide']['monit']['email_port'] %> <% if node['security_guide']['monit'].attribute?('email_username') %>username "<%= node['security_guide']['monit']['email_username'] %>"<% end %> <% if node['security_guide']['monit'].attribute?('email_password') %>password "<%= node['security_guide']['monit']['email_password'] %>"<% end %> <% if node['security_guide']['monit'].attribute?('email_encryption') %><%= node['security_guide']['monit']['email_encryption'] %><% end %>
 
@@ -164,7 +164,7 @@ set mailserver <%= node['security_guide']['monit']['email_server'] %> port <%= n
 #
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Set alert email address
+# SECURITY-SCRIPT ADDITION: Set alert email address
 #
 set alert <%= node['security_guide']['monit']['alert_email'] %> not on { instance, action }
 
diff --git a/chef-repo/cookbooks/security-guide/templates/default/rules.v4.erb b/chef-repo/cookbooks/security-guide/templates/default/rules.v4.erb
diff --git a/chef-repo/cookbooks/security-guide/templates/default/sshd_config.erb b/chef-repo/cookbooks/security-guide/templates/default/sshd_config.erb
@@ -27,7 +27,7 @@ LoginGraceTime 120
 StrictModes yes
 
 #
-# 2016-SECURITY-GUIDE ADDITION: Disable root login
+# SECURITY-GUIDE ADDITION: Disable root login
 #
 PermitRootLogin no
 
@@ -47,7 +47,7 @@ HostbasedAuthentication no
 PermitEmptyPasswords no
 
 #
-# 2016-SECURITY-GUIDE ADDITION: Enable two-factor authentication
+# SECURITY-GUIDE ADDITION: Enable two-factor authentication
 #
 <% if node['security_guide']['two_factor_enabled'] %>
 ChallengeResponseAuthentication yes
@@ -58,7 +58,7 @@ AuthenticationMethods publickey
 <% end %>
 
 #
-# 2016-SECURITY-GUIDE ADDITION: No passwords
+# SECURITY-GUIDE ADDITION: No passwords
 #
 PasswordAuthentication no
 
diff --git a/chef-repo/cookbooks/security-guide/test/integration/default/serverspec/default_spec.rb b/chef-repo/cookbooks/security-guide/test/integration/default/serverspec/default_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '2016_security_guide::default' do
+describe 'security_guide::default' do
   # Serverspec examples can be found at
   # http://serverspec.org/resource_types.html
   it 'does something' do
diff --git a/chef-repo/cookbooks/security-guide/test/integration/helpers/serverspec/spec_helper.rb b/chef-repo/cookbooks/security-guide/test/integration/helpers/serverspec/spec_helper.rb
diff --git a/security-scripts.iml b/security-scripts.iml
@@ -3,10 +3,10 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/chef-repo/cookbooks/2016-security-guide" type="cookbooks-root" />
+      <sourceFolder url="file://$MODULE_DIR$/chef-repo/cookbooks/security-guide" type="cookbooks-root" />
       <excludeFolder url="file://$MODULE_DIR$/output" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
diff --git a/template/ubuntu-16.04/common-password b/template/ubuntu-16.04/common-password
@@ -22,7 +22,7 @@
 # pam-auth-update(8) for details.
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Password complexity module
+# SECURITY-SCRIPT ADDITION: Password complexity module
 #
 password	requisite			pam_cracklib.so retry=3 minlen=10 difok=3 ucredit=-1 lcredit=-2 dcredit=-1 ocredit=-1 retry=3 minlen=8 difok=3
 
diff --git a/template/ubuntu-16.04/monitrc b/template/ubuntu-16.04/monitrc
@@ -19,7 +19,7 @@
 #
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Check interval 5 seconds
+# SECURITY-SCRIPT ADDITION: Check interval 5 seconds
 #
   set daemon 5
 
@@ -81,7 +81,7 @@
 #
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Email server configuration
+# SECURITY-SCRIPT ADDITION: Email server configuration
 #
 set mailserver @MONIT_EMAIL_SERVER@ port @MONIT_EMAIL_PORT@ username "@MONIT_EMAIL_USERNAME@" password "@MONIT_EMAIL_PASSWORD@" @MONIT_EMAIL_ENCRYPTION@
 
@@ -164,7 +164,7 @@ set mailserver @MONIT_EMAIL_SERVER@ port @MONIT_EMAIL_PORT@ username "@MONIT_EMA
 #
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Set alert email address
+# SECURITY-SCRIPT ADDITION: Set alert email address
 #
 set alert @MONIT_ALERT_EMAIL@ not on { instance, action }
 
diff --git a/template/ubuntu-16.04/sshd b/template/ubuntu-16.04/sshd
@@ -4,7 +4,7 @@
 @include common-auth
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Google Authenticator module
+# SECURITY-SCRIPT ADDITION: Google Authenticator module
 #
 auth [success=done new_authtok_reqd=done default=die] pam_google_authenticator.so nullok
 
diff --git a/template/ubuntu-16.04/sshd_config b/template/ubuntu-16.04/sshd_config
@@ -28,7 +28,7 @@ LoginGraceTime 120
 StrictModes yes
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Disable root login
+# SECURITY-SCRIPT ADDITION: Disable root login
 #
 PermitRootLogin no
 
@@ -49,13 +49,13 @@ HostbasedAuthentication no
 PermitEmptyPasswords no
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: Enable two-factor authentication
+# SECURITY-SCRIPT ADDITION: Enable two-factor authentication
 #
 ChallengeResponseAuthentication yes
 AuthenticationMethods publickey,keyboard-interactive
 
 #
-# 2016-SECURITY-SCRIPT ADDITION: No passwords
+# SECURITY-SCRIPT ADDITION: No passwords
 #
 PasswordAuthentication no
 
diff --git a/test-answers b/test-answers
@@ -10,4 +10,4 @@ y
 https://hooks.slack.com/services/A0411FLaa/B004CKBBB/E7eeeea2a7a1U6EUhnIAus6z
 y
 pushover-app
-pushover-user
+pushover-user

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`@include common-auth`
`5`	`5`
`6`	`6`	`#`
`7`		`-# 2016-SECURITY-GUIDE ADDITION: Google Authenticator module`
	`7`	`+# SECURITY-GUIDE ADDITION: Google Authenticator module`
`8`	`8`	`#`
`9`	`9`	`auth [success=done new_authtok_reqd=done default=die] pam_google_authenticator.so nullok`
`10`	`10`