danarchy_deploy 0.2.7 → 0.2.8

data/lib/danarchy_deploy.rb

@@ -43,13 +43,15 @@ module DanarchyDeploy
     def self.new(deployment, options)
       puts "\n" + self.name
 
-      options[:working_dir] = options[:deploy_dir] + '/' + deployment[:hostname]
+      @working_dir = File.dirname(options[:deploy_file]) + '/'
       connector = { hostname: deployment[:hostname],
                     ipv4:     deployment[:ipv4],
                     ssh_user: deployment[:ssh_user],
                     ssh_key:  deployment[:ssh_key] }
 
+      pretend = options[:pretend] ; options[:pretend] = false
       remote_mkdir(connector, options)
+      # asdf_install(connector, options)
 
       if options[:dev_gem]
         puts "\nDev Gem mode: Building and pushing gem..."
@@ -63,6 +65,8 @@ module DanarchyDeploy
       gem_binary = _locate_gem_binary(connector, options) # this should run before any install; check version too
       push_templates(connector, options)
       push_deployment(connector, options)
+
+      options[:pretend] = pretend
       deploy_result = remote_LocalDeploy(connector, gem_binary, options)
 
       abort("\n ! Deployment failed to complete!") if !deploy_result
@@ -71,15 +75,15 @@ module DanarchyDeploy
       # remote_cleanup(connector, options) if !options[:pretend]
 
       puts "\nRemote deployment complete!"
-      deployment = JSON.parse(File.read(options[:deploy_file]), symbolize_names: true) if options[:deploy_file].end_with?('.json')
-      deployment = YAML.load_file(options[:deploy_file]) if options[:deploy_file].end_with?('.yaml')
-      deployment
+      options[:deploy_file].end_with?('.json') ?
+        JSON.parse(File.read(options[:deploy_file]), symbolize_names: true) :
+        YAML.load_file(options[:deploy_file]) if options[:deploy_file].end_with?('.yaml')
     end
 
     private
     def self.remote_mkdir(connector, options)
-      puts "\n > Creating directory: #{options[:working_dir]}"
-      mkdir_cmd = _ssh_command(connector, "test -d #{options[:working_dir]} && echo 'Directory exists!' || sudo mkdir -vp #{options[:working_dir]}")
+      puts "\n > Creating directory: #{@working_dir}"
+      mkdir_cmd = _ssh_command(connector, "test -d #{@working_dir} && echo 'Directory exists!' || sudo mkdir -vp #{@working_dir}")
       mkdir_result = DanarchyDeploy::Helpers.run_command(mkdir_cmd, options)
 
       if mkdir_result[:stderr] && ! mkdir_result[:stdout]
@@ -100,12 +104,48 @@ module DanarchyDeploy
       end
     end
 
+    # def self.asdf_install(connector, options)
+    #   versions = JSON.parse(
+    #     File.read(File.expand_path('../', __dir__) + '/.asdf_versions.json'),
+    #     symbolize_names: true)
+
+    #   template = {
+    #     target:    '/tmp/asdf.sh_' + Random.hex(6),
+    #     source:    'builtin::asdf/asdf.sh.erb',
+    #     variables: versions
+    #   }
+
+    #   DanarchyDeploy::Templater.new([template], options)
+    #   push_cmd    = _scp_push(connector, template[:target], '/tmp')
+    #   push_result = DanarchyDeploy::Helpers.run_command(push_cmd, options)
+
+    #   if push_result[:stderr]
+    #     abort('   ! Asdf push failed!')
+    #   else
+    #     puts '   |+ Asdf pushed!'
+    #     asdf_chown_cmd    = _ssh_command(
+    #       connector,
+    #       "sudo mv -v #{template[:target]} /etc/profile.d/asdf.sh && " +
+    #       'sudo chown -c root:root /etc/profile.d/asdf.sh')
+    #     asdf_chown_result = DanarchyDeploy::Helpers.run_command(asdf_chown_cmd, options)
+    #     File.delete(template[:target])
+    #   end
+
+    #   asdf_current_cmd    = _ssh_command(connector, 'sudo -i asdf current')
+    #   asdf_current_result = DanarchyDeploy::Helpers.run_command(asdf_current_cmd, options)
+
+    #   puts asdf_current_result[:stderr] if asdf_current_result[:stderr]
+    #   puts asdf_current_result[:stdout]
+    # end
+
     def self.gem_install(connector, options)
       puts "\n > Installing danarchy_deploy on #{connector[:hostname]}"
-      install_cmd = _ssh_command(connector, 'sudo gem install -f danarchy_deploy')
+      install_cmd    = _ssh_command(connector, 'sudo -i gem install -f danarchy_deploy')
       install_result = DanarchyDeploy::Helpers.run_command(install_cmd, options)
 
-      if install_result[:stderr]
+      if install_result[:stderr] =~ /WARN/i
+        puts '   ! ' + install_result[:stderr]
+      elsif install_result[:stderr]
         abort('   ! Gem install failed!')
       else
         puts "   |+ Gem installed!"
@@ -134,7 +174,7 @@ module DanarchyDeploy
 
     def self.dev_gem_install(connector, gem, options)
       puts "\n > Pushing gem: #{gem} to #{connector[:hostname]}"
-      push_cmd = _scp_push(connector, gem, options[:deploy_dir])
+      push_cmd    = _scp_push(connector, gem, options[:deploy_dir])
       push_result = DanarchyDeploy::Helpers.run_command(push_cmd, options)
 
       if push_result[:stderr]
@@ -144,10 +184,12 @@ module DanarchyDeploy
       end
       
       puts "\n > Installing gem: #{gem} on #{connector[:hostname]}"
-      install_cmd = _ssh_command(connector, "sudo gem install --bindir /usr/local/bin -f #{options[:deploy_dir]}/#{File.basename(gem)}")
+      install_cmd    = _ssh_command(connector, "sudo -i gem install --bindir /usr/local/bin -f #{options[:deploy_dir]}/#{File.basename(gem)}")
       install_result = DanarchyDeploy::Helpers.run_command(install_cmd, options)
 
-      if install_result[:stderr]
+      if install_result[:stderr] =~ /WARN/i
+        puts '   ! ' + install_result[:stderr]
+      elsif install_result[:stderr]
         abort('   ! Gem install failed!')
       else
         puts '   |+ Gem installed!'
@@ -155,39 +197,39 @@ module DanarchyDeploy
     end
 
     def self.gem_clean(connector, options)
-      clean_cmd = _ssh_command(connector, 'sudo gem clean danarchy_deploy 2&>/dev/null')
+      clean_cmd = _ssh_command(connector, 'sudo -i gem clean danarchy_deploy 2&>/dev/null')
       system(clean_cmd)
     end
 
     def self.push_templates(connector, options)
       template_dir = options[:deploy_dir] + '/templates'
       puts "\n > Pushing templates: #{template_dir}"
-      push_cmd = _rsync_push(connector, template_dir, template_dir)
+      push_cmd    = _rsync_push(connector, template_dir, template_dir)
       push_result = DanarchyDeploy::Helpers.run_command(push_cmd, options)
       
       if push_result[:stderr]
         abort('   ! Templates push failed!')
       else
-        puts "   |+ Templates pushed to '#{options[:working_dir]}'!"
+        puts "   |+ Templates pushed to '#{template_dir}'!"
       end
     end
 
     def self.push_deployment(connector, options)
       puts "\n > Pushing deployment: #{options[:deploy_file]}"
-      push_cmd = _rsync_push(connector, options[:working_dir], options[:working_dir])
+      push_cmd    = _rsync_push(connector, @working_dir, @working_dir)
       push_result = DanarchyDeploy::Helpers.run_command(push_cmd, options)
 
       if push_result[:stderr]
         abort('   ! Deployment push failed!')
       else
-        puts "   |+ Deployment pushed to '#{options[:working_dir]}'!"
+        puts "   |+ Deployment pushed to '#{@working_dir}'!"
       end
     end
 
     def self.remote_LocalDeploy(connector, gem_binary, options)
       puts "\n > Running LocalDeploy on #{connector[:hostname]}.\n\n"
 
-      deploy_cmd  = "sudo #{gem_binary} local "
+      deploy_cmd  = "sudo -i #{gem_binary} local "
       deploy_cmd += '--first-run '    if options[:first_run]
       deploy_cmd += '--ssh-verbose '  if options[:ssh_verbose]
       deploy_cmd += '--vars-verbose ' if options[:vars_verbose]
@@ -214,7 +256,7 @@ module DanarchyDeploy
 
     def self.remote_cleanup(connector, options)
       puts "\n > Cleaning up: #{options[:deploy_dir]}"
-      cleanup_cmd = _ssh_command(connector, "sudo rm -rfv #{options[:working_dir]}")
+      cleanup_cmd    = _ssh_command(connector, "sudo rm -rfv #{@working_dir}")
       cleanup_result = DanarchyDeploy::Helpers.run_command(cleanup_cmd, options)
 
       if cleanup_result[:stderr]
@@ -225,7 +267,7 @@ module DanarchyDeploy
     end
 
     def self._locate_gem_binary(connector, options)
-      locate_cmd = _ssh_command(connector, 'sudo which danarchy_deploy')
+      locate_cmd    = _ssh_command(connector, 'sudo -i which danarchy_deploy')
       locate_result = DanarchyDeploy::Helpers.run_command(locate_cmd, options)
 
       if locate_result[:stderr]

data/templates/applications/nginx/domain.conf.erb

@@ -0,0 +1,38 @@
+server {
+    server_name www.<%= @variables[:domain] %>;
+    listen 80;
+    return 301 http://<%= @variables[:domain] %>/$request_uri;
+}
+
+server {
+    server_name <%= @variables[:domain] %>;
+    listen 80;
+
+    server_tokens off;
+    add_header X-Content-Type-Options nosniff;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Frame-Options "SAMEORIGIN";
+
+    access_log /home/<%= @variables[:username] %>/nginx/logs/<%= @variables[:domain] %>/access_log main;
+    error_log /home/<%= @variables[:username] %>/nginx/logs/<%= @variables[:domain] %>/error_log info;
+
+    root /home/<%= @variables[:username] %>/<%= @variables[:domain] %>;
+    index index.php;
+
+    location / {
+	try_files $uri $uri/ /index.php?q=$uri&$args;
+
+    }
+
+    location ~ \.php$ {
+	try_files $uri =404;
+	include /etc/nginx/fastcgi_params;
+	fastcgi_buffers 16 16k;
+	fastcgi_buffer_size 32k;
+	fastcgi_split_path_info ^(.+\.php)(/.+)$;
+	fastcgi_pass unix:/var/run/php-fpm-<%= @variables[:domain].gsub('.','_') %>.sock;
+	fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+	fastcgi_index index.php;
+
+    }
+}

data/templates/applications/php/phpfpm.conf.erb

@@ -0,0 +1,19 @@
+[<%= @variables[:pool] %>]
+user = <%= @variables[:username] %>
+group = <%= @variables[:username] %>
+
+listen = /var/run/php-fpm-<%= @variables[:pool] %>.sock
+<% if @variables[:web_user] %>
+listen.owner = <%= @variables[:web_user] %>
+listen.group = <%= @variables[:web_user] %>
+<% end %>
+pm = dynamic
+pm.max_children = 4
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 2
+
+env[TMP] = <%= @variables[:tmp] %>
+env[TMPDIR] = <%= @variables[:tmp] %>
+env[TEMP] = <%= @variables[:tmp] %>
+env[PATH] = /usr/local/bin:/usr/bin:/bin

data/templates/applications/php/user.conf.erb

@@ -0,0 +1,19 @@
+[<%= @variables[:username] %>]
+user = <%= @variables[:username] %>
+group = <%= @variables[:username] %>
+
+listen = /var/run/php7-fpm-<%= @variables[:username] %>.sock
+<% if @variables[:web_user] %>
+listen.owner = <%= @variables[:web_user] %>
+listen.group = <%= @variables[:web_user] %>
+<% end %>
+pm = dynamic
+pm.max_children = 4
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 2
+
+env[TMP] = <%= @variables[:tmp] %>
+env[TMPDIR] = <%= @variables[:tmp] %>
+env[TEMP] = <%= @variables[:tmp] %>
+env[PATH] = /usr/local/bin:/usr/bin:/bin

data/templates/applications/wordpress/mysql_user_privileges.sql.erb

@@ -0,0 +1,2 @@
+GRANT ALL PRIVILEGES ON `<%= @variables[:db_name] %>`.`*` TO `<%= @variables[:db_user] %>`@`<%= @variables[:db_host] %>` IDENTIFIED BY `<%= @variables[:db_pass] %>`;
+FLUSH PRIVILEGES;

data/templates/applications/wordpress/wp-config.php.erb

@@ -0,0 +1,82 @@
+<?php
+/**
+* The base configuration for WordPress
+*
+* The wp-config.php creation script uses this file during the
+* installation. You don't have to use the web site, you can
+* copy this file to "wp-config.php" and fill in the values.
+*
+* This file contains the following configurations:
+*
+* * MySQL settings
+* * Secret keys
+* * Database table prefix
+* * ABSPATH
+*
+* @link https://codex.wordpress.org/Editing_wp-config.php
+*
+* @package WordPress
+*/
+
+// ** MySQL settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+define('DB_NAME', '<%= @variables[:db_name] %>');
+
+/** MySQL database username */
+define('DB_USER', '<%= @variables[:db_user] %>');
+
+/** MySQL database password */
+define('DB_PASSWORD', '<%= DanarchyDeploy::Helpers.decode_base64(@variables[:db_pass]) %>');
+
+/** MySQL hostname */
+define('DB_HOST', '<%= @variables[:db_host] %>');
+
+/** Database Charset to use in creating database tables. */
+define('DB_CHARSET', 'utf8');
+
+/** The Database Collate type. Don't change this if in doubt. */
+define('DB_COLLATE', '');
+
+/**#@+
+* Authentication Unique Keys and Salts.
+*
+* Change these to different unique phrases!
+* You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
+* You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+*
+* @since 2.6.0
+*/
+<%= @variables[:salts] %>
+
+/**#@-*/
+
+/**
+* WordPress Database Table prefix.
+*
+* You can have multiple installations in one database if you give each
+* a unique prefix. Only numbers, letters, and underscores please!
+*/
+$table_prefix  = '<%= @variables[:table_prefix] ? @variables[:table_prefix] : "wp_" %>';
+
+/**
+* For developers: WordPress debugging mode.
+*
+* Change this to true to enable the display of notices during development.
+* It is strongly recommended that plugin and theme developers use WP_DEBUG
+* in their development environments.
+*
+* For information on other constants that can be used for debugging,
+* visit the Codex.
+*
+* @link https://codex.wordpress.org/Debugging_in_WordPress
+*/
+define('WP_DEBUG', false);
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+        define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');

data/templates/asdf/asdf.sh.erb

@@ -0,0 +1,52 @@
+#!/bin/bash
+# Deployed by danarchy_deploy
+#   manages system-wide asdf; still allows for local ~/.asdf
+
+function _run_now() {
+    tmp_file=/tmp/asdf_next_run.tmp
+    next_run=$(cat ${tmp_file} 2>/dev/null || echo 0)
+
+    if [[ $(date '+%s') -gt ${next_run} ]]; then
+        echo 'true'
+    else
+        echo 'false'
+    fi
+}
+
+function _load_asdf() {
+    path=${1}
+    export ASDF_DATA_DIR=${path}
+    source ${path}/asdf.sh
+    source ${path}/completions/asdf.bash
+}
+
+if [[ ${UID} == 0 && $(_run_now) == 'true' ]]; then
+    if [[ ! -d /opt/asdf ]]; then
+        git clone https://github.com/asdf-vm/asdf.git /opt/asdf
+    fi
+
+    asdf update >/dev/null 2>&1
+    _load_asdf /opt/asdf
+
+    <%- @variables.each do |lang, versions| -%>
+    asdf plugin add <%= lang -%>
+
+    <%- versions.each do |version| -%>
+    asdf install <%= lang -%> <%= version -%>
+    <% end %>
+
+    asdf global <%= lang %> <%= versions.first -%>
+    <% end %>
+
+    date -d '1 hour' '+%s' > /tmp/asdf_next_run.tmp
+    asdf current
+fi
+
+if [[ -d ${HOME}/.asdf ]]; then
+    _load_asdf ${HOME}/.asdf
+elif [[ -d /opt/asdf ]]; then
+    _load_asdf /opt/asdf
+fi
+
+unset -f _run_now
+unset -f _load_asdf

data/templates/deploy_template.json

@@ -9,7 +9,7 @@
     "package2"
   ],
   "system": {
-    "update": "all || system || packages || none",
+    "update": "true || all || system || selected || none || false",
     "fstab": {
       "source": "builtin::system/fstab_gentoo_client.erb",
       "mounts": [
@@ -36,14 +36,13 @@
       }
     ]
   },
-  "users": [
-    {
-      "username": "username",
+  "users": {
+    "username": {
       "home": "/home/username",
       "uid": int,
       "gid": int,
-      "sudoer": "username ALL = NOPASSWD: ALL",
-      "ssh-authorized_keys": [
+      "sudoer": ["username ALL=(ALL) NOPASSWD:ALL"],
+      "authorized_keys": [
         "ssh-ed25519 it0C5o6GHC8lxqctpexakfdA5o7LeSe+QbMhIl+GYtZ2OCMFliLsODDrrazR+u2y user@hostname",
         "ssh-rsa K0APeEvotGunpBrl/LvSAG/gLUldCnOrL60v47QYjuqoGJmM3Fk8V29+8jZPp9Dl user@hostname"
       ],
@@ -61,7 +60,7 @@
         }
       ]
     }
-  ],
+  },
   "groups": [
     {
       "groupname": "groupname",

data/templates/distcc/distccd.erb

@@ -0,0 +1,14 @@
+# Deployed by dAnarchy_deploy: /etc/conf.d/distccd: config file for /etc/init.d/distccd
+
+# this is the distccd executable
+DISTCCD_EXEC="/usr/bin/distccd"
+
+# this is where distccd will store its pid file
+DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
+
+<%= @variables[:opts] ? 'DISTCCD_OPTS=' + "\"#{@variables[:opts]}\"" : 'DISTCCD_OPTS=""' %>
+<%= @variables[:port] ? 'DISTCCD_OPTS=' + "\"${DISTCCD_OPTS} --port #{@variables[:port]}\"" : 'DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"' %>
+<%= @variables[:loglevel] ? 'DISTCCD_OPTS=' + "\"${DISTCCD_OPTS} --log-level #{@variables[:loglevel]}\"" : 'DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"' %>
+<%= @variables[:allow] ? 'DISTCCD_OPTS=' + "\"${DISTCCD_OPTS} --allow #{@variables[:allow]}\"" : '' %>
+<%= @variables[:listen] ? 'DISTCCD_OPTS=' + "\"${DISTCCD_OPTS} --listen #{@variables[:listen]}\"" : '' %>
+<%= @variables[:nice] ? 'DISTCCD_OPTS=' + "\"${DISTCCD_OPTS} -N #{@variables[:nice]}\"" : '' %>

data/templates/distcc/hosts.erb

@@ -0,0 +1,2 @@
+# Deployed by dAnarchy_deploy: /etc/distcc/hosts
+<%= @variables[:hosts] ? "#{@variables[:hosts]}" : 'localhost' -%>

data/templates/portage/make.conf.erb

@@ -0,0 +1,30 @@
+# Deployed by dAnarchy_deploy: /etc/portage/make.conf
+COMMON_FLAGS="-march=<%= `gcc -march=native -Q --help=target | grep march`.split[1] %> -O2 -pipe"
+CFLAGS="${COMMON_FLAGS}"
+CXXFLAGS="${COMMON_FLAGS}"
+FCFLAGS="${COMMON_FLAGS}"
+FFLAGS="${COMMON_FLAGS}"
+
+MAKEOPTS="-j<%= `nproc`.to_i * 2 + 1 %> -l<%= `nproc`.to_i %>"
+CPU_FLAGS_X86="<%= `cpuid2cpuflags`.split(': ').last.chomp %>"
+
+<% if !@variables -%>
+USE="bindist logrotate"
+INPUT_DEVICES="evdev keyboard"
+<% else -%>
+<%= @variables[:use] ? 'USE=' + "\"bindist logrotate #{@variables[:use]}\"\n" : "USE=\"bindist logrotate\"\n" -%>
+<%= @variables[:grub] ? 'GRUB_PLATFORMS=' + "\"#{@variables[:grub]}\"\n" : '' -%>
+<%= @variables[:ruby] ? 'RUBY_TARGETS=' + "\"#{@variables[:ruby]}\"\n" : '' -%>
+<%= @variables[:php] ? 'PHP_TARGETS=' + "\"#{@variables[:php]}\"\n" : '' -%>
+<%= @variables[:features] ? 'FEATURES=' + "\"#{@variables[:features]}\"\n" : '' -%>
+<%= @variables[:videocards] ? 'VIDEO_CARDS=' + "\"#{@variables[:videocards]}\"\n" : '' -%>
+<%= @variables[:input] ? 'INPUT_DEVICES=' + "\"#{@variables[:input]}\"\n" : "INPUT_DEVICES=\"evdev keyboard\"\n" -%>
+<% end -%>
+
+# This sets the language of build output to English.
+# Please keep this setting intact when reporting bugs.
+LC_MESSAGES=C
+
+PORTDIR="/var/db/repos/gentoo"
+DISTDIR="/var/cache/distfiles"
+PKGDIR="/var/cache/binpkgs"

data/templates/portage/package.use/bindist

@@ -0,0 +1,3 @@
+# Allow EC algorithms in OpenSSL/OpenSSH (patents blocked with bindist)
+dev-libs/openssl -bindist
+net-misc/openssh -bindist

data/templates/portage/package.use/documentation

@@ -0,0 +1,3 @@
+dev-lang/perl doc
+dev-lang/python doc
+dev-lang/ruby doc

data/templates/services/memcached/memcached.erb

@@ -0,0 +1,40 @@
+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+# Specify memory usage in megabytes (do not use letters)
+# 64MB is default
+MEMUSAGE="64"
+
+# User to run as
+MEMCACHED_RUNAS="memcached"
+
+# Specify maximum number of concurrent connections
+# 1024 is default
+MAXCONN="1024"
+
+# Listen for connections on what address?
+# If this is empty, memcached will listen on 0.0.0.0
+# be sure you have a firewall in place!
+LISTENON="<%= (@variables && @variables[:listenon]) ? @variables[:listenon] : '127.0.0.1' %>"
+
+# Listen for connections on what port?
+PORT="<%= (@variables && @variables[:port]) ? @variables[:port] : '11211' %>"
+
+# Listen for UDP connecitons on what port? 0 means turn off UDP
+UDPPORT="${PORT}"
+
+# PID file location
+# '-${PORT}.${CONF}.pid' will be appended to this!
+# You do not normally need to change this.
+PIDBASE="/var/run/memcached/memcached"
+
+# Socket to listen on
+#SOCKET="/var/run/memcached/memcached.sock"
+
+# Socket mask
+# 0700 is default
+#SOCKET_MASK="0700"
+
+# Other Options
+MISC_OPTS=""