diff --git a/LICENSE b/LICENSE index 52ec1c1..43e82e1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright (c) 2013 Salt Stack Formulas + Copyright (c) 2014 Hewlett-Packard Development Company, L.P. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/memcached/init.sls b/memcached/init.sls index 43c121f..cbefb44 100644 --- a/memcached/init.sls +++ b/memcached/init.sls @@ -1,18 +1,3 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed 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. -# - memcached: pkg: - installed diff --git a/memcached/macros.sls b/memcached/macros.sls index 98a3a0b..079f993 100644 --- a/memcached/macros.sls +++ b/memcached/macros.sls @@ -1,17 +1,3 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed 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. -# {% from "memcached/map.jinja" import defaults with context -%} # Macro: diff --git a/memcached/map.jinja b/memcached/map.jinja index a8f90aa..208d350 100644 --- a/memcached/map.jinja +++ b/memcached/map.jinja @@ -2,7 +2,7 @@ 'config':{ 'deamonize': True, 'verbose_level': 0, - 'log_file': '/var/log/memcached' + 'log_file': '/var/log/memcached.log' 'memory_cap': 64, 'port': 11211, 'user':' memcache', diff --git a/pillar.example b/pillar.example index 3b42d36..ae65b5e 100644 --- a/pillar.example +++ b/pillar.example @@ -1,4 +1,3 @@ -# Collect the IPs of the memcached instances for use in application config memcached: deamonize: True, verbose_level: 0,