Bug 982738

cartridges/openshift-origin-cartridge-cron/metadata/managed_files.yml

@@ -5,6 +5,7 @@ locked_files:
 - metadata/
 - env/
 - env/*
-- conf/
+- configuration/
+- configuration/*
 processed_templates:
 - '**/*.erb'

cartridges/openshift-origin-cartridge-diy/metadata/managed_files.yml

@@ -3,9 +3,14 @@ locked_files:
 - bin/
 - bin/*
 - configuration/
+- configuration/etc/
+- configuration/etc/conf.d/
+- configuration/etc/conf.d/*
 - metadata/
 - env/
 - env/*
+- hooks/
+- hooks/*
 - tmp/
 - conf/
 processed_templates:

cartridges/openshift-origin-cartridge-haproxy/bin/setup

@@ -7,7 +7,7 @@ esac
 
 echo "$version" > "$OPENSHIFT_HAPROXY_DIR/env/OPENSHIFT_HAPROXY_VERSION"
 
-mkdir -p $OPENSHIFT_HAPROXY_DIR/{conf,conf.d,logs,run,sessions}
+mkdir -p $OPENSHIFT_HAPROXY_DIR/{conf,logs,run,sessions}
 
 if [ ! -f "$OPENSHIFT_HAPROXY_DIR/conf/haproxy.cfg" ]; then
     cp ${OPENSHIFT_HAPROXY_DIR}/versions/$version/configuration/haproxy.cfg.erb $OPENSHIFT_HAPROXY_DIR/conf/

cartridges/openshift-origin-cartridge-haproxy/metadata/managed_files.yml

@@ -1,6 +1,6 @@
 ---
 setup_rewritten:
-- bin/deploy
+- bin/*
 locked_files:
 - env/
 - env/*

cartridges/openshift-origin-cartridge-jbossas/metadata/managed_files.yml

@@ -6,6 +6,8 @@ locked_files:
 - tools/*
 - metadata/
 - metadata/*
+- hooks/
+- hooks/*
 - env/
 - env/OPENSHIFT_JBOSSAS_DIR
 - env/OPENSHIFT_JBOSSAS_LOG_DIR

cartridges/openshift-origin-cartridge-jbosseap/metadata/managed_files.yml

@@ -6,6 +6,8 @@ locked_files:
 - tools/*
 - metadata/
 - metadata/*
+- hooks/
+- hooks/*
 - env/
 - env/OPENSHIFT_JBOSSEAP_DIR
 - env/OPENSHIFT_JBOSSEAP_LOG_DIR

cartridges/openshift-origin-cartridge-jbossews/metadata/managed_files.yml

@@ -4,6 +4,8 @@ locked_files:
 - bin/*
 - metadata/
 - metadata/*
+- hooks/
+- hooks/*
 - env/
 - env/OPENSHIFT_JBOSSEWS_DIR
 - env/OPENSHIFT_JBOSSEWS_LOG_DIR

cartridges/openshift-origin-cartridge-mysql/metadata/managed_files.yml

@@ -8,6 +8,8 @@ locked_files:
 - env/*
 - metadata/
 - metadata/*
+- conf/
+- conf/*
 - hooks/
 - hooks/*
 processed_templates:

cartridges/openshift-origin-cartridge-nodejs/metadata/managed_files.yml

@@ -4,8 +4,12 @@ locked_files:
 - bin/*
 - metadata/
 - metadata/*
+- hooks/
+- hooks/*
 - env/
 - env/*
+- lib/
+- lib/*
 - etc/
 processed_templates:
 - '**/*.erb'

cartridges/openshift-origin-cartridge-perl/metadata/managed_files.yml

@@ -6,6 +6,10 @@ locked_files:
 - metadata/*
 - env/
 - env/*
+- hooks/
+- hooks/*
 - etc/
+- etc/conf.d/
+- etc/conf.d/*
 processed_templates:
 - '**/*.erb'

cartridges/openshift-origin-cartridge-php/metadata/managed_files.yml

@@ -5,10 +5,15 @@ locked_files:
 - bin/*
 - configuration/
 - configuration/etc/
+- configuration/etc/php.ini
+- configuration/etc/conf.d/
+- configuration/etc/conf.d/*
 - metadata/
 - metadata/*
 - env/
 - env/*
+- hooks/
+- hooks/*
 - conf/
 processed_templates:
 - '**/*.erb'

cartridges/openshift-origin-cartridge-phpmyadmin/metadata/managed_files.yml

@@ -4,6 +4,7 @@ locked_files:
 - bin/*
 - metadata/
 - conf.d/
+- conf.d/*
 - phpMyAdmin/
 - phpMyAdmin/*
 - env/

cartridges/openshift-origin-cartridge-postgresql/metadata/managed_files.yml

@@ -7,5 +7,7 @@ locked_files:
 - metadata/
 - hooks/
 - hooks/*
+- lib/
+- lib/*
 processed_templates:
 - '**/*.erb'

cartridges/openshift-origin-cartridge-python/metadata/managed_files.yml

@@ -2,12 +2,15 @@
 locked_files:
 - bin/
 - bin/*
-- conf/
+- etc/
+- etc/conf.d/
+- etc/conf.d/*
+- hooks/
+- hooks/*
 - metadata/
 - metadata/*
 - env/
 - env/OPENSHIFT_PYTHON_DIR
 - env/OPENSHIFT_PYTHON_LOG_DIR
-- etc/
 processed_templates:
 - '**/*.erb'

cartridges/openshift-origin-cartridge-ruby/metadata/managed_files.yml

@@ -4,10 +4,14 @@ locked_files:
 - bin/*
 - metadata/
 - metadata/*
+- hooks/
+- hooks/*
+- etc/
+- etc/conf.d/
+- etc/conf.d/*
 - env/
 - env/OPENSHIFT_RUBY_DIR
 - env/OPENSHIFT_RUBY_LOG_DIR
-- etc/
 processed_templates:
 - 'etc/conf.d/openshift.conf.erb'
 - 'metadata/jenkins_shell_command.erb'

controller/test/cucumber/step_definitions/cartridge-php_steps.rb

@@ -43,10 +43,10 @@
     "php" => [gear_uuid, gear_uuid, '40755', se_context],
     "php/" => [gear_uuid, gear_uuid, '40755', se_context],
     "php/conf/" => ['root', gear_uuid, '40755', se_context],
-    "php/configuration/etc/php.ini" => [gear_uuid, gear_uuid, '100644', se_context],
+    "php/configuration/etc/php.ini" => ['root', gear_uuid, '100644', se_context],
     "php/conf/magic" => ['root', 'root', '100644', se_context], # symlink to /etc/httpd/conf/magic
     "php/configuration/etc/" => ['root', gear_uuid, '40755', se_context],
-    "php/configuration/etc/conf.d/openshift.conf" => [gear_uuid, gear_uuid, '100644', se_context],
+    "php/configuration/etc/conf.d/openshift.conf" => ['root', gear_uuid, '100644', se_context],
     "php/logs/" => [gear_uuid, gear_uuid, '40755', se_context],
     "php/phplib/pear/" => [gear_uuid, gear_uuid, '40755', se_context],
     "php/run/" => [gear_uuid, gear_uuid, '40755', se_context],
@@ -65,6 +65,7 @@
     raise "Invalid context for #{file}" unless context?("#{app_home}/#{file}", context)
     target_uid = Etc.getpwnam(user).uid.to_i
     target_gid = Etc.getgrnam(group).gid.to_i
+
     raise "Invalid ownership for #{file}" unless owner?("#{app_home}/#{file}", target_uid, target_gid)
   end
 end