auser-poolparty 0.2.38 → 0.2.39

data/lib/erlang/cloudpanel/priv/www/stylesheets/classes.css

@@ -0,0 +1,2 @@
+.clear {
+  clear: both; }

data/lib/erlang/cloudpanel/priv/www/stylesheets/colors.css

@@ -0,0 +1,8 @@
+.blue {
+  color: #0077CC; }
+
+.dark {
+  color: #333333; }
+
+.offwhite {
+  color: #EEEEEE; }

data/lib/erlang/cloudpanel/priv/www/stylesheets/nav.css

@@ -0,0 +1,18 @@
+#nav {
+  padding-right: 0 10px;
+  margin: 0 10px 10px 0; }
+  #nav #navmenu ul {
+    display: inline;
+    list-style-type: none; }
+    #nav #navmenu ul li {
+      padding: 0;
+      margin: 0; }
+    #nav #navmenu ul a {
+      color: #FFF;
+      background: #036;
+      display: block;
+      padding: .3em 0;
+      text-decoration: none; }
+    #nav #navmenu ul a:hover {
+      background: #369;
+      color: #EEE; }

data/lib/erlang/cloudpanel/src/Makefile

@@ -0,0 +1,9 @@
+include ../support/include.mk
+
+all: $(EBIN_FILES)
+
+debug:
+	$(MAKE) DEBUG=-DDEBUG
+
+clean:
+	rm -rf $(EBIN_FILES)

data/lib/erlang/cloudpanel/src/cloudpanel.app

@@ -0,0 +1,14 @@
+{application, cloudpanel,
+ [{description, "cloudpanel"},
+  {vsn, "0.01"},
+  {modules, [
+    cloudpanel,
+    cloudpanel_app,
+    cloudpanel_sup,
+    cloudpanel_web,
+    cloudpanel_deps
+  ]},
+  {registered, []},
+  {mod, {cloudpanel_app, []}},
+  {env, []},
+  {applications, [kernel, stdlib, crypto]}]}.

data/lib/erlang/cloudpanel/src/cloudpanel.erl

@@ -0,0 +1,30 @@
+%% @author author <author@example.com>
+%% @copyright YYYY author.
+
+%% @doc TEMPLATE.
+
+-module(cloudpanel).
+-author('author <author@example.com>').
+-export([start/0, stop/0]).
+
+ensure_started(App) ->
+    case application:start(App) of
+        ok ->
+            ok;
+        {error, {already_started, App}} ->
+            ok
+    end.
+        
+%% @spec start() -> ok
+%% @doc Start the cloudpanel server.
+start() ->
+    cloudpanel_deps:ensure(),
+    ensure_started(crypto),
+    application:start(cloudpanel).
+
+%% @spec stop() -> ok
+%% @doc Stop the cloudpanel server.
+stop() ->
+    Res = application:stop(cloudpanel),
+    application:stop(crypto),
+    Res.

data/lib/erlang/cloudpanel/src/cloudpanel.hrl

@@ -0,0 +1 @@
+

data/lib/erlang/cloudpanel/src/cloudpanel_app.erl

@@ -0,0 +1,22 @@
+%% @author author <author@example.com>
+%% @copyright YYYY author.
+
+%% @doc Callbacks for the cloudpanel application.
+
+-module(cloudpanel_app).
+-author('author <author@example.com>').
+
+-behaviour(application).
+-export([start/2,stop/1]).
+
+
+%% @spec start(_Type, _StartArgs) -> ServerRet
+%% @doc application start callback for cloudpanel.
+start(_Type, _StartArgs) ->
+    cloudpanel_deps:ensure(),
+    cloudpanel_sup:start_link().
+
+%% @spec stop(_State) -> ServerRet
+%% @doc application stop callback for cloudpanel.
+stop(_State) ->
+    ok.

data/lib/erlang/cloudpanel/src/cloudpanel_deps.erl

@@ -0,0 +1,84 @@
+%% @author author <author@example.com>
+%% @copyright YYYY author.
+
+%% @doc Ensure that the relatively-installed dependencies are on the code
+%%      loading path, and locate resources relative
+%%      to this application's path.
+
+-module(cloudpanel_deps).
+-author('author <author@example.com>').
+
+-export([ensure/0, ensure/1]).
+-export([get_base_dir/0, get_base_dir/1]).
+-export([local_path/1, local_path/2]).
+-export([deps_on_path/0, new_siblings/1]).
+
+%% @spec deps_on_path() -> [ProjNameAndVers]
+%% @doc List of project dependencies on the path.
+deps_on_path() ->
+    F = fun (X, Acc) ->
+                ProjDir = filename:dirname(X),
+                case {filename:basename(X),
+                      filename:basename(filename:dirname(ProjDir))} of
+                    {"ebin", "deps"} ->
+                        [filename:basename(ProjDir) | Acc];
+                    _ ->
+                        Acc
+                end
+        end,
+    ordsets:from_list(lists:foldl(F, [], code:get_path())).
+    
+%% @spec new_siblings(Module) -> [Dir]
+%% @doc Find new siblings paths relative to Module that aren't already on the
+%%      code path.
+new_siblings(Module) ->
+    Existing = deps_on_path(),
+    SiblingEbin = filelib:wildcard(local_path(["deps", "*", "ebin"], Module)),
+    Siblings = [filename:dirname(X) || X <- SiblingEbin,
+                           ordsets:is_element(
+                             filename:basename(filename:dirname(X)),
+                             Existing) =:= false],
+    lists:filter(fun filelib:is_dir/1, 
+                 lists:append([[filename:join([X, "ebin"]),
+                                filename:join([X, "include"])] ||
+                                  X <- Siblings])).
+        
+
+%% @spec ensure(Module) -> ok
+%% @doc Ensure that all ebin and include paths for dependencies
+%%      of the application for Module are on the code path.
+ensure(Module) ->
+    code:add_paths(new_siblings(Module)),
+    code:clash(),
+    ok.
+
+%% @spec ensure() -> ok
+%% @doc Ensure that the ebin and include paths for dependencies of
+%%      this application are on the code path. Equivalent to
+%%      ensure(?Module).
+ensure() ->
+    ensure(?MODULE).
+
+%% @spec get_base_dir(Module) -> string()
+%% @doc Return the application directory for Module. It assumes Module is in
+%%      a standard OTP layout application in the ebin or src directory.
+get_base_dir(Module) ->
+    {file, Here} = code:is_loaded(Module),
+    filename:dirname(filename:dirname(Here)).
+
+%% @spec get_base_dir() -> string()
+%% @doc Return the application directory for this application. Equivalent to
+%%      get_base_dir(?MODULE).
+get_base_dir() ->
+    get_base_dir(?MODULE).
+
+%% @spec local_path([string()], Module) -> string()
+%% @doc Return an application-relative directory from Module's application.
+local_path(Components, Module) ->
+    filename:join([get_base_dir(Module) | Components]).
+
+%% @spec local_path(Components) -> string()
+%% @doc Return an application-relative directory for this application.
+%%      Equivalent to local_path(Components, ?MODULE).
+local_path(Components) ->
+    local_path(Components, ?MODULE).

data/lib/erlang/cloudpanel/src/cloudpanel_sup.erl

@@ -0,0 +1,54 @@
+%% @author author <author@example.com>
+%% @copyright YYYY author.
+
+%% @doc Supervisor for the cloudpanel application.
+
+-module(cloudpanel_sup).
+-author('author <author@example.com>').
+
+-behaviour(supervisor).
+
+%% External exports
+-export([start_link/0, upgrade/0]).
+
+%% supervisor callbacks
+-export([init/1]).
+
+%% @spec start_link() -> ServerRet
+%% @doc API for starting the supervisor.
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%% @spec upgrade() -> ok
+%% @doc Add processes if necessary.
+upgrade() ->
+    {ok, {_, Specs}} = init([]),
+
+    Old = sets:from_list(
+            [Name || {Name, _, _, _} <- supervisor:which_children(?MODULE)]),
+    New = sets:from_list([Name || {Name, _, _, _, _, _} <- Specs]),
+    Kill = sets:subtract(Old, New),
+
+    sets:fold(fun (Id, ok) ->
+                      supervisor:terminate_child(?MODULE, Id),
+                      supervisor:delete_child(?MODULE, Id),
+                      ok
+              end, ok, Kill),
+
+    [supervisor:start_child(?MODULE, Spec) || Spec <- Specs],
+    ok.
+
+%% @spec init([]) -> SupervisorTree
+%% @doc supervisor callback.
+init([]) ->
+    Ip = case os:getenv("MOCHIWEB_IP") of false -> "0.0.0.0"; Any -> Any end,   
+    WebConfig = [
+         {ip, Ip},
+                 {port, 8000},
+                 {docroot, cloudpanel_deps:local_path(["priv", "www"])}],
+    Web = {cloudpanel_web,
+           {cloudpanel_web, start, [WebConfig]},
+           permanent, 5000, worker, dynamic},
+
+    Processes = [Web],
+    {ok, {{one_for_one, 10, 10}, Processes}}.

data/lib/erlang/cloudpanel/src/cloudpanel_web.erl

@@ -0,0 +1,45 @@
+%% @author Ari Lerner <ari.lerner@citrusbyte.com>
+%% @copyright 2008 Ari Lerner.
+
+%% @doc PoolParty panel
+
+-module (cloudpanel_web).
+-author('Ari Lerner <ari.lerner@citrusbyte.com>').
+
+-export([start/1, stop/0, loop/2]).
+
+-define(TIMEOUT, 20000).
+
+%% External API
+
+start(Options) ->
+    {DocRoot, Options1} = get_option(docroot, Options),
+    Loop = fun (Req) ->
+                   ?MODULE:loop(Req, DocRoot)
+           end,
+    mochiweb_http:start([{name, ?MODULE}, {loop, Loop} | Options1]).
+
+stop() ->
+    mochiweb_http:stop(?MODULE).
+
+loop(Req, DocRoot) ->
+    "/" ++ Path = Req:get(path),
+    case Req:get(method) of
+        Method when Method =:= 'GET'; Method =:= 'HEAD' ->
+            case Path of
+                _ ->
+                    Req:serve_file(Path, DocRoot)
+            end;
+        'POST' ->
+            case Path of
+                _ ->
+                    Req:not_found()
+            end;
+        _ ->
+            Req:respond({501, [], []})
+    end.
+
+%% Internal API
+
+get_option(Option, Options) ->
+    {proplists:get_value(Option, Options), proplists:delete(Option, Options)}.

data/lib/erlang/cloudpanel/start-dev.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd `dirname $0`
+exec erl -pa $PWD/ebin $PWD/deps/*/ebin -boot start_sasl -s reloader -s cloudpanel

data/lib/erlang/cloudpanel/start.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd `dirname $0`
+exec erl -pa $PWD/ebin $PWD/deps/*/ebin -boot start_sasl -s cloudpanel

data/lib/erlang/cloudpanel/support/include.mk

@@ -0,0 +1,46 @@
+## -*- makefile -*-
+
+######################################################################
+## Erlang
+
+ERL := erl
+ERLC := $(ERL)c
+
+INCLUDE_DIRS := ../include $(wildcard ../deps/*/include)
+EBIN_DIRS := $(wildcard ../deps/*/ebin)
+ERLC_FLAGS := -W $(INCLUDE_DIRS:../%=-I ../%) $(EBIN_DIRS:%=-pa %)
+
+ifndef no_debug_info
+  ERLC_FLAGS += +debug_info
+endif
+
+ifdef debug
+  ERLC_FLAGS += -Ddebug
+endif
+
+EBIN_DIR := ../ebin
+DOC_DIR  := ../doc
+EMULATOR := beam
+
+ERL_SOURCES := $(wildcard *.erl)
+ERL_HEADERS := $(wildcard *.hrl) $(wildcard ../include/*.hrl)
+ERL_OBJECTS := $(ERL_SOURCES:%.erl=$(EBIN_DIR)/%.$(EMULATOR))
+ERL_DOCUMENTS := $(ERL_SOURCES:%.erl=$(DOC_DIR)/%.html)
+ERL_OBJECTS_LOCAL := $(ERL_SOURCES:%.erl=./%.$(EMULATOR))
+APP_FILES := $(wildcard *.app)
+EBIN_FILES = $(ERL_OBJECTS) $(ERL_DOCUMENTS) $(APP_FILES:%.app=../ebin/%.app)
+EBIN_FILES_NO_DOCS = $(ERL_OBJECTS) $(APP_FILES:%.app=../ebin/%.app)
+MODULES = $(ERL_SOURCES:%.erl=%)
+
+../ebin/%.app: %.app
+	cp $< $@
+
+$(EBIN_DIR)/%.$(EMULATOR): %.erl
+	$(ERLC) $(ERLC_FLAGS) -o $(EBIN_DIR) $<
+
+./%.$(EMULATOR): %.erl
+	$(ERLC) $(ERLC_FLAGS) -o . $<
+
+$(DOC_DIR)/%.html: %.erl
+	$(ERL) -noshell -run edoc file $< -run init stop
+	mv *.html $(DOC_DIR)

data/lib/poolparty.rb

@@ -16,7 +16,7 @@ ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
 ## Load PoolParty
 require "#{File.dirname(__FILE__)}/poolparty/version"
 
-%w(core modules exceptions aska dependency_resolutions monitors net).each do |dir|
+%w(core modules exceptions dependency_resolutions aska monitors net).each do |dir|
   Dir[File.dirname(__FILE__) + "/poolparty/#{dir}/**.rb"].each do |file|
     require file
   end

data/lib/poolparty/aska/aska.rb

@@ -4,7 +4,7 @@
 =end
 module Aska
   module ClassMethods
-    def rules(name=:rules, arr=[])
+    def rules(name=:rules, arr=[], create_vars=true)
       returning look_up_rules(name) do |rs|
         arr.each do |line|
           next unless line
@@ -12,7 +12,7 @@ module Aska
           v = line[/(.+)[=\\<>](.*)/, 2].gsub(/\s+/, '')
           m = line[/[=\\<>]/, 0].gsub(/\s+/, '')
           
-          create_instance_variable(k)
+          create_instance_variable(k, create_vars)
           rs << {k => [m, v]}
           rs << {k => [">", "0"]} unless rs.reject {|a| a.to_s == "#{k}>0" }
         end
@@ -21,10 +21,12 @@ module Aska
         end        
       end
     end
-    def create_instance_variable(k)
+    def create_instance_variable(k, create_vars=true)
       aska_attr_accessors << k.to_sym unless aska_attr_accessors.include?(k.to_sym)
-      attr_reader k.to_sym unless respond_to?("#{k}".to_sym)
-      attr_writer k.to_sym unless respond_to?("#{k}=".to_sym)
+      if create_vars
+        attr_reader k.to_sym unless respond_to?("#{k}".to_sym)
+        attr_writer k.to_sym unless respond_to?("#{k}=".to_sym)
+      end
     end
     def look_up_rules(name)
       defined_rules[name.to_sym] ||= Rules.new
@@ -70,10 +72,10 @@ module Aska
     def rules_values
       returning Array.new do |arr|
         self.class.defined_rules.each do |name,rule_array|
-          arr << name
+          arr << "#{name} : #{valid_rule?(rule_array)}"
           rule_array.each do |rule|
             rule.map do |k,v|
-              arr << "#{k} -> #{__aska_aska_stuff(k)} (#{v[0]} #{v[1]})"
+              arr << "  #{k} -> #{__aska_aska_stuff(k)} (#{v[0]} #{v[1]})"
             end
           end
         end

data/lib/poolparty/base_packages/haproxy.rb

@@ -4,7 +4,7 @@ module PoolParty
       
       def enable
         execute_on_master do
-          package({:name => "haproxy"})
+          has_package({:name => "haproxy"})
 
           # Restart sysklogd after we update the haproxy.log
           has_service(:name => "sysklogd") do

data/lib/poolparty/base_packages/poolparty.rb

@@ -40,8 +40,8 @@ module PoolParty
           
           has_gempackage(:name => "poolparty-latest", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")])
           
-          has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty-latest"), :ifnot => "ps aux | grep beam | grep node")
-          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"), :ifnot => "ps aux | grep beam | grep node")
+          has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty-latest"), :onlyif => "ps aux | grep beam | grep node")
+          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"), :onlyif => "ps aux | grep beam | grep node")
           
         end
         

data/lib/poolparty/helpers/provisioner_base.rb

@@ -93,6 +93,8 @@ module PoolParty
           
           before_install(@instance)
           
+          process_clean_reconfigure_for!(@instance, testing)
+          
           vputs "Logging in and running provisioning on #{@instance.name}"
           cmd = "cd #{Base.remote_storage_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh; rm install_#{name}.sh"
           verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
@@ -136,8 +138,9 @@ module PoolParty
         vputs "Cleaning certs from master: #{instance.name}"
         # puppetca --clean #{instance.name}.compute-1.internal; puppetca --clean #{instance.name}.ec2.internal
         # find /etc/puppet/ssl -type f -exec rm {} \;
-        command = instance.master? ?  "if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi" : "rm -rf /etc/puppet/ssl"
-        @cloud.run_command_on(command, instance) unless testing
+        @cloud.run_command_on("rm -rf /etc/puppet/ssl", instance) unless testing || instance.master?
+        # @cloud.run_command_on("if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi", @cloud.master) unless testing
+        @cloud.run_command_on("puppetca --clean #{instance.name}.compute-1.internal ; puppetca --clean #{instance.name}.ec2.internal", @cloud.master) unless testing
       end
       def process_reconfigure!(testing=false)        
         @cloud.run_command_on(RemoteInstance.puppet_runner_command, @instance) unless testing
@@ -182,6 +185,7 @@ module PoolParty
           "#!/usr/bin/env sh",
           upgrade_system,
           fix_rubygems,
+          make_logger_directory,
           install_puppet,
           custom_install_tasks
         ] << install_tasks
@@ -293,6 +297,10 @@ fi
         "#{installer_for( puppet_packages )}"
       end
       
+      def make_logger_directory
+        "mkdir -p /var/logs/poolparty"
+      end
+      
       def create_poolparty_manifest
         <<-EOS
           cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes