* deleted settings/localvm.py

* add comment about a key in prod * deleted comment in settings/just.py
EbookFoundation · Jan 14, 2017 · 2beb02c · 2beb02c
1 parent 825ba6a
commit 2beb02c
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 322 deletions.
diff --git a/settings/just.py b/settings/just.py
@@ -120,14 +120,6 @@
 # local settings for maintenance mode
 MAINTENANCE_MODE = False
 
-# Amazon keys to permit S3 access
-
-# https://console.aws.amazon.com/iam/home?region=us-east-1#/users/s3_just
-# TO DO: invalidate
-# AWS_ACCESS_KEY_ID = 'AKIAIYP6XRVAUWKQFT5Q'
-# AWS_SECRET_ACCESS_KEY = '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'
-# AWS_STORAGE_BUCKET_NAME = 'just-unglueit'
-
 # if settings/local.py exists, import those settings -- allows for dynamic generation of parameters such as DATABASES
 try:
     from regluit.settings.local import *

diff --git a/settings/localvm.py b/settings/localvm.py
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
@@ -308,31 +308,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
 
   end
-
-
-  config.vm.define "localvm" do |node|
-
-    node.vm.box = "ubuntu/precise64"
-    #node.vm.network "private_network", type: "dhcp"
-    node.vm.network "private_network", ip: "192.168.33.10" #https://192.168.33.10.xip.io
-
-    node.ssh.forward_agent = true
-
-    node.vm.provider "virtualbox" do |v, override|
-        v.memory = 1024
-        v.cpus = 2
-
-        # trying to mimic https://github.com/mozilla/fxa-dev/blob/b9b6f347c786428b347b82d38fb67e2c2fd1b827/vagrant/Vagrantfile
-        # but this doesn't work
-        override.vm.provision "ansible" do |ansible|
-          ansible.playbook = 'localvm.yml'
-          #ansible.start_at_task = 'remove all default enabled sites'
-        end        
-
-
-    end
-
-  end
 
 end