salted-rails 0.0.6 → 0.0.7

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

@@ -0,0 +1,47 @@
+server {
+	listen *:880;
+
+{%- if pillar['admin_password'] %}
+        ssl on;
+        ssl_certificate /etc/pki/self_signed/certs/localhost.crt;
+        ssl_certificate_key /etc/pki/self_signed/certs/localhost.key;
+
+        auth_basic           "Restricted site";
+        auth_basic_user_file /etc/nginx/admin.d/htpasswd;
+{%- endif %}
+
+        satisfy all;
+
+        # Allow private IP range.
+        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
+        index index.php index.html index.htm;
+
+        server_name localhost;
+	client_max_body_size 20M;
+
+	root {{ pillar['www_dir'] }}/admin;
+
+        location ~ \.php$ {
+              fastcgi_split_path_info ^(.+\.php)(/.+)$;
+              #   # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+              #
+              #   # With php5-cgi alone:
+              #   fastcgi_pass 127.0.0.1:9000;
+              #   # With php5-fpm:
+              fastcgi_pass unix:/var/run/php5-fpm.sock;
+              fastcgi_index index.php;
+              include fastcgi_params;
+          }
+
+        include /etc/nginx/admin.d/*.conf;
+
+}
+

data/salt/www/nginx/init.sls

@@ -1,33 +1,119 @@
 nginx:
   pkg.installed:
-    - name: nginx-full
+    - pkgs:
+      - nginx-full
+      - apache2-utils   # for htpasswd
   service:
     - running
     - enable: True
     - reload: True
-    #- watch:
-      #- file: {{ pillar['etc_dir'] }}nginx/nginx.conf
-      #- file: {{ pillar['etc_dir'] }}nginx/sites-enabled/*
-      #- file: {{ pillar['etc_dir'] }}nginx/admin.d/*
+    - watch:
+      - file: enable-admin-site
     - require:
       - file.directory: admin-d
       - pkg: nginx
 
-admin-d:
+www_dir:
   file.directory:
-    - name: {{ pillar['etc_dir'] }}nginx/admin.d
+    - name: {{ pillar['www_dir'] }}
     - user: root
     - group: root
-    - mode: 755
+    - mode: 775
+    - makedirs: True
+
+admin-d:
+  file.recurse:
+    - source: salt://www/nginx/etc/nginx/admin.d
+    - name: {{ pillar['etc_dir'] }}/nginx/admin.d
+    - user: root
+    - group: root
+    - file_mode: 644
+    - dir_mode: 755
+    - exclude_pat: '.*swp'
     - require:
       - pkg: nginx
 
-#  require:
-#    - file: {{ pillar['etc_dir'] }}nginx/nginx.conf
+admin-conf:
+  module.run:
+    - name: tls.create_self_signed_cert
+    - tls_dir: 'self_signed'
+    - emailAddress: "webmaster@{{ pillar['domain'] }}"
+    - require:
+      - file: admin-d
+  file.managed:
+    - source: salt://www/nginx/etc/nginx/sites-available/admin.conf
+    - name: {{ pillar['etc_dir'] }}/nginx/sites-available/admin.conf
+    - user: root
+    - group: root
+    - template: jinja
+    - mode: 644
+    - require:
+      - module: admin-conf
+
+admin-site-templated:
+  file.recurse:
+    - source: salt://www/nginx/srv/www/admin
+    - name: {{ pillar['www_dir'] }}/admin
+    - user: root
+    - group: root
+    - template: jinja
+    - include_pat: '*.php'
+    - file_mode: 644
+    - dir_mode: 755
+
+admin-site-raw:
+  file.recurse:
+    - source: salt://www/nginx/srv/www/admin
+    - name: {{ pillar['www_dir'] }}/admin
+    - user: root
+    - group: root
+    - exclude_pat: '*.php'
+    - file_mode: 644
+    - dir_mode: 755
+
+enable-admin-site:
+  file.symlink:
+    - target: {{ pillar['etc_dir'] }}nginx/sites-available/admin.conf
+    - name: {{ pillar['etc_dir'] }}/nginx/sites-enabled/admin.conf
+    - require:
+      - file: admin-conf
+
+{{ pillar['etc_dir'] }}/nginx/admin.d/htpasswd:
+  file.managed:
+    - contents: "#users that are allowed to access admin website\n"
+    - replace: False
+    - require:
+      - file: admin-d
+
+{{ pillar['etc_dir'] }}/nginx/staging_passwd:
+  file.managed:
+    - contents: "#users that are allowed to access staging website\n"
+    - replace: False
+    - require:
+      - file: admin-d
+
+{%- if pillar['admin_password'] %}
+
+admin-user:
+  cmd.run:
+    - name: htpasswd -b {{ pillar['etc_dir'] }}/nginx/admin.d/htpasswd 'admin' '{{ pillar['admin_password'] }}'
+    - 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:
 
-#{{ pillar['etc_dir'] }}nginx/nginx.conf:
-#  file.managed:
-#    - source: salt://www/nginx/etc/nginx/nginx.conf
-#    - user: root
-#    - group: root
-#    - mode: 644
+{%- endif %}

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

@@ -0,0 +1,67 @@
+<html><head>
+<title>Admin</title>
+<link rel="shortcut icon" href="/favicon.ico">
+</head><body>
+<h2>Admin functions</h2>
+<ul>
+<?php
+$d = dir("/etc/nginx/admin.d");
+while (false !== ($entry = $d->read())) {
+     #echo "<li>Found: " . $entry;
+     if (preg_match("/(.*).conf/", $entry, $matches)) {
+         echo '<li><a href="/' . $matches[1] . '/">' . $matches[1] . "</a>\n";
+     }
+}
+$d->close();
+?>
+<li><a href="phpinfo.php">phpinfo</a>
+</ul>
+
+<h2>localhost port mapping</h2>
+
+<ul>
+{%- for port, host_port in pillar['mapped_ports'].items() %}
+<li>
+  {%- if port == 22 %}
+    <i>ssh localhost -p {{ host_port }}</i> mapped to ssh port {{ port }}
+  {%- else %}
+    {%- if (port == 443) or (port == 880 and pillar['admin_password']) %}
+      <a href="https://localhost:{{ host_port }}/">https://localhost:{{ host_port }}/</a> -
+    {%- else %}
+      <a href="http://localhost:{{ host_port }}/">http://localhost:{{ host_port }}/</a> -
+    {%- endif %}
+    {%- if port == 80 %}
+      main site (production via cap deploy)
+    {%- elif port == 443 %}
+      main secure site (production via cap deploy)
+    {%- elif port == 880 %}
+      this admin site
+    {%- elif port == 3000 %}
+      rails app (development mode)
+    {%- else %}
+      other app
+    {%- endif %}
+    {%- if (port == 443) or (port == 880 and pillar['admin_password']) %}
+      on port <a href="https://localhost:{{ port }}">{{ port }}</a>
+    {%- else %}
+      on port <a href="http://localhost:{{ port }}">{{ port }}</a>
+    {%- endif %}
+  {%- endif %}
+{%- endfor %}
+</ul>
+
+<h2>Roles</h2>
+<ul>
+{%- for role in pillar['roles'] %}
+<li>{{ role }}
+{%- endfor %}
+</ul>
+
+<h2>Versions</h2>
+<ul>
+{%- for app in pillar['versions'] %}
+<li>{{ app }}: {{ pillar['versions'][app] }}
+{%- endfor %}
+</ul>
+
+</body></html>

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

@@ -0,0 +1,3 @@
+<?
+phpinfo();
+?>

data/salt/www/nginx/srv/www/admin/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

data/salt/www/users.sls

@@ -1,12 +1,3 @@
-{{ pillar['www_dir'] }}:
-  file.directory:
-    - user: www-data
-    - group: www-data
-    - mode: 775
-    - makedirs: True
-    - require:
-      - group: www-data
-      - user: www-data
 
 www-data:
   group.present:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salted-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,20 +69,19 @@ files:
 - pillar/common.sls
 - pillar/vagrant.sls
 - pillar/vagrant/top.sls
+- salt/apt/load_packages.sls
 - salt/apt/partner-sources.sls
 - salt/apt/unwanted.sls
+- salt/apt/update_packages.sls
 - salt/bin/change_mirror.sh
-- salt/bin/fix_hostname.sh
+- salt/bin/misc_fixes.sh
 - salt/bin/provision
-- salt/capistrano/deploy_requirements.sls
 - salt/capistrano/minion
 - salt/capistrano/minion.sls
-- salt/capistrano/top.sls
 - salt/ci/cruisecontrolrb.sls
 - salt/ci/teamcity/etc/init.d/teamcity
 - salt/ci/teamcity/init.sls
 - salt/crons/init.sls
-- salt/databases/client.sls
 - salt/databases/init.sls
 - salt/databases/mysql/client-encoding-and-collation.cnf
 - salt/databases/mysql/client.sls
@@ -94,27 +93,32 @@ files:
 - salt/databases/mysql/init.sls
 - salt/databases/mysql/server-encoding-and-collation.cnf
 - salt/databases/mysql/server.sls
+- salt/databases/packages.sls
 - salt/databases/phpmyadmin/etc/nginx/admin.d/phpmyadmin.conf
 - salt/databases/phpmyadmin/init.sls
-- salt/databases/server.sls
+- salt/databases/postgresql/client.sls
+- salt/databases/postgresql/init.sls
+- salt/databases/sqlite3.sls
+- salt/databases/sqlitebrowser.sls
 - salt/editors/gvim.sls
 - salt/editors/rubymine.sls
 - salt/editors/vim/init.sls
 - salt/editors/vim/vimrc
-- salt/gui/init.sls
+- salt/gui/desktop.sls
 - salt/gui/lxde.sls
 - salt/gui/x2go.sls
 - salt/lang/java/etc/profile.d/java.sh
 - salt/lang/java/init.sls
+- salt/lang/jenv.sls
 - salt/lang/php/composer.sls
 - salt/lang/php/etc/php5/fpm/php.fpm.ini
 - salt/lang/php/etc/php5/fpm/pool.d/www.conf
 - salt/lang/php/init.sls
 - salt/lang/php/nginx.sls
+- salt/lang/phpenv.sls
 - salt/lang/python/python-libs.sls
+- salt/lang/rbenv.sls
 - salt/lang/ruby.sls
-- salt/lang/ruby.sls.bak
-- salt/lang/system_ruby.sls
 - salt/munin/files/nginx/plugin-conf.d/nginx
 - salt/munin/files/nginx/plugins/nginx_combined_localhost
 - salt/munin/files/nginx/plugins/nginx_request
@@ -131,6 +135,9 @@ files:
 - salt/munin/node.sls
 - salt/munin/php5-fpm.sls
 - salt/munin/server.sls
+- salt/net/hosts.sls
+- salt/net/ntp.sls
+- salt/net/ufw.sls
 - salt/railsapp/gems.sls
 - salt/railsapp/init.sls
 - salt/railsapp/mysql_database.sls
@@ -141,24 +148,38 @@ files:
 - salt/salt/minion/lsb.sls
 - salt/salt/minion/mysql.conf
 - salt/salt/minion/mysql.sls
+- salt/scm/bazaar.sls
+- salt/scm/git/gitconfig
+- salt/scm/git/init.sls
+- salt/scm/init.sls
+- salt/scm/mercurial.sls
+- salt/scm/subversion.sls
 - salt/server/monit.sls
 - salt/server/sudo/init.sls
 - salt/server/sudo/sudoers
-- salt/sysutils/file.sls
-- salt/sysutils/init.sls
-- salt/sysutils/net.sls
-- salt/sysutils/status.sls
-- salt/sysutils/tmux.sls
+- salt/top.sls
+- salt/utils/file.sls
+- salt/utils/html.sls
+- salt/utils/init.sls
+- salt/utils/net.sls
+- salt/utils/status.sls
+- salt/utils/tmux/home/tmux-dev
+- salt/utils/tmux/home/tmux.conf
+- salt/utils/tmux/init.sls
 - salt/vagrant/minion
 - salt/vagrant/minion.sls
-- salt/vagrant/top.sls
-- salt/www/admin/etc/nginx/nginx.conf
-- salt/www/admin/etc/nginx/sites-available/.gitignore
-- salt/www/admin/etc/nginx/sites-available/phpmyadmin.conf
-- salt/www/admin/init.sls
 - salt/www/chromium.sls
+- salt/www/nginx/etc/nginx/admin.d/doc.conf
+- salt/www/nginx/etc/nginx/admin.d/nginx_status.conf
 - salt/www/nginx/etc/nginx/nginx.conf
+- 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/favicon.ico
+- salt/www/nginx/srv/www/admin/favicon.png
+- salt/www/nginx/srv/www/admin/index.php
+- salt/www/nginx/srv/www/admin/phpinfo.php
+- salt/www/nginx/srv/www/admin/robots.txt
 - salt/www/users.sls
 - salted-rails.gemspec
 homepage: https://github.com/ianheggie/salted-rails

data/salt/bin/fix_hostname.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-#
-# Removes domain from /etc/hostname
-
-sed -i "s@\..*\$@@" /etc/hostname
-hostname -F /etc/hostname

data/salt/capistrano/deploy_requirements.sls

@@ -1,5 +0,0 @@
-deploy:
-  pkg.installed:
-    - pkgs:
-      - git
-

data/salt/capistrano/top.sls

@@ -1,4 +0,0 @@
-base:
-  '*':
-    - TODO.SETUP.CAPISTRANO
-

data/salt/databases/client.sls

@@ -1,18 +0,0 @@
-
-include:
-  # MySQL
-{%- if ('mysql' in pillar['gems']) or ('mysql2' in pillar['gems']) %}
-  - databases.mysql.client
-{%- endif %}
-  # PostgreSQL - TODO main alternative to mysql
-  # MongoDB - TODO Document database
-  # CouchDB - TODO json web distributed db
-  # Redis - TODO key value store
-  # Riak - TODO Distributed fault tolerant DB
-  # RabbitMQ - TODO message broker software
-  # Memcached - TODO Memory cache
-  # Cassandra - TODO distributed database management system
-  # Neo4J - TODO Graph database
-  # ElasticSearch - TODO search and analytics engine
-  # Kestrel - TODO light-weight persistent message queue
-  # SQLite3 - Included by default