matthewtodd-wordpress 0.6.0 → 0.6.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.6.1
+
+* Update deploy:setup:config to write new secret keys introduced in Wordpress 2.6.
+* Update deploy.rb to match what I like to use.
+
 == 0.6.0
 
 * Slight documentation updates.

data/lib/wordpress/cli.rb

@@ -27,22 +27,19 @@ module Wordpress
           END
 
           file 'deploy.rb', <<-END
-            set :application,       'set your application name here'
-            set :repository,        'set your repository location here'
-            set :database_name,     'set your database name here'
-            set :database_username, 'set your database username here'
+            set :application, 'set your application name here'
+
+            server 'your server here', :web, :user => 'your user here'
 
-            # If you aren't deploying to /u/apps/\#{application} on the target
-            # servers (which is the default), you can specify the actual location
-            # via the :deploy_to variable:
-            # set :deploy_to, "/var/www/\#{application}"
+            set :scm, :git
+            set :local_repository, "your server here:git/#{application}.git"
+            set :repository, "/path/to/repos/git/#{application}.git"
+            set :git_shallow_clone, 1
 
-            # If you aren't using Subversion to manage your source code, specify
-            # your SCM below:
-            # set :scm, :git
-            # set :git_shallow_clone, 1
+            set :deploy_to, '/path/to/domains/your domain here/var/www'
 
-            server 'your server here', :web, :app, :db, :primary => true
+            set :database_name,     'set your database name here'
+            set :database_username, 'set your database username here'
           END
 
           file 'lighttpd.conf', <<-END
@@ -119,11 +116,14 @@ module Wordpress
              )
           END
 
-          config = Wordpress.config(:db_name     => File.basename(base),
-                                    :db_user     => 'root',
-                                    :db_password => '',
-                                    :secret_key  => Digest::SHA1.hexdigest(rand.to_s),
-                                    :abspath     => '/../public/')
+          config = Wordpress.config(:db_name         => File.basename(base),
+                                    :db_user         => 'root',
+                                    :db_password     => '',
+                                    :auth_key        => Digest::SHA1.hexdigest(rand.to_s),
+                                    :secure_auth_key => Digest::SHA1.hexdigest(rand.to_s),
+                                    :logged_in_key   => Digest::SHA1.hexdigest(rand.to_s),
+                                    :nonce_key       => Digest::SHA1.hexdigest(rand.to_s),
+                                    :abspath         => '/../public/')
 
           file 'wp-config.php', config
           file 'wp-config-sample.php', config

data/lib/wordpress/recipes/deploy.rb

@@ -161,11 +161,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       DESC
       task :config, :except => { :no_release => true } do
         require 'digest/sha1'
-        wp_config = Wordpress.config(:db_name     => database_name,
-                                     :db_user     => database_username,
-                                     :db_password => database_password,
-                                     :secret_key  => Digest::SHA1.hexdigest(rand.to_s),
-                                     :abspath     => '/../current/public/')
+        wp_config = Wordpress.config(:db_name         => database_name,
+                                     :db_user         => database_username,
+                                     :db_password     => database_password,
+                                     :auth_key        => Digest::SHA1.hexdigest(rand.to_s),
+                                     :secure_auth_key => Digest::SHA1.hexdigest(rand.to_s),
+                                     :logged_in_key   => Digest::SHA1.hexdigest(rand.to_s),
+                                     :nonce_key       => Digest::SHA1.hexdigest(rand.to_s),
+                                     :abspath         => '/../current/public/')
 
         put wp_config, "#{shared_path}/wp-config.php", :mode => 0600
       end

data/lib/wordpress.rb

@@ -1,7 +1,7 @@
 require 'wordpress/release'
 
 module Wordpress #:nodoc:
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
   def self.config(options={})
     config = release.contents('wp-config-sample.php')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-wordpress
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matthew Todd
@@ -56,7 +56,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- wordpress-0.6.0
+- wordpress-0.6.1
 - --inline-source
 - --line-numbers
 - --all