Merge branch 'master' of github.com:apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2bab7e45 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2bab7e45 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2bab7e45 Branch: refs/heads/master Commit: 2bab7e453eb58248e9878ff0306c4f18884b08a0 Parents: 0c8318b 39f4a8f Author: Akila Perera <[email protected]> Authored: Fri Jul 4 13:02:51 2014 +0530 Committer: Akila Perera <[email protected]> Committed: Fri Jul 4 13:02:51 2014 +0530 ---------------------------------------------------------------------- .../distribution/src/main/conf/log4j.properties | 4 +- tools/puppet3/manifests/nodes/php.pp | 2 +- tools/puppet3/modules/haproxy/files/README.txt | 12 +++ tools/puppet3/modules/haproxy/manifests/init.pp | 70 ++++++++++++++++++ .../modules/haproxy/manifests/initialize.pp | 77 ++++++++++++++++++++ .../modules/haproxy/manifests/push_templates.pp | 30 ++++++++ .../puppet3/modules/haproxy/manifests/start.pp | 25 +++++++ .../templates/bin/haproxy-extension.sh.erb | 48 ++++++++++++ .../haproxy/templates/conf/jndi.properties.erb | 33 +++++++++ 9 files changed, 299 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2bab7e45/tools/puppet3/manifests/nodes/php.pp ---------------------------------------------------------------------- diff --cc tools/puppet3/manifests/nodes/php.pp index da47e11,0000000..f16b9fd mode 100755,000000..100755 --- a/tools/puppet3/manifests/nodes/php.pp +++ b/tools/puppet3/manifests/nodes/php.pp @@@ -1,32 -1,0 +1,32 @@@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# php cartridge node +node /php/ inherits base { - $docroot = "/var/www/" ++ $docroot = "/var/www/www" + $syslog="/var/log/apache2/error.log" + $samlalias="/var/www/" + + require java + class {'agent': + type => 'php', + } + class {'php':} + + #install stratos_base before java before php before agent + Class['stratos_base'] -> Class['java'] -> Class['php'] ~> Class['agent'] +}
