salted-rails 0.0.7 → 0.0.8

data/lib/salted-rails/capistrano_helper.rb

@@ -10,7 +10,7 @@ require 'salted-rails/helper_base'
 module SaltedRails
   class CapistranoHelper < HelperBase
 
-    def initialize(rails_root, logger = Log4r::Logger.new("salted_rails::capistrano_helper"))
+    def initialize(project_root, logger = Log4r::Logger.new("salted_rails::capistrano_helper"))
       super(rail_root, logger)
     end
 
@@ -55,7 +55,7 @@ module SaltedRails
 #      # Provisioning #2: masterless highstate call
 #      config.vm.provision :salt do |salt|
 #        @logger.info 'Configuring salt provisioner'  if @logger
-#        minion_file = @rails_root + 'config/salt/vagrant/minion'
+#        minion_file = @project_root + 'config/salt/vagrant/minion'
 #        minion_file = @salt_root + 'salt/vagrant/minion' unless File.exists? minion_file
 #        salt.minion_config = minion_file
 #        salt.run_highstate = true
@@ -75,7 +75,7 @@ module SaltedRails
 #      configure_memory(memory)
 #      vm_config.vm.boot_mode == :gui 
 #      vm_config.vm.provision :salt do |salt|
-#        minion_file = @rails_root + 'config/salt/vagrant/gui_minion'
+#        minion_file = @project_root + 'config/salt/vagrant/gui_minion'
 #        minion_file = @salt_root + 'salt/vagrant/gui_minion' unless File.exists? minion_file
 #        salt.minion_config = minion_file
 #      end

data/lib/salted-rails/config.rb

@@ -7,11 +7,10 @@ require 'log4r'
 module SaltedRails
   class Config
 
+    attr_accessor :admin_password
     attr_accessor :box
     attr_accessor :ca_path
     attr_accessor :copy_from_home
-    attr_accessor :admin_password
-    attr_accessor :web_password
     attr_accessor :databases
     attr_accessor :domain
     attr_accessor :files
@@ -21,16 +20,17 @@ module SaltedRails
     attr_accessor :logger
     attr_accessor :machine
     attr_accessor :machines
+    attr_accessor :mapped_ports
     attr_accessor :memory
     attr_accessor :mirror
     attr_accessor :packages
     attr_accessor :ports
-    attr_accessor :mapped_ports
     attr_accessor :private_key_path
-    attr_accessor :rails_root
+    attr_accessor :project_root
     attr_accessor :region
     attr_accessor :roles
     attr_accessor :salt_root
+    attr_accessor :staging_password
     attr_accessor :sync_vagrant
     attr_accessor :versions
 
@@ -39,17 +39,17 @@ module SaltedRails
     end
 
     # pass vm.ui for the logger if you want debugging info
-    def initialize(rails_root, machine = 'default')
+    def initialize(project_root, machine = 'default')
       @logger = Log4r::Logger.new("vagrant::salted-rails")
       @machine = machine
-      @rails_root = rails_root
-      @rails_root += '/' unless @rails_root =~ /\/$/
+      @project_root = project_root
+      @project_root += '/' unless @project_root =~ /\/$/
       @salt_root = nil
       # see salt/vagrant/top.sls for other roles
       @roles = %w{ app web db }
       @domain = nil
       @admin_password = nil
-      @web_password = nil
+      @staging_password = nil
       @private_key_path = nil
       @mirror = nil
       @memory = nil
@@ -60,18 +60,18 @@ module SaltedRails
       @ca_path = nil
       @region = nil
       @forward_agent = true
-      @files = [ '.ruby-version', '.java-version', '.php-version', 'config/database.yml', 'Gemfile', 'Gemfile.lock' ].select{ |f| File.exist?(@rails_root + f) }
+      @files = [ '.ruby-version', '.java-version', '.php-version', 'config/database.yml', 'Gemfile', 'Gemfile.lock' ].select{ |f| File.exist?(@project_root + f) }
       @packages = nil
       @copy_from_home = [ ]
 
       ENV['REMOTE_MACHINE'] = 'true'
-      database_file = @rails_root + 'config/database.yml'
+      database_file = @project_root + 'config/database.yml'
       @databases = YAML.load(ERB.new(IO.read(database_file)).result) rescue { }
       ENV['REMOTE_MACHINE'] = nil
 
       @gems = { }
-      if File.exists? @rails_root + 'Gemfile'
-        File.foreach(@rails_root + 'Gemfile') do |line|
+      if File.exists? @project_root + 'Gemfile'
+        File.foreach(@project_root + 'Gemfile') do |line|
           if line =~ /^\s*gem\s*['"]([^'"]+)['"][,\s]*(['"]([^'"]+)['"])?/
             gem = $1
             version = $3.to_s
@@ -96,6 +96,71 @@ module SaltedRails
       @roles.include? 'gui'
     end
 
+    def define(machine, &block)
+      obj = self.clone
+      obj.machine = machine
+      obj.machines = [ ]
+      obj.logger = @logger
+      @machines << obj
+      yield(obj) if block_given?
+    end
+
+    def provider
+      pat = File.join(@project_root, '.vagrant','machines',@machine,'*','id')
+      prov = Dir.glob(pat).collect{|path| File.basename(File.dirname(path))}.first
+      prov ||= ARGV.select{|a| a =~ /^--provider=/}.collect{|a| a.sub(/.*=/, '')}.first
+      prov ||= ENV['VAGRANT_DEFAULT_PROVIDER'] || 'virtualbox'
+      prov
+    end
+
+    # Clone
+    def clone
+      obj = self.dup
+      obj.roles = @roles.dup
+      obj.ports = @ports.dup
+      obj.mapped_ports = @mapped_ports.dup
+      obj.files = @files.dup
+      obj.copy_from_home = @copy_from_home.dup
+      obj.databases = @databases.dup
+      obj.gems = @gems.dup
+      obj
+    end
+
+    def to_hash
+      {
+        'admin_password' => @admin_password,
+        'databases' => @databases,
+        'disable_vagrant_sync' => @disable_vagrant_sync,
+        'domain' => @domain,
+        'files' => @files,
+        'forward_agent' => @forward_agent,
+        'gems' => @gems,
+        'hostname' => @hostname,
+        'machine' => @machine,
+        'mapped_ports' => @mapped_ports,
+        'memory' => @memory,
+        'mirror' => @mirror,
+        'ports' => @ports,
+        'region' => @region,
+        'roles' => @roles,
+        'provider' => provider,
+        'staging_password' => @staging_password,
+        'versions' => @versions
+      }
+    end
+
+    def to_yaml
+      normalize
+      self.to_hash.to_yaml
+    end
+
+    def configure_vagrant(config)
+      require 'salted-rails/vagrant_helper'
+      normalize
+      helper = SaltedRails::VagrantHelper.new(self)
+      helper.configure_vagrant(config)
+    end
+
     def normalize
       @versions['mysql'] ||= '5.5' if @roles.include?('mysql')
       @versions['teamcity'] ||= '8.0.4' if @roles.include?('teamcity')
@@ -103,13 +168,13 @@ module SaltedRails
       @roles << 'gui' if @roles.include?('rubymine') and not @roles.include?('gui')
 
       %w{ ruby php java }.each do |lang|
-        version = File.open(@rails_root + ".#{lang}-version", 'r') do |f_in|
+        version = File.open(@project_root + ".#{lang}-version", 'r') do |f_in|
           f_in.gets.gsub(/\s/,'')
         end rescue nil
         @versions[lang] ||= version if version
       end
       unless @versions.include?('ruby')
-        File.open(@rails_root + '.rvmrc', 'r') do |f_in|
+        File.open(@project_root + '.rvmrc', 'r') do |f_in|
           while (line = f_in.gets) and not @versions.include('ruby')
             @versions['ruby'] = $1 if line =~ /^\s*environment_id=['"]([^"'@]+)/
           end
@@ -131,7 +196,7 @@ module SaltedRails
         if @hostname
           @domain = @hostname.sub(/^[^.]*\.?/, '')
         else
-          @domain = sanitize_dns_name(File.basename(File.expand_path(@rails_root).sub(/\/$/, '').sub(/\/(app|site|web|www|website)\d*$/, ''))) + '.test'
+          @domain = sanitize_dns_name(File.basename(File.expand_path(@project_root).sub(/\/$/, '').sub(/\/(app|site|web|www|website)\d*$/, ''))) + '.test'
           @domain = 'railsapp.test' if @domain == '.test'
         end
       end
@@ -153,8 +218,8 @@ module SaltedRails
       @mirror ||= 'auto'
       @salt_root ||= File.dirname(__FILE__) + '/../../'
       @ca_path ||= '/etc/ssl/certs/ca-certificates.crt'
+      @ca_path = nil unless  File.exist?(@ca_path)
       @box ||= 'preciseCloud32'
-      @ca_path = nil unless File.exist?(@ca_path)
       @region ||= 'San Francisco 1'
 
       {
@@ -164,65 +229,13 @@ module SaltedRails
         @ports << port if @roles.include?(role) and not @ports.include?(port)
       end
 
-      @sync_vagrant = true if @sync_vagrant.nil?
+      @sync_vagrant = (provider == 'virtualbox') if @sync_vagrant.nil?
 
+      unless @roles.include?('secure') or @roles.include?('insecure')
+        @roles << (provider == 'virtualbox' ? 'insecure' : 'secure')
+      end
       @machines.each {|m| m.normalize}
     end
 
-    def define(machine, &block)
-      obj = self.clone
-      obj.machine = machine
-      obj.machines = [ ]
-      obj.logger = @logger
-      @machines << obj
-      yield(obj) if block_given?
-    end
-
-    # Clone
-    def clone
-      obj = self.dup
-      obj.roles = @roles.dup
-      obj.ports = @ports.dup
-      obj.files = @files.dup
-      obj.copy_from_home = @copy_from_home.dup
-      obj.databases = @databases.dup
-      obj.gems = @gems.dup
-      obj
-    end
-
-    def to_hash
-      {
-        'admin_password' => @admin_password,
-        'databases' => @databases,
-        'disable_vagrant_sync' => @disable_vagrant_sync,
-        'domain' => @domain,
-        'files' => @files,
-        'forward_agent' => @forward_agent,
-        'gems' => @gems,
-        'hostname' => @hostname,
-        'machine' => @machine,
-        'mapped_ports' => @mapped_ports,
-        'memory' => @memory,
-        'mirror' => @mirror,
-        'ports' => @ports,
-        'region' => @region,
-        'roles' => @roles,
-        'user_password' => @user_password,
-        'versions' => @versions
-      }
-    end
-
-    def to_yaml
-      normalize
-      self.to_hash.to_yaml
-    end
-
-    def configure_vagrant(config)
-      require 'salted-rails/vagrant_helper'
-      normalize
-      helper = SaltedRails::VagrantHelper.new(self)
-      helper.configure_vagrant(config)
-    end
-
   end
 end

data/lib/salted-rails/helper_base.rb

@@ -13,7 +13,7 @@ module SaltedRails
 
     def initialize(config)
       @config = config
-      @config.logger.info "SaltedRails: Helper created with config.rails_root = #{@config.rails_root}"
+      @config.logger.info "SaltedRails: Helper created with config.project_root = #{@config.project_root}"
     end
 
     private
@@ -25,7 +25,7 @@ module SaltedRails
 #
 #      # Create custom files
 #      [ 'pillar/vagrant', 'pillar/capistrano', 'salt/vagrant', 'salt/capistrano'].each do |custom|
-#        file = @config.rails_root + 'config/' + custom + '.sls'
+#        file = @config.project_root + 'config/' + custom + '.sls'
 #        dir = File.dirname(file)
 #        unless File.directory? dir
 #          FileUtils.mkdir_p dir
@@ -41,12 +41,13 @@ module SaltedRails
 
     def pillarize_application_configuration
       @config.logger.info 'SaltedRails: Creating pillar application data' 
+      @config.normalize
 
       # Destination
-      salt_dir = @config.rails_root + 'tmp/salt/'
+      salt_dir = @config.project_root + 'tmp/salt/'
       FileUtils.rm_rf salt_dir if File.directory? salt_dir
       FileUtils.mkdir_p salt_dir unless File.directory? salt_dir
-      pillar_dir = @config.rails_root + 'tmp/pillar/'
+      pillar_dir = @config.project_root + 'tmp/pillar/'
       FileUtils.rm_rf pillar_dir if File.directory? pillar_dir
       FileUtils.mkdir_p pillar_dir unless File.directory? pillar_dir
       pillar_app_file = pillar_dir + 'railsapp.sls'
@@ -57,12 +58,12 @@ module SaltedRails
         unless File.directory? dir
           FileUtils.mkdir_p dir
         end
-        FileUtils.cp(@config.rails_root + f, dest)
+        FileUtils.cp(@config.project_root + f, dest)
       end
       dest = salt_dir + 'packages.txt'
       if @config.packages
         src = @config.packages
-        src = @config.rails_root + src unless src =~ /^\//
+        src = @config.project_root + src unless src =~ /^\//
         dir = File.dirname(dest)
         unless File.directory? dir
           FileUtils.mkdir_p dir
@@ -92,7 +93,7 @@ module SaltedRails
       File.open(pillar_app_file, 'w') do |f_out|
         if_command = 'if'
         @config.machines.each do |machine_config|
-          f_out.puts "{% #{if_command} grains['fqdn'] == '#{machine_config.hostname}' %}"
+          f_out.puts "{% #{if_command} (grains['fqdn'] == '#{machine_config.hostname}') or (grains['fqdn'] == '#{machine_config.machine}') %}"
           if_command = 'elif'
           f_out.puts machine_config.to_yaml
         end

data/lib/salted-rails/vagrant_helper.rb

@@ -12,6 +12,7 @@ module SaltedRails
     end
 
     def configure_vagrant(vagrant_config)
+      @config.normalize
       port_offset = 0
       configure_virtualbox(vagrant_config)
       configure_vbguest(vagrant_config)
@@ -109,10 +110,10 @@ module SaltedRails
 
     def configure_salt(vagrant_config, config = @config)
       config.logger.info "Configuring saltstack (#{config.machine})"
-      vagrant_config.vm.synced_folder config.rails_root + 'config/salt/', '/srv/salt/config/'
-      vagrant_config.vm.synced_folder config.rails_root + 'config/pillar/', '/srv/pillar/config/'
-      vagrant_config.vm.synced_folder config.rails_root + 'tmp/salt/', '/srv/salt/generated/'
-      vagrant_config.vm.synced_folder config.rails_root + 'tmp/pillar/', '/srv/pillar/generated/'
+      vagrant_config.vm.synced_folder config.project_root + 'config/salt/', '/srv/salt/config/'
+      vagrant_config.vm.synced_folder config.project_root + 'config/pillar/', '/srv/pillar/config/'
+      vagrant_config.vm.synced_folder config.project_root + 'tmp/salt/', '/srv/salt/generated/'
+      vagrant_config.vm.synced_folder config.project_root + 'tmp/pillar/', '/srv/pillar/generated/'
       vagrant_config.vm.synced_folder config.salt_root + 'salt/', '/srv/salt/salted-rails/'
       vagrant_config.vm.synced_folder config.salt_root + 'pillar/', '/srv/pillar/salted-rails/'
       # Bootstrap salt
@@ -120,7 +121,7 @@ module SaltedRails
       # Provisioning #2: masterless highstate call
       vagrant_config.vm.provision :salt do |salt|
         config.logger.info 'Configuring salt provisioner'
-        minion_file = config.rails_root + 'config/salt/vagrant/minion'
+        minion_file = config.project_root + 'config/salt/vagrant/minion'
         minion_file = config.salt_root + 'salt/vagrant/minion' unless File.exist?(minion_file)
         salt.minion_config = minion_file
         salt.run_highstate = true
@@ -128,7 +129,8 @@ module SaltedRails
         # current package (salt-minion_0.17.0.1-1precise_all.deb) in ppa:saltstack/salt is broken as of Oct 10 2013:
         # Unable to run multiple states and returns unhelpfull messages about list and get
         salt.install_type = 'git'
-        salt.install_args = 'v0.16.4'
+        #salt.install_args = 'v0.16.4'
+        salt.install_args = 'v0.17.1'
       end
     end
 

data/lib/salted-rails/version.rb

@@ -1,3 +1,3 @@
 module SaltedRails
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/salt/apt/dist_upgrade.sls

@@ -0,0 +1,5 @@
+upgrade_packages:
+  cmd.run:
+    - name: env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade
+    - unless: test -s /srv/salt/generated/packages.txt
+

data/salt/apt/salt_packages.sls

@@ -0,0 +1,8 @@
+salt_packages:
+  pkg.installed:
+    - pkgs:
+      - openssl
+      - python-openssl
+      - python-mysqldb
+      - apache2-utils
+

data/salt/apt/update_packages.sls

@@ -1,5 +1,5 @@
 load_packages:
   cmd.run:
     - name: dpkg --set-selections < /srv/salt/generated/packages.txt && apt-get -u dselect-upgrade
-    - /srv/salt/generated/packages.txt
+    - onlyif: test -s /srv/salt/generated/packages.txt
 

data/salt/bin/change_mirror.sh

@@ -11,29 +11,30 @@ if grep 'http://[a-z.]*archive.ubuntu.com/ubuntu' /etc/apt/sources.list > /dev/n
   case "$1" in
   [a-z][a-z]|usa)
       echo "Configuring mirror for region: $1"
-      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://'"$1"'.archive.ubuntu.com/ubuntu/#' /etc/apt/sources.list
+      sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://'"$1"'.archive.ubuntu.com/ubuntu/#' /etc/apt/sources.list
       ;;
   mirror|auto)
       echo "Configuring automatic selection of mirror"
-      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list
+      sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list
       ;;
   sfo1)
       echo "Configuring mirror for DIGITAL OCEAN: $1"
-      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://mirrors.sfo1.digitalocean.com/ubuntu/#' /etc/apt/sources.list
+      sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://mirrors.sfo1.digitalocean.com/ubuntu/#' /etc/apt/sources.list
       ;;
   internode)
       echo "Configuring mirror for ISP: $1"
-      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://mirror.internode.on.net/pub/ubuntu/ubuntu/#' /etc/apt/sources.list
+      sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#http://mirror.internode.on.net/pub/ubuntu/ubuntu/#' /etc/apt/sources.list
       ;;
   [hmf]*://*ubuntu*)
       echo "Configuring mirror for $1"
-      exec sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#'"$1"'#' /etc/apt/sources.list
+      sed -i.original -e 's#http://[a-z.]*[archivesecurity]*.ubuntu.com/ubuntu#'"$1"'#' /etc/apt/sources.list
       ;;
   *)
       echo "Invalid mirror ($1) ignored!" >&2
       exit 1
       ;;
   esac
+  apt-get update
 else
   echo "/etc/apt/sources.list has already been changed to non ubuntu.com mirror (leaving as is)"
 fi

data/salt/net/ufw.sls

@@ -6,3 +6,7 @@ ufw:
 {%- if 'gui' in pillar['roles'] %}
       - gufw
 {%- endif %}
+  cmd.run:
+    - name: ufw limit ssh ; ufw --force enable
+    - requires:
+      - pkg: ufw

data/salt/top.sls

@@ -3,13 +3,14 @@ base:
     - apt.partner-sources
     - apt.unwanted
     - apt.load_packages
+    - apt.dist_upgrade
+    - apt.salt_packages
     - vagrant.minion
     - www.users
     - utils
     - crons
     - net.hosts
     - net.ntp
-    - net.ufw
     - scm
     - editors.vim
     - lang.ruby
@@ -38,12 +39,23 @@ base:
     - editors.gvim
     - www.chromium
 {%- endif %}
-{%- if 'rubymine' in pillar['versions'] %}
+{%- if 'rubymine' in pillar['roles'] %}
     - editors.rubymine
 {%- endif %}
-{%- if 'teamcity' in pillar['versions'] %}
+{%- if 'teamcity' in pillar['roles'] %}
     - ci.teamcity
 {%- endif %}
 {%- if 'cruisecontrolrb' in pillar['roles'] %}
     - ci.cruisecontrolrb
 {%- endif %}
+{%- if 'secure' in pillar['roles'] %}
+    - net.ufw
+    #TODO: net.fail2ban
+{%- endif %}
+{%- if 'monitored' in pillar['roles'] %}
+    #TODO: - server.monit
+    #TODO: - server.munin
+{%- endif %}
+
+# # cookbook 'ack' ?
+

data/salt/www/nginx/etc/nginx/sites-available/admin.conf

@@ -1,24 +1,30 @@
 server {
-	listen *:880;
 
-{%- if pillar['admin_password'] %}
-        ssl on;
+{%- if 'secure' in pillar['roles'] %}
+	listen 880 ssl;
         ssl_certificate /etc/pki/self_signed/certs/localhost.crt;
         ssl_certificate_key /etc/pki/self_signed/certs/localhost.key;
 
+        error_page 497  https://$http_host$request_uri;
+
+        satisfy all;
+{%- else %}
+	listen 880;
+        satisfy any;
+{%- endif %}
+
+{%- if ('secure' in pillar['roles']) or pillar['admin_password'] %}
         auth_basic           "Restricted site";
         auth_basic_user_file /etc/nginx/admin.d/htpasswd;
 {%- endif %}
 
-        satisfy all;
-
-        # Allow private IP range.
+        # Allow ssh (localhost)
+        allow   127.0.0.0/8;
+        # Allow private IP range (virtualbox)
         allow   10.0.0.0/8;
         allow   172.16.0.0/12;
         allow   192.168.0.0/16;
-
         # todo: add list of dynamic ips - of admins
-
         deny    all;
 
         #listen   [::1]:880 default ipv6only=on; ## listen for ipv6

data/salt/www/nginx/init.sls

@@ -100,20 +100,4 @@ admin-user:
     - require:
       - file: {{ pillar['etc_dir'] }}/nginx/admin.d/htpasswd
 
-#  module.run:
-#    - name: apache.useradd
-#    - pwfile: {{ pillar['etc_dir'] }}/nginx/admin.d/htpasswd
-#    - user: 'admin'
-#    - password: '{{ pillar['admin_password'] }}'
-#    - require:
-#      - file: {{ pillar['etc_dir'] }}/nginx/admin.d/htpasswd
-#
-# Unfortunately this produces an error even when htpasswd is present:
-#    State: - module
-#    Name:      apache.useradd
-#    Function:  run
-#        Result:    False
-#        Comment:   Module function apache.useradd is not available
-#        Changes:
-
 {%- endif %}

data/salt/www/nginx/srv/www/admin/df.php

@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Disk Status</title>
+</head><body>
+<h1>Disk Status</h1>
+<pre>
+<?php
+$output = shell_exec('df -v -h');
+echo htmlspecialchars($output);
+?>
+</pre>
+</body>
+</html>

data/salt/www/nginx/srv/www/admin/dpkg.php

@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Packages</title>
+</head><body>
+<h1>Packages</h1>
+<pre>
+<?php
+$output = shell_exec('dpkg --get-selections');
+echo htmlspecialchars($output);
+?>
+</pre>
+</body>
+</html>

data/salt/www/nginx/srv/www/admin/facter.php

@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Facter></title>
+</head><body>
+<h1>Facter></h1>
+<pre>
+<?php
+$output = shell_exec('facter');
+echo htmlspecialchars($output);
+?>
+</pre>
+</body>
+</html>

data/salt/www/nginx/srv/www/admin/free.php

@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Memory Free</title>
+</head><body>
+<h1>Memory Free (MB)</h1>
+<pre>
+<?php
+$output = shell_exec('free -m');
+echo htmlspecialchars($output);
+?>
+</pre>
+</body>
+</html>

data/salt/www/nginx/srv/www/admin/ifconfig.php

@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Network Interfaces</title>
+</head><body>
+<h1>Network Interfaces</h1>
+<pre>
+<?php
+$output = shell_exec('ifconfig');
+echo htmlspecialchars($output);
+?>
+</pre>
+</body>
+</html>

data/salt/www/nginx/srv/www/admin/index.php

@@ -13,6 +13,17 @@ while (false !== ($entry = $d->read())) {
      }
 }
 $d->close();
+
+function command_exist($cmd) {
+    $returnVal = shell_exec("which $cmd");
+    return !empty($returnVal);
+}
+
+$commands = array('facter' => 'System info', 'df' => 'Disk Free', 'ps' => 'Process Status', 'free' => 'Memory Free Status', 'dpkg' => 'Packages installed', 'ifconfig' => 'Network Interfaces');
+foreach ($commands as $cmd => $desc) {
+   echo '<li><a href="/' . $cmd . '.php">' . $cmd . ' - ' . $desc . "</a>\n";
+}
+
 ?>
 <li><a href="phpinfo.php">phpinfo</a>
 </ul>

data/salt/www/nginx/srv/www/admin/ps.php

@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Process Status</title>
+</head><body>
+<h1>Process Status</h1>
+<pre>
+<?php
+$output = shell_exec('ps axww --forest -O user,pmem');
+echo htmlspecialchars($output);
+?>
+</pre>
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salted-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,8 +69,10 @@ files:
 - pillar/common.sls
 - pillar/vagrant.sls
 - pillar/vagrant/top.sls
+- salt/apt/dist_upgrade.sls
 - salt/apt/load_packages.sls
 - salt/apt/partner-sources.sls
+- salt/apt/salt_packages.sls
 - salt/apt/unwanted.sls
 - salt/apt/update_packages.sls
 - salt/bin/change_mirror.sh
@@ -175,10 +177,16 @@ files:
 - salt/www/nginx/etc/nginx/sites-available/.gitignore
 - salt/www/nginx/etc/nginx/sites-available/admin.conf
 - salt/www/nginx/init.sls
+- salt/www/nginx/srv/www/admin/df.php
+- salt/www/nginx/srv/www/admin/dpkg.php
+- salt/www/nginx/srv/www/admin/facter.php
 - salt/www/nginx/srv/www/admin/favicon.ico
 - salt/www/nginx/srv/www/admin/favicon.png
+- salt/www/nginx/srv/www/admin/free.php
+- salt/www/nginx/srv/www/admin/ifconfig.php
 - salt/www/nginx/srv/www/admin/index.php
 - salt/www/nginx/srv/www/admin/phpinfo.php
+- salt/www/nginx/srv/www/admin/ps.php
 - salt/www/nginx/srv/www/admin/robots.txt
 - salt/www/users.sls
 - salted-rails.gemspec