added new parameter disable_notifications in relation to setenv.sh

voxpupuli · Apr 28, 2015 · 4a0d22b · 4a0d22b
1 parent e9b7de4
commit 4a0d22b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -88,7 +88,8 @@
   $java_opts    = '',
 
   # Misc Settings
-  $downloadURL  = 'http://www.atlassian.com/software/jira/downloads/binary/',
+  $downloadURL           = 'http://www.atlassian.com/software/jira/downloads/binary/',
+  $disable_notifications = false,
 
   # Choose whether to use nanliu-staging, or mkrakowitzer-deploy
   # Defaults to nanliu-staging as it is puppetlabs approved.

diff --git a/spec/classes/jira_config_spec.rb b/spec/classes/jira_config_spec.rb
@@ -13,7 +13,8 @@
             :version  => '6.3.4a',
             :javahome => '/opt/java',
           }}
-          it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/setenv.sh')}
+          it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/setenv.sh')
+            .with_content(/#DISABLE_NOTIFICATIONS=/) }
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/user.sh')}
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/conf/server.xml')}
           it { should contain_file('/home/jira/dbconfig.xml')
@@ -171,6 +172,16 @@
           it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/conf/context.xml')
             .with_content(/<Resource name = "testdb"\n        auth = "Container"\n    \/>/) }
         end
+
+        context 'disable notifications' do
+          let(:params) {{
+            :version  => '6.3.4a',
+            :javahome => '/opt/java',
+            :disable_notifications => true,
+          }}
+          it { should contain_file('/opt/jira/atlassian-jira-6.3.4a-standalone/bin/setenv.sh')
+            .with_content(/^DISABLE_NOTIFICATIONS=/) }
+        end
       end
     end
   end

diff --git a/templates/setenv.sh.erb b/templates/setenv.sh.erb
@@ -27,8 +27,11 @@ JVM_REQUIRED_ARGS="-Djava.awt.headless=true -Datlassian.standalone=JIRA -Dorg.ap
 
 # Uncomment this setting if you want to import data without notifications
 #
+<% if @disable_notifications -%>
+DISABLE_NOTIFICATIONS=" -Datlassian.mail.senddisabled=true -Datlassian.mail.fetchdisabled=true -Datlassian.mail.popdisabled=true"
+<% else %>
 #DISABLE_NOTIFICATIONS=" -Datlassian.mail.senddisabled=true -Datlassian.mail.fetchdisabled=true -Datlassian.mail.popdisabled=true"
-
+<% end -%>
 
 #-----------------------------------------------------------------------------------
 #