apt: minor align to pristine

[chef.git] / cookbooks / community / recipes / default.rb

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index 69b1406c5a9ed604085afbe013701d3eed5cf351..89743de31c0fb7a7de419922633b6bd61b2ed693 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -17,13 +17,14 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 include_recipe "docker"
+include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "ssl"
-include_recipe "geoipupdate"
 
 passwords = data_bag_item("community", "passwords")
-license_keys = data_bag_item("geoipupdate", "license-keys")
+license_keys = data_bag_item("geoipupdate", "license-keys") unless kitchen?
 
 directory "/srv/community.openstreetmap.org" do
   owner "root"
@@ -92,7 +93,7 @@ end
 
 execute "discourse_container_data_start" do
   action :run
-  command "./launcher rebuild start"
+  command "./launcher start data"
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"
   group "root"
@@ -117,7 +118,7 @@ execute "discourse_container_web_only_destroy" do
 end
 
 execute "discourse_container_web_only_start" do
-  action :nothing
+  action :run
   command "./launcher start web_only"
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"