Use caddy server instead of nginx for serving Snowplow Mini dashboard (…

…closes #130)
snowplow · Dec 5, 2017 · 40c56a8 · 40c56a8
1 parent 358d01d
commit 40c56a8
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 46 deletions.
diff --git a/integration/integration_test.sh b/integration/integration_test.sh
@@ -7,7 +7,6 @@ sudo service snowplow_stream_enrich start
 sudo service snowplow_elasticsearch_loader_good start
 sudo service snowplow_elasticsearch_loader_bad start
 sudo service kibana4_init start
-sudo service nginx start
 sleep 15
 
 # Send good and bad events

diff --git a/provisioning/resources/configs/Caddyfile b/provisioning/resources/configs/Caddyfile
@@ -35,3 +35,7 @@
     without /control-plane
   }
 }
+
+*:3000 {
+  root /home/ubuntu/snowplow/ui
+}
diff --git a/provisioning/resources/configs/snowplow-mini.conf b/provisioning/resources/configs/snowplow-mini.conf
diff --git a/provisioning/resources/init/nginx_passenger b/provisioning/resources/init/nginx_passenger
diff --git a/provisioning/roles/sp_mini_3_setup_apps/tasks/main.yml b/provisioning/roles/sp_mini_3_setup_apps/tasks/main.yml
@@ -169,22 +169,6 @@
     dest: "/opt/kibana"
     state: link
 
-- name: Install nginx
-  become: yes
-  apt:
-    name: "nginx"
-    state: present
-    update_cache: yes
-    cache_valid_time: 3600
-
-- name: Install apache2-dev
-  become: yes
-  apt:
-    name: "apache2-dev"
-    state: present
-    update_cache: yes
-    cache_valid_time: 3600
-
 - name: Install Caddy
   become: yes
   shell: "curl https://getcaddy.com | bash"

diff --git a/provisioning/roles/sp_mini_5_copy_ui_folders/tasks/main.yml b/provisioning/roles/sp_mini_5_copy_ui_folders/tasks/main.yml
@@ -7,16 +7,3 @@
     src: "{{playbook_dir}}/resources/ui"
     dest: "{{main_dir}}"
     recursive: yes
-
-- name: Delete default nginx config
-  become: yes
-  file:
-    path: "/etc/nginx/sites-enabled/default"
-    state: absent
-
-- name: Copy snowplow-mini.conf under nginx config dir
-  become: yes
-  copy:
-    remote_src: true
-    src: "{{configs_dir}}/snowplow-mini.conf"
-    dest: "/etc/nginx/conf.d"
diff --git a/provisioning/roles/sp_mini_6_setup_init/tasks/main.yml b/provisioning/roles/sp_mini_6_setup_init/tasks/main.yml
@@ -16,7 +16,6 @@
     - snowplow_elasticsearch_loader_good
     - snowplow_elasticsearch_loader_bad
     - iglu_server_0.2.0
-    - nginx_passenger
     - caddy_init
     - nsqd_init
     - nsqlookupd_init
@@ -32,8 +31,6 @@
     - snowplow_elasticsearch_loader_good
     - snowplow_elasticsearch_loader_bad
     - iglu_server_0.2.0
-    - nginx_passenger
-    - nginx
     - elasticsearch
     - caddy_init
     - nsqd_init