Permalink
Browse files

WIP: clean-up (also removed old recipes)

  • Loading branch information...
1 parent 4ed6ca8 commit 5f9fed3916fe76cd993fe98b8bcf975eda7b2210 @till committed Jul 29, 2013
Showing with 84 additions and 392 deletions.
  1. +3 −0 composer/metadata.rb
  2. +1 −0 couchdb/metadata.rb
  3. +1 −0 cron/metadata.rb
  4. +1 −0 deploy/metadata.rb
  5. +1 −0 dhcp3/metadata.rb
  6. +1 −0 dnsmasq/metadata.rb
  7. +1 −0 easybib/metadata.rb
  8. +0 −10 elasticsearch/attributes/default.rb
  9. +0 −25 elasticsearch/recipes/configure.rb
  10. +0 −27 elasticsearch/recipes/default.rb
  11. +0 −11 elasticsearch/recipes/nginx.rb
  12. +0 −7 elasticsearch/recipes/restart.rb
  13. +0 −107 elasticsearch/recipes/service.rb
  14. +0 −19 elasticsearch/templates/default/elasticsearch.yml.erb
  15. +0 −8 elasticsearch/templates/default/nginx-elasticsearch.conf.erb
  16. +0 −131 elasticsearch/templates/default/service-elasticsearch.conf.erb
  17. +2 −1 ezproxy/metadata.rb
  18. +3 −0 gearmand/metadata.rb
  19. +1 −0 git/metadata.rb
  20. +3 −0 haproxy/metadata.rb
  21. +3 −0 java/metadata.rb
  22. +1 −0 loggly/metadata.rb
  23. +3 −0 memcache/metadata.rb
  24. +3 −0 monit/metadata.rb
  25. +3 −0 mysql/metadata.rb
  26. +3 −0 newrelic/metadata.rb
  27. +3 −2 nginx-app/metadata.rb
  28. +1 −0 nginx-lb/metadata.rb
  29. +1 −0 nodejs/metadata.rb
  30. +1 −0 ohai/metadata.rb
  31. +1 −0 percona/metadata.rb
  32. +1 −0 php-apc/metadata.rb
  33. +3 −0 php-bcmath/metadata.rb
  34. +1 −0 php-enchant/metadata.rb
  35. +1 −0 php-fpm/metadata.rb
  36. +1 −0 php-gearman/metadata.rb
  37. +3 −0 php-intl/metadata.rb
  38. +1 −0 php-mysqlnd_uh/metadata.rb
  39. +3 −0 php-pdo_sqlite/metadata.rb
  40. +1 −0 php-pear/metadata.rb
  41. +1 −0 php-phar/metadata.rb
  42. +1 −0 php-posix/metadata.rb
  43. +1 −0 php-pspell/metadata.rb
  44. +1 −0 php-suhosin/metadata.rb
  45. +1 −0 php-xdebug/metadata.rb
  46. +1 −0 php-xhprof/metadata.rb
  47. +5 −0 php/metadata.rb
  48. +3 −0 phpmyadmin/metadata.rb
  49. +1 −0 phpunit/metadata.rb
  50. +1 −0 postfix/metadata.rb
  51. +1 −0 rds/metadata.rb
  52. +1 −0 redis/metadata.rb
  53. +1 −0 silverline/metadata.rb
  54. +1 −0 statsd/metadata.rb
  55. +1 −0 subversion/metadata.rb
  56. +1 −0 tsung/metadata.rb
  57. +2 −1 unfuddle-ssl-fix/metadata.rb
  58. +1 −0 users/metadata.rb
  59. +0 −1 varnish/files/default/varnish.list
  60. +0 −8 varnish/metadata.rb
  61. +0 −3 varnish/recipes/configure.rb
  62. +0 −19 varnish/recipes/setup.rb
  63. +0 −11 varnish/todo.txt
  64. +2 −1 {elasticsearch → xhprof.io}/metadata.rb
  65. +1 −0 zsh/metadata.rb
View
@@ -0,0 +1,3 @@
+name "composer"
+maintainer "Till Klampaeckel"
+maintainer_email "till@php.net"
View
@@ -1,3 +1,4 @@
+name "couchdb"
maintainer "Peritor GmbH"
maintainer_email "scalarium@peritor.com"
license "Apache 2.0"
View
@@ -1,3 +1,4 @@
+name "cron"
maintainer "Till Klampaeckel"
maintainer_email "till@php.net"
license "BSD License"
View
@@ -1,3 +1,4 @@
+name "deploy"
maintainer "Till Klampaeckel, Ulf Harnhammar"
maintainer_email "till@php.net"
license "BSD License"
View
@@ -1,3 +1,4 @@
+name "dhcp3"
maintainer "Till Klampaeckel"
maintainer_email "till@php.net"
license "BSD License"
View
@@ -1,3 +1,4 @@
+name "dnsmasq"
maintainer "Till Klampaeckel"
maintainer_email "till@php.net"
license "BSD License"
View
@@ -1,3 +1,4 @@
+name "easybib"
maintainer "Till Klampaeckel"
maintainer_email "till@php.net"
license "BSD License"
@@ -1,10 +0,0 @@
-set_unless[:elasticsearch][:download] = "https://github.com/downloads/elasticsearch/elasticsearch"
-set_unless[:elasticsearch][:version] = "elasticsearch-0.17.5.tar.gz"
-set_unless[:elasticsearch][:basedir] = "/mnt/opt"
-set_unless[:elasticsearch][:ebsdir] = "/esdata"
-set_unless[:elasticsearch][:cluster] = "citationanalytics"
-set_unless[:elasticsearch][:memory] = {}
-set_unless[:elasticsearch][:memory][:max] = 12000
-set_unless[:elasticsearch][:memory][:min] = 12000
-set_unless[:elasticsearch][:user] = "root"
-set_unless[:elasticsearch][:group] = "root"
@@ -1,25 +0,0 @@
-# create data dir
-directory "#{node[:elasticsearch][:ebsdir]}/elasticsearch-data" do
- owner node[:elasticsearch][:user]
- group node[:elasticsearch][:group]
- mode "0755"
- action :create
- recursive true
-end
-
-# create logs dir
-directory "#{node[:elasticsearch][:basedir]}/elasticsearch-logs" do
- owner node[:elasticsearch][:user]
- group node[:elasticsearch][:group]
- mode "0755"
- action :create
- recursive true
-end
-
-# install configuration file
-dir = "#{node[:elasticsearch][:basedir]}/#{node[:elasticsearch][:version].gsub('.tar.gz', '')}"
-template "#{dir}/config/elasticsearch.yml" do
- source "elasticsearch.yml.erb"
- owner node[:elasticsearch][:user]
- group node[:elasticsearch][:group]
-end
@@ -1,27 +0,0 @@
-# TODO: https://launchpad.net/~rgl/+archive/elasticsearch
-include_recipe "java::default"
-
-tmp_file = "#{node[:elasticsearch][:basedir]}/#{node[:elasticsearch][:version]}"
-
-directory "#{node[:elasticsearch][:basedir]}" do
- owner node[:elasticsearch][:user]
- group node[:elasticsearch][:group]
- mode "0755"
- action :create
- recursive true
-end
-
-remote_file "#{tmp_file}" do
- source "#{node[:elasticsearch][:download]}/#{node[:elasticsearch][:version]}"
- mode "0644"
- not_if do File.directory?("#{tmp_file.gsub('.tar.gz', '')}") end
-end
-
-execute "extract #{node[:elasticsearch][:version]}" do
- command "tar -zxvf #{tmp_file}"
- not_if do !File.exist?(tmp_file) end
- cwd "#{node[:elasticsearch][:basedir]}"
-end
-
-include_recipe "elasticsearch::configure"
-include_recipe "elasticsearch::restart"
@@ -1,11 +0,0 @@
-# assume nginx-app::server was run before
-
-template "/etc/nginx/sites-enabled/elasticsearch.conf" do
- source "nginx-elasticsearch.conf.erb"
- owner "www-data"
- group "www-data"
-end
-
-service "nginx" do
- action :restart
-end
@@ -1,7 +0,0 @@
-# only restart if this is an already running instance and the service wrapper is
-# already available (= registered)
-if File.exists?('/etc/init.d/elasticsearch')
- service "elasticsearch" do
- action :restart
- end
-end
@@ -1,107 +0,0 @@
-package "git-core"
-
-dir = node[:elasticsearch][:version].gsub('.tar.gz', '')
-base_dir = "#{node[:elasticsearch][:basedir]}/#{dir}/bin"
-
-# this is where we git checkout the servicewrapper to
-service_dir="#{node[:elasticsearch][:basedir]}/elasticsearch-service"
-
-# Each time the setup is run, the following happens
-# * determine if the service wrapper is installed and attempt to stop ElasticSearch
-# * delete the symlink
-# * delete the servicewrapper checkout
-if File.exists?('/etc/init.d/elasticsearch')
- execute "stop ElasticSearch" do
- command "/etc/init.d/elasticsearch stop"
- end
- execute "delete service wrapper's symlink" do
- command "rm /etc/init.d/elasticsearch"
- end
- directory "#{service_dir}" do
- action :delete
- recursive true
- end
-end
-
-git "#{service_dir}" do
- repository "git://github.com/elasticsearch/elasticsearch-servicewrapper.git"
- reference "master"
- action :sync
-end
-
-link "#{base_dir}/service" do
- to "#{service_dir}/service"
-end
-
-#execute "unable ulimit" do
-# command "sed -i 's,#ULIMIT_N=,ULIMIT_N=32000,g' elasticsearch"
-# cwd "#{service_dir}/service"
-#end
-
-# todo maybe add this to service-elasticsearch.conf.erb
-
-node[:elasticsearch][:home] = "#{node[:elasticsearch][:basedir]}/#{dir}"
-
-execute "patch ES_HOME in start script" do
- command "sed -i 's,ES_HOME=`dirname \"$SCRIPT\"`/../..,ES_HOME=#{node[:elasticsearch][:home]},g' elasticsearch"
- cwd "#{service_dir}/service"
-end
-
-execute "register elasticsearch as a service" do
- command "#{base_dir}/service/elasticsearch install"
- not_if do File.symlink?("/etc/init.d/elasticsearch") end
-end
-
-if node[:ec2]
- case node[:ec2][:instance_type]
- when "t1.micro"
- mem_min = 256
- mem_max = 256
- when "m1.small"
- mem_min = 1024
- mem_max = 1024
- when "m1.large"
- mem_min = 6000
- mem_max = 6000
- when "m1.xlarge"
- mem_min = node[:elasticsearch][:memory][:max]
- mem_max = node[:elasticsearch][:memory][:max]
- when "m2.xlarge"
- mem_min = 15000
- mem_max = 15000
- when "m2.2xlarge"
- mem_min = 30000
- mem_max = 30000
- when "m2.4xlarge"
- mem_min = 60000
- mem_max = 60000
- when "c1.medium"
- mem_min = 900
- mem_max = 900
- when "c1.xlarge"
- mem_min = 6000
- mem_max = 6000
- else
- raise Chef::Exceptions::Env, "Unknown instance identifier: #{node[:ec2][:instance_type]}"
- end
-else
- # assume developer VM
- mem_min = 256
- mem_max = 256
-end
-
-template "#{service_dir}/service/elasticsearch.conf" do
- source "service-elasticsearch.conf.erb"
- owner node[:elasticsearch][:user]
- group node[:elasticsearch][:group]
- mode "0644"
- variables(
- :mem_min => mem_min,
- :mem_max => mem_max,
- :es_home => node[:elasticsearch][:home]
- )
-end
-
-service "elasticsearch" do
- action :start
-end
@@ -1,19 +0,0 @@
-cluster:
- name: <%=node[:elasticsearch][:cluster] %>
-
-network:
- host: <%=node[:ec2][:local_ipv4] %>
-
-path:
- logs: <%=node[:elasticsearch][:basedir] %>/elasticsearch-logs
- data: <%=node[:elasticsearch][:ebsdir] %>/elasticsearch-data
-
-<% if node[:ec2] -%>
-bootstrap:
- mlockall: true
-<% end -%>
-
-<% if ::EasyBib.is_aws(node) -%>
-#discovery.zen.ping.unicast:
-# hosts:
-<% end -%>
@@ -1,8 +0,0 @@
-server {
- listen 8983; # solr standard port, sorry elasticsearch :D
-
- location /elasticsearch/ {
- rewrite ^/elasticsearch/(.*)$ /$1 break;
- proxy_pass http://127.0.0.1:9200;
- }
-}
@@ -1,131 +0,0 @@
-set.default.ES_HOME=<%= @es_home %>
-set.default.ES_MIN_MEM=<%= @mem_min %>
-set.default.ES_MAX_MEM=<%= @mem_max %>
-
-#********************************************************************
-# Wrapper Timeout Properties
-#********************************************************************
-# How long to wait for the JVM to start (in seconds)
-wrapper.startup.timeout=300
-# How long to wait for the JVM to stop (in seconds)
-wrapper.shutdown.timeout=300
-# When a ping will timeout to consider the JVM hung (in seconds)
-wrapper.ping.timeout=300
-
-#********************************************************************
-# Wrapper Java Properties
-#********************************************************************
-# Java Application
-wrapper.java.command=java
-
-# Tell the Wrapper to log the full generated Java command line.
-#wrapper.java.command.loglevel=INFO
-
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-wrapper.working.dir=%ES_HOME%
-
-# Java Classpath (include wrapper.jar) Add class path elements as
-# needed starting from 1
-wrapper.java.classpath.1=%ES_HOME%/bin/service/lib/wrapper.jar
-wrapper.java.classpath.2=%ES_HOME%/lib/*.jar
-wrapper.java.classpath.3=%ES_HOME%/lib/sigar/*.jar
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=%ES_HOME%/bin/service/lib
-
-# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
-wrapper.java.additional.auto_bits=TRUE
-
-# Java Additional Parameters
-wrapper.java.additional.1=-Delasticsearch-service
-wrapper.java.additional.2=-Des-foreground=yes
-wrapper.java.additional.3=-Des.path.home=%ES_HOME%
-wrapper.java.additional.4=-Djline.enabled=true
-wrapper.java.additional.5=-XX:+UseParNewGC
-wrapper.java.additional.6=-XX:+UseConcMarkSweepGC
-wrapper.java.additional.7=-XX:+CMSParallelRemarkEnabled
-wrapper.java.additional.8=-XX:SurvivorRatio=8
-wrapper.java.additional.9=-XX:MaxTenuringThreshold=1
-wrapper.java.additional.10=-XX:CMSInitiatingOccupancyFraction=75
-wrapper.java.additional.11=-XX:+UseCMSInitiatingOccupancyOnly
-wrapper.java.additional.12=-XX:+HeapDumpOnOutOfMemoryError
-# wrapper.java.additional.13=-XX:+AggressiveOpts
-
-# Initial Java Heap Size (in MB)
-wrapper.java.initmemory=%ES_MIN_MEM%
-
-# Maximum Java Heap Size (in MB)
-wrapper.java.maxmemory=%ES_MAX_MEM%
-
-# Application parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.elasticsearch.bootstrap.Bootstrap
-
-#********************************************************************
-# Wrapper Logging Properties
-#********************************************************************
-# Enables Debug output from the Wrapper.
-# wrapper.debug=TRUE
-
-# Format of output for the console. (See docs for formats)
-wrapper.console.format=PM
-
-# Log Level for console output. (See docs for log levels)
-wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging.
-wrapper.logfile=%ES_HOME%/work/logs/service.log
-
-# Format of output for the log file. (See docs for formats)
-wrapper.logfile.format=LPTM
-
-# Log Level for log file output. (See docs for log levels)
-wrapper.logfile.loglevel=INFO
-
-# Maximum size that the log file will be allowed to grow to before
-# the log is rolled. Size is specified in bytes. The default value
-# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
-# 'm' (mb) suffix. For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=0
-
-# Maximum number of rolled log files which will be allowed before old
-# files are deleted. The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=0
-
-# Log Level for sys/event log output. (See docs for log levels)
-wrapper.syslog.loglevel=NONE
-
-#********************************************************************
-# Wrapper General Properties
-#********************************************************************
-# Allow for the use of non-contiguous numbered properties
-wrapper.ignore_sequence_gaps=TRUE
-
-# Title to use when running as a console
-wrapper.console.title=ElasticSearch
-
-#********************************************************************
-# Wrapper Windows NT/2000/XP Service Properties
-#********************************************************************
-# WARNING - Do not modify any of these properties when an application
-# using this configuration file has been installed as a service.
-# Please uninstall the service before modifying this section. The
-# service can then be reinstalled.
-
-# Name of the service
-wrapper.name=ElasticSearch
-
-# Display name of the service
-wrapper.displayname=ElasticSearch
-
-# Description of the service
-wrapper.description=Open Source, Distributed, RESTful Search Engine
-
-# Service dependencies. Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed. AUTO_START, DELAY_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
View
@@ -1,8 +1,9 @@
+name "ezproxy"
maintainer "Till Klampaeckel"
maintainer_email "till@lagged.biz"
license "BSD License"
description "Installs the EzProxy proxy server."
version "0.1"
recipe "ezproxy::server", "Installs EzProxy"
-supports 'ubuntu'
+supports 'ubuntu'
Oops, something went wrong.

0 comments on commit 5f9fed3

Please sign in to comment.