Merge pull request #116 from Alfresco/develop

Develop
AlfrescoLabs · Sep 13, 2016 · a14dea7 · a14dea7
2 parents a672e5f + 91d6a84
commit a14dea7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/attributes/aos.rb b/attributes/aos.rb
@@ -0,0 +1,18 @@
+node.default['artifacts']['_vti_bin']['groupId'] = "org.alfresco.aos-module"
+node.default['artifacts']['_vti_bin']['artifactId'] = "alfresco-vti-bin"
+node.default['artifacts']['_vti_bin']['version'] = "1.1"
+node.default['artifacts']['_vti_bin']['type'] = 'war'
+node.default['artifacts']['_vti_bin']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['ROOT']['groupId'] = node['alfresco']['groupId']
+node.default['artifacts']['ROOT']['artifactId'] = "alfresco-server-root"
+node.default['artifacts']['ROOT']['version'] = node['alfresco']['version']
+node.default['artifacts']['ROOT']['type'] = 'war'
+node.default['artifacts']['ROOT']['owner'] = node['alfresco']['user']
+
+node.default['artifacts']['aos-module']['groupId'] = "org.alfresco.aos-module"
+node.default['artifacts']['aos-module']['artifactId'] = "alfresco-aos-module"
+node.default['artifacts']['aos-module']['version'] = "1.1"
+node.default['artifacts']['aos-module']['type'] = 'amp'
+node.default['artifacts']['aos-module']['owner'] = node['alfresco']['user']
+node.default['artifacts']['aos-module']['destination'] = "/usr/share/tomcat/amps"
diff --git a/recipes/_aos-attributes.rb b/recipes/_aos-attributes.rb
@@ -1,22 +1,3 @@
-node.default['artifacts']['_vti_bin']['groupId'] = "org.alfresco.aos-module"
-node.default['artifacts']['_vti_bin']['artifactId'] = "alfresco-vti-bin"
-node.default['artifacts']['_vti_bin']['version'] = "1.1"
-node.default['artifacts']['_vti_bin']['type'] = 'war'
-node.default['artifacts']['_vti_bin']['owner'] = 'root'
-
-node.default['artifacts']['ROOT']['groupId'] = node['alfresco']['groupId']
-node.default['artifacts']['ROOT']['artifactId'] = "alfresco-server-root"
-node.default['artifacts']['ROOT']['version'] = node['alfresco']['version']
-node.default['artifacts']['ROOT']['type'] = 'war'
-node.default['artifacts']['ROOT']['owner'] = 'root'
-
-node.default['artifacts']['aos-module']['groupId'] = "org.alfresco.aos-module"
-node.default['artifacts']['aos-module']['artifactId'] = "alfresco-aos-module"
-node.default['artifacts']['aos-module']['version'] = "1.1"
-node.default['artifacts']['aos-module']['type'] = 'amp'
-node.default['artifacts']['aos-module']['owner'] = 'root'
-node.default['artifacts']['aos-module']['destination'] = "/usr/share/tomcat/amps"
-
 if node['tomcat']['run_base_instance']
   node.default['artifacts']['_vti_bin']['destination'] = node['tomcat']['webapp_dir']
   node.default['artifacts']['ROOT']['destination'] = node['tomcat']['webapp_dir']

diff --git a/recipes/_repo-attributes.rb b/recipes/_repo-attributes.rb
@@ -78,7 +78,7 @@
 node.default['artifacts']['alfresco']['version'] = node['alfresco']['version']
 node.default['artifacts']['alfresco']['type'] = "war"
 
-node.default['artifacts']['alfresco']['owner'] = "root"
+node.default['artifacts']['alfresco']['owner'] = node['alfresco']['user']
 node.default['artifacts']['alfresco']['unzip'] = false
 
 # Alfresco MMT artifact

diff --git a/test/integration/community/serverspec/permissions_spec.rb b/test/integration/community/serverspec/permissions_spec.rb
@@ -14,8 +14,8 @@
     	should be_readable.by_user('root')
     end
 
-    it 'should not be writable by tomcat' do
-    	should_not be_writable.by_user('tomcat')
+    it 'should  be writable by tomcat' do
+    	should be_writable.by_user('tomcat')
     end
 
     it 'should be readable by tomcat' do

diff --git a/test/integration/enterprise/serverspec/permissions_spec.rb b/test/integration/enterprise/serverspec/permissions_spec.rb
@@ -15,7 +15,7 @@
     end
 
     it 'should not be writable by tomcat' do
-    	should_not be_writable.by_user('tomcat')
+    	should be_writable.by_user('tomcat')
     end
 
     it 'should be readable by tomcat' do