Revert "adding nginx proxy"

Chaosthebot · May 25, 2017 · f2f890d · f2f890d
1 parent bffbc96
commit f2f890d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,3 @@
 .DS_Store
 .venv
 github_pat.secret
-*.swp
-.vagrant/
diff --git a/puppet/manifests/sites.pp b/puppet/manifests/sites.pp
@@ -1,4 +1,3 @@
 node default {
     class{'chaos_system_packages':}
-    class{'chaos_system_packages::setup_nginx':}
 }
diff --git a/puppet/modules/chaos_system_packages/manifests/setup_nginx.pp b/puppet/modules/chaos_system_packages/manifests/setup_nginx.pp
diff --git a/puppet/pullForge.sh b/puppet/pullForge.sh
diff --git a/server/server.py b/server/server.py
@@ -12,7 +12,7 @@ def set_proc_name(newname):
 set_proc_name("chaos_server")
 
 #start server on port 80
-PORT = 8080
+PORT = 80
 Handler = http.server.SimpleHTTPRequestHandler
 
 class NoTimeWaitTCPServer(socketserver.TCPServer):

diff --git a/startup.d/40-run-puppet.sh b/startup.d/40-run-puppet.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
 cd puppet
-./pullForge.sh
 puppet apply --verbose --modulepath=$PWD/modules/ $PWD/manifests/