Merge branch 'support-blog-staging' of kazu634/itamae into master

cookbooks/blog/nginx.rb

@@ -1,8 +1,10 @@
 # Create the nginx directory:
-directory '/var/www/blog' do
+%w( blog test ).each do |d|
-  owner 'www-data'
+  directory "/var/www/#{d}" do
-  group 'webadm'
+    owner 'www-data'
-  mode '770'
+    group 'webadm'
+    mode '770'
+  end
 end
 
 # Add the fstab entry:

cookbooks/nginx/files/etc/nginx/basic-auth

@@ -0,0 +1 @@
+kazu634:$apr1$5iMN.i2P$58gdzg.dm7Tev8gCKXlpa/

cookbooks/nginx/setup.rb

@@ -22,12 +22,14 @@ link '/etc/nginx/stream-enabled' do
 end
 
 # Deploy the nginx configuration files:
-remote_file '/etc/nginx/nginx.conf' do
+%w(nginx.conf basic-auth).each do |f|
-  owner 'root'
+  remote_file "/etc/nginx/#{f}" do
-  group 'root'
+    owner 'root'
-  mode '644'
+    group 'root'
+    mode '644'
 
-  notifies :reload, 'service[nginx]'
+    notifies :reload, 'service[nginx]'
+  end
 end
 
 # Log rotation setting: