peony 0.1.9 → 0.3.0

data/templates/elasticsearch/config.yml.erb

@@ -1,13 +1,13 @@
-##################### ElasticSearch Configuration Example #####################
+##################### Elasticsearch Configuration Example #####################
 
 # This file contains an overview of various configuration settings,
 # targeted at operations staff. Application developers should
 # consult the guide at <http://elasticsearch.org/guide>.
 #
 # The installation procedure is covered at
-# <http://elasticsearch.org/guide/reference/setup/installation.html>.
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
 #
-# ElasticSearch comes with reasonable defaults for most settings,
+# Elasticsearch comes with reasonable defaults for most settings,
 # so you can try it out without bothering with configuration.
 #
 # Most of the time, these defaults are just fine for running a production
@@ -20,8 +20,8 @@
 #
 # node.rack: ${RACK_ENV_VAR}
 
-# See <http://elasticsearch.org/guide/reference/setup/configuration.html>
-# for information on supported formats and syntax for the configuration file.
+# For information on supported formats and syntax for the config file, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html>
 
 
 ################################### Cluster ###################################
@@ -29,7 +29,7 @@
 # Cluster name identifies your cluster for auto-discovery. If you're running
 # multiple clusters on the same network, make sure you're using unique names.
 #
-cluster.name: <%= es_cluster_name %>
+cluster.name: <%= es.cluster_name %>
 
 
 #################################### Node #####################################
@@ -72,8 +72,10 @@ cluster.name: <%= es_cluster_name %>
 # node.data: false
 
 # Use the Cluster Health API [http://localhost:9200/_cluster/health], the
-# Node Info API [http://localhost:9200/_cluster/nodes] or GUI tools
-# such as <http://github.com/lukas-vlcek/bigdesk> and
+# Node Info API [http://localhost:9200/_nodes] or GUI tools
+# such as <http://www.elasticsearch.org/overview/marvel/>,
+# <http://github.com/karmi/elasticsearch-paramedic>,
+# <http://github.com/lukas-vlcek/bigdesk> and
 # <http://mobz.github.com/elasticsearch-head> to inspect the cluster state.
 
 # A node can have generic attributes associated with it, which can later be used
@@ -96,8 +98,8 @@ cluster.name: <%= es_cluster_name %>
 # Note, that it makes more sense to configure index settings specifically for
 # a certain index, either when creating it or by using the index templates API.
 #
-# See <http://elasticsearch.org/guide/reference/index-modules/> and
-# <http://elasticsearch.org/guide/reference/api/admin-indices-create-index.html>
+# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
 # for more information.
 
 # Set the number of shards (splits) of an index (5 by default):
@@ -128,7 +130,7 @@ cluster.name: <%= es_cluster_name %>
 # The "number_of_replicas" can be increased or decreased anytime,
 # by using the Index Update Settings API.
 #
-# ElasticSearch takes care about load balancing, relocating, gathering the
+# Elasticsearch takes care about load balancing, relocating, gathering the
 # results from nodes, etc. Experiment with different settings to fine-tune
 # your setup.
 
@@ -144,7 +146,7 @@ cluster.name: <%= es_cluster_name %>
 
 # Path to directory where to store index data allocated for this node.
 #
-path.data: <%= es_data_dir %>
+path.data: <%= es.data_dir %>
 #
 # Can optionally include more than one location, causing data to be striped across
 # the locations (a la RAID 0) on a file level, favouring locations with most free
@@ -162,7 +164,7 @@ path.logs: <%= log_dir %>/elasticsearch/
 
 # Path to where plugins are installed:
 #
-path.plugins: <%= es_plugins_dir %>
+path.plugins: <%= es.plugins_dir %>
 
 
 #################################### Plugin ###################################
@@ -174,7 +176,7 @@ path.plugins: <%= es_plugins_dir %>
 
 ################################### Memory ####################################
 
-# ElasticSearch performs poorly when JVM starts swapping: you should ensure that
+# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
 # it _never_ swaps.
 #
 # Set this property to true to lock the memory:
@@ -183,15 +185,15 @@ path.plugins: <%= es_plugins_dir %>
 
 # Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
 # to the same value, and that the machine has enough memory to allocate
-# for ElasticSearch, leaving enough memory for the operating system itself.
+# for Elasticsearch, leaving enough memory for the operating system itself.
 #
-# You should also make sure that the ElasticSearch process is allowed to lock
+# You should also make sure that the Elasticsearch process is allowed to lock
 # the memory, eg. by using `ulimit -l unlimited`.
 
 
 ############################## Network And HTTP ###############################
 
-# ElasticSearch, by default, binds itself to the 0.0.0.0 address, and listens
+# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
 # on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
 # communication. (the range means that if the port is busy, it will automatically
 # try the next port).
@@ -207,7 +209,7 @@ path.plugins: <%= es_plugins_dir %>
 
 # Set both 'bind_host' and 'publish_host':
 #
-network.host: <%= es_network_host %>
+network.host: <%= es.network_host %>
 
 # Set a custom port for the node to node communication (9300 by default):
 #
@@ -237,8 +239,8 @@ network.host: <%= es_network_host %>
 # in the gateway, and when the cluster starts up for the first time,
 # it will read its state from the gateway.
 
-# There are several types of gateway implementations. For more information,
-# see <http://elasticsearch.org/guide/reference/modules/gateway>.
+# There are several types of gateway implementations. For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
 
 # The default gateway type is the "local" gateway (recommended):
 #
@@ -296,8 +298,8 @@ network.host: <%= es_network_host %>
 # and master node is elected. Multicast discovery is the default.
 
 # Set to ensure a node sees N other master eligible nodes to be considered
-# operational within the cluster. Set this option to a higher value (2-4)
-# for large clusters (>3 nodes):
+# operational within the cluster. Its recommended to set it to a higher value
+# than 1 when running more than 2 nodes in the cluster.
 #
 # discovery.zen.minimum_master_nodes: 1
 
@@ -307,8 +309,8 @@ network.host: <%= es_network_host %>
 #
 # discovery.zen.ping.timeout: 3s
 
-# See <http://elasticsearch.org/guide/reference/modules/discovery/zen.html>
-# for more information.
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
 
 # Unicast discovery allows to explicitly control which nodes will be used
 # to discover the cluster. It can be used when multicast is not present,
@@ -321,18 +323,29 @@ network.host: <%= es_network_host %>
 # 2. Configure an initial list of master nodes in the cluster
 #    to perform discovery when new nodes (master or data) are started:
 #
-# discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"]
+# discovery.zen.ping.unicast.hosts: ["host1", "host2:port"]
 
 # EC2 discovery allows to use AWS EC2 API in order to perform discovery.
 #
 # You have to install the cloud-aws plugin for enabling the EC2 discovery.
 #
-# See <http://elasticsearch.org/guide/reference/modules/discovery/ec2.html>
-# for more information.
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
 #
-# See <http://elasticsearch.org/tutorials/2011/08/22/elasticsearch-on-ec2.html>
+# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
 # for a step-by-step tutorial.
 
+# GCE discovery allows to use Google Compute Engine API in order to perform discovery.
+#
+# You have to install the cloud-gce plugin for enabling the GCE discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>.
+
+# Azure discovery allows to use Azure API in order to perform discovery.
+#
+# You have to install the cloud-azure plugin for enabling the Azure discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>.
 
 ################################## Slow Log ##################################
 
@@ -355,10 +368,11 @@ network.host: <%= es_network_host %>
 
 ################################## GC Logging ################################
 
-#monitor.jvm.gc.ParNew.warn: 1000ms
-#monitor.jvm.gc.ParNew.info: 700ms
-#monitor.jvm.gc.ParNew.debug: 400ms
+#monitor.jvm.gc.young.warn: 1000ms
+#monitor.jvm.gc.young.info: 700ms
+#monitor.jvm.gc.young.debug: 400ms
+
+#monitor.jvm.gc.old.warn: 10s
+#monitor.jvm.gc.old.info: 5s
+#monitor.jvm.gc.old.debug: 2s
 
-#monitor.jvm.gc.ConcurrentMarkSweep.warn: 10s
-#monitor.jvm.gc.ConcurrentMarkSweep.info: 5s
-#monitor.jvm.gc.ConcurrentMarkSweep.debug: 2s

data/templates/elasticsearch/logging.yml.erb

@@ -1,4 +1,6 @@
-rootLogger: INFO, console, file
+# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
+es.logger.level: INFO
+rootLogger: ${es.logger.level}, console, file
 logger:
   # log action execution errors for easier debugging
   action: DEBUG

data/templates/httpd/extra/httpd-autoindex.conf.erb

@@ -17,9 +17,9 @@ IndexOptions FancyIndexing HTMLTable VersionSort
 # We include the /icons/ alias for FancyIndexed directory listings.  If
 # you do not use FancyIndexing, you may comment this out.
 #
-Alias /icons/ "<%= httpd_share_dir %>/icons/"
+Alias /icons/ "<%= httpd.share_dir %>/icons/"
 
-<Directory "<%= httpd_share_dir %>/icons">
+<Directory "<%= httpd.share_dir %>/icons">
     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny

data/templates/httpd/extra/httpd-dav.conf.erb

@@ -12,11 +12,11 @@
 # on the directory where the DavLockDB is placed and on any directory where
 # "Dav On" is specified.
 
-DavLockDB "<%= webdav_dir %>/DavLock"
+DavLockDB "<%= httpd.webdav_dir %>/DavLock"
 
-Alias /webdav "<%= webdav_dir %>"
+Alias /webdav "<%= httpd.webdav_dir %>"
 
-<Directory "<%= webdav_dir %>">
+<Directory "<%= httpd.webdav_dir %>">
   Dav On
 	Options +Indexes
 	IndexOptions FancyIndexing
@@ -31,7 +31,7 @@ Alias /webdav "<%= webdav_dir %>"
 
     # You can use the htdigest program to create the password database:
     #   htdigest -c "/usr/user.passwd" DAV-upload admin
-    AuthUserFile "<%= auth_user_file %>"
+    AuthUserFile "<%= httpd.auth_user_file %>"
     AuthDigestProvider file
 	
     # Allow universal read-access, but writes are restricted

data/templates/httpd/extra/httpd-mpm.conf.erb

@@ -17,7 +17,7 @@
 #
 <IfModule !mpm_winnt_module>
 <IfModule !mpm_netware_module>
-LockFile "<%= httpd_log_dir %>/accept.lock"
+LockFile "<%= httpd.log_dir %>/accept.lock"
 </IfModule>
 </IfModule>
 

data/templates/httpd/extra/httpd-multilang-errordoc.conf.erb

@@ -19,9 +19,9 @@
 # your Apache version number and your ServerAdmin email address regardless
 # of the setting of ServerSignature.
 
-Alias /error/ "<%= httpd_share_dir %>/error/"
+Alias /error/ "<%= httpd.share_dir %>/error/"
 
-<Directory "<%= httpd_share_dir %>/error">
+<Directory "<%= httpd.share_dir %>/error">
     AllowOverride None
     Options IncludesNoExec
     AddOutputFilter Includes html

data/templates/httpd/httpd.conf.erb

@@ -37,7 +37,7 @@ ServerRoot "/usr"
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
-Listen <%= httpd_port %>
+Listen <%= httpd.port %>
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -150,7 +150,7 @@ Group _www
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin "<%= httpd_server_admin %>"
+ServerAdmin "<%= httpd.server_admin %>"
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -159,7 +159,7 @@ ServerAdmin "<%= httpd_server_admin %>"
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-ServerName <%= httpd_server_name %>
+ServerName <%= httpd.server_name %>
 
 #
 # DocumentRoot: The directory out of which you will serve your
@@ -264,7 +264,7 @@ DocumentRoot "<%= www_dir %>"
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "<%= httpd_log_dir %>/error.log"
+ErrorLog "<%= httpd.log_dir %>/error.log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -293,7 +293,7 @@ LogLevel warn
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "<%= httpd_log_dir %>/access.log" common
+    CustomLog "<%= httpd.log_dir %>/access.log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
@@ -368,7 +368,7 @@ DefaultType text/plain
     # TypesConfig points to the file containing the list of mappings from
     # filename extension to MIME-type.
     #
-    TypesConfig <%= httpd_etc_dir %>/mime.types
+    TypesConfig <%= httpd.etc_dir %>/mime.types
 
     #
     # AddType allows you to add to or override the MIME configuration
@@ -451,7 +451,7 @@ TraceEnable off
 # necessary.
 
 # Server-pool management (MPM specific)
-Include <%= httpd_etc_dir %>/extra/*.conf
+Include <%= httpd.etc_dir %>/extra/*.conf
 
 
 #
@@ -464,4 +464,4 @@ SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
 
-#Include <%= httpd_etc_dir %>/other/*.conf
+#Include <%= httpd.etc_dir %>/other/*.conf

data/templates/mongo/master.conf.erb

@@ -1,19 +1,19 @@
-# Store data in <%= mongo_master_dir %> instead of the default /data/db
-dbpath = <%= mongo_master_dir %>
+# Store data in <%= mongo.master_dir %> instead of the default /data/db
+dbpath = <%= mongo.master_dir %>
 
 # Only accept local connections
 #bind_ip =  127.0.0.1
 
-logpath = <%= mongo_log_dir %>/<%= mongo_master_name %>.log
+logpath = <%= mongo.log_dir %>/<%= mongo.master_name %>.log
 
-pidfilepath = <%= mongo_run_dir %>/<%= mongo_master_name %>.pid
+pidfilepath = <%= mongo.run_dir %>/<%= mongo.master_name %>.pid
 
-fork = <%= mongo_fork %>
+fork = <%= mongo.fork %>
 
-jsonp = <%= mongo_jsonp %>
+jsonp = <%= mongo.jsonp %>
 
-rest = <%= mongo_rest %>
+rest = <%= mongo.rest %>
 
-port = <%= mongo_master_port %>
+port = <%= mongo.master_port %>
 
 master = true

data/templates/mongo/slave.conf.erb

@@ -1,21 +1,21 @@
-# Store data in <%= mongo_slave_dir %> instead of the default /data/db
-dbpath = <%= mongo_slave_dir %>
+# Store data in <%= mongo.slave_dir %> instead of the default /data/db
+dbpath = <%= mongo.slave_dir %>
 
 # Only accept local connections
 #bind_ip = 127.0.0.1
 
-logpath = <%= mongo_log_dir %>/<%= mongo_slave_name %>.log
+logpath = <%= mongo.log_dir %>/<%= mongo.slave_name %>.log
 
-pidfilepath = <%= mongo_run_dir %>/<%= mongo_slave_name %>.pid
+pidfilepath = <%= mongo.run_dir %>/<%= mongo.slave_name %>.pid
 
-fork = <%= mongo_fork %>
+fork = <%= mongo.fork %>
 
-jsonp = <%= mongo_jsonp %>
+jsonp = <%= mongo.jsonp %>
 
-rest = <%= mongo_rest %>
+rest = <%= mongo.rest %>
 
 slave = true
 
-port = <%= mongo_slave_port %>
+port = <%= mongo.slave_port %>
 
-source = <%= mongo_slave_source %>
+source = <%= mongo.slave_source %>

data/templates/mysql/my.cnf.erb

@@ -1,34 +1,48 @@
-[client] 
-character-set-server=<%= mysql_charset %>
-port=<%= mysql_port %>
-socket=<%= mysql_socket %>
- 
- 
-[mysqld] 
-character-set-server=<%= mysql_charset %>
-user=<%= user %>
-port=<%= mysql_port %>
-socket=<%= mysql_socket %>
-basedir=<%= mysql_home %>
-datadir=<%= mysql_dir %>
-
-pid-file=<%= mysql_pid_file %>
-log-error=<%= mysql_log_dir %>/error.log
-
-slow_query_log=<%= mysql_slow_query_log %>
-slow_query_log_file=<%= mysql_log_dir %>/slow-query.log
-
-general_log=<%= mysql_general_log %>
-general_log_file=<%= mysql_log_dir %>/general.log
-
- 
-relay-log-index=<%= mysql_log_dir %>/relay-index.log 
-relay-log-info-file=<%= mysql_log_dir %>/relay-info.log 
-relay-log=<%= mysql_log_dir %>/relay.log
-
-explicit_defaults_for_timestamp=TRUE
-
-
-[mysqldump] 
-quick 
-max_allowed_packet=24M
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.6/en/server-configuration-defaults.html
+
+[mysql]
+default-character-set = <%= mysql.charset %>
+
+[mysqlshow]
+default-character-set = <%= mysql.charset %>
+
+[mysqlimport]
+default-character-set = <%= mysql.charset %>
+
+[mysqlcheck]
+default-character-set = <%= mysql.charset %>
+
+[mysql_upgrade]
+default-character-set = <%= mysql.charset %>
+
+[mysqld]
+
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+innodb_buffer_pool_size = 128M
+
+log-error = <%= mysql.log_error %>
+pid-file = <%= mysql.pid_file %>
+
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+log_bin = mysqld-bin
+
+# These are commonly set, remove the # and set as required.
+basedir = <%= mysql.home %>
+datadir = <%= mysql.data_dir %>
+port = <%= mysql.port %>
+# server_id = .....
+socket = <%= mysql.socket %>
+
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+
+character-set-server =      <%= mysql.charset %>
+
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES

data/templates/nginx/sites-enabled/php.conf.erb

@@ -1,12 +1,12 @@
 location / {
-	root   				  <%= www_dir %>;
-	index  				  index.php index.html index.htm;
+	root   			<%= nginx.www_dir %>;
+	index  			index.php index.html index.htm;
 }
 
 location ~ \.php$ {
-	root				    <%= www_dir %>;
-	fastcgi_pass		fastcgi_server;
-	fastcgi_index		index.php;
-	fastcgi_param		SCRIPT_FILENAME  $document_root/$fastcgi_script_name;
-	include				  conf/fastcgi_params;      
+	root			<%= nginx.www_dir %>;
+	fastcgi_pass	fastcgi_server;
+	fastcgi_index	index.php;
+	fastcgi_param	SCRIPT_FILENAME  $document_root/$fastcgi_script_name;
+	include			conf/fastcgi_params;
 }

data/templates/nginx/sites-enabled/static.conf.erb

@@ -1,11 +1,11 @@
-<%- www_paths.each do|loc, alias_path| -%>
+<%- nginx.www_paths.each do|loc, alias_path| -%>
 location <%= loc %> {
-	charset                   utf-8;
+	charset                         utf-8;
 	
-	autoindex 						    on;
+	autoindex 						on;
 	autoindex_localtime 			on;
 	autoindex_exact_size 			off;
 	
-	alias							        <%= alias_path %>;
+	alias							<%= alias_path %>;
 }
 <%- end -%>