From a16346c087b53c0b7d9583bb4d5543193ac67a88 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Tue, 8 Mar 2016 18:35:14 -0500 Subject: [PATCH] Finish up --- slides/list.json | 4 +++- slides/resources.md | 7 +++++++ .../setup-a-middleware-for-server-continued.md | 17 +++++++++++++++++ slides/setup-a-middleware-for-server.md | 12 ------------ slides/setup-a-middleware.md | 4 ++-- 5 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 slides/resources.md create mode 100644 slides/setup-a-middleware-for-server-continued.md diff --git a/slides/list.json b/slides/list.json index 65fd12c..1b5c376 100644 --- a/slides/list.json +++ b/slides/list.json @@ -12,7 +12,9 @@ "let-s-deploy.md", "setup-a-middleware.md", "setup-a-middleware-for-server.md", + "setup-a-middleware-for-server-continued.md", "run-a-web-server.md", "time-for-the-special-sauce.md", - "setup-git-remote.md" + "setup-git-remote.md", + "resources.md" ] \ No newline at end of file diff --git a/slides/resources.md b/slides/resources.md new file mode 100644 index 0000000..0a52c8f --- /dev/null +++ b/slides/resources.md @@ -0,0 +1,7 @@ +## Resources + +* [These slides](https://github.com/atomaka/deploying-rails-app) +* [Sample application](https://github.com/atomaka/jokes-rails) +* [Configuration gist](https://gist.github.com/atomaka/d104019ffe3aa35bcd39) + +note: diff --git a/slides/setup-a-middleware-for-server-continued.md b/slides/setup-a-middleware-for-server-continued.md new file mode 100644 index 0000000..bfb0bc6 --- /dev/null +++ b/slides/setup-a-middleware-for-server-continued.md @@ -0,0 +1,17 @@ +## Server Middleware (continued) + +* Deploy startup files + +``` +sudo cp puma.conf puma-manager.conf /etc/init +``` + +* Configure Puma (/etc/puma.conf) + +``` +/home/app/jokes +``` + +note: + Put your speaker notes here. + You can see them pressing 's'. diff --git a/slides/setup-a-middleware-for-server.md b/slides/setup-a-middleware-for-server.md index 4b28a0c..040c7f6 100644 --- a/slides/setup-a-middleware-for-server.md +++ b/slides/setup-a-middleware-for-server.md @@ -20,16 +20,4 @@ setgid app export SECRET_KEY_BASE="YOUR_SECRET_KEY_HERE" ``` -* Deploy startup files - -``` -sudo cp puma.conf puma-manager.conf /etc/init -``` - -* Configure Puma (/etc/puma.conf) - -``` -/home/app/jokes -``` - note: diff --git a/slides/setup-a-middleware.md b/slides/setup-a-middleware.md index 1f75b5e..194caf7 100644 --- a/slides/setup-a-middleware.md +++ b/slides/setup-a-middleware.md @@ -4,12 +4,12 @@ ``` group :production do - gem 'puma' + gem 'puma' end ``` * Configure Puma - * config/puma.rb from [https://goo.gl/f36vHg](https://goo.gl/f36vHg) + * puma.rb from [https://goo.gl/f36vHg](https://goo.gl/f36vHg) note: