Fix #31: Wrap Jekyll around Chpst around Jekyll.

envygeeks · Sep 9, 2015 · 8ac08bb · 8ac08bb
1 parent 8047f96
commit 8ac08bb
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 36 deletions.
diff --git a/copy/usr/local/bin/jekyll b/copy/usr/local/bin/jekyll
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-Process::Sys.setuid(1000) rescue nil
-Process::Sys.setgid(1000) rescue nil
-
 # Because of a bug in Jekyll 2.4 that was resolved somewhere between 2.4 and 2.5
 # we work around problems with `s` and host by just changing s to serve for you
 # so that you get -H that works.
@@ -22,6 +19,12 @@ if %W(serve server).include?(ARGV[0])
   )
 end
 
-load Gem.bin_path(
-  "jekyll", "jekyll"
-)
+# Pass it onto chpst.
+if Process.uid == 0
+  exec "chpst", "-u", "jekyll:jekyll", Gem.bin_path("jekyll", "jekyll"), \
+    *ARGV
+else
+  load Gem.bin_path(
+    "jekyll", "jekyll"
+  )
+end
diff --git a/tags/beta/copy/usr/local/bin/jekyll b/tags/beta/copy/usr/local/bin/jekyll
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-Process::Sys.setuid(1000) rescue nil
-Process::Sys.setgid(1000) rescue nil
-
 # Because of a bug in Jekyll 2.4 that was resolved somewhere between 2.4 and 2.5
 # we work around problems with `s` and host by just changing s to serve for you
 # so that you get -H that works.
@@ -13,12 +10,21 @@ if "s" == ARGV[0]
   )
 end
 
+# Give a default listener of everything for Jekyll inside of Docker so that you
+# can view your site if you are using the server provided by Jekyll.
+
 if %W(serve server).include?(ARGV[0])
   ARGV.unshift(ARGV.shift,
     "-H", "0.0.0.0"
   )
 end
 
-load Gem.bin_path(
-  "jekyll", "jekyll"
-)
+# Pass it onto chpst.
+if Process.uid == 0
+  exec "chpst", "-u", "jekyll:jekyll", Gem.bin_path("jekyll", "jekyll"), \
+    *ARGV
+else
+  load Gem.bin_path(
+    "jekyll", "jekyll"
+  )
+end
diff --git a/tags/latest/copy/usr/local/bin/jekyll b/tags/latest/copy/usr/local/bin/jekyll
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-Process::Sys.setuid(1000) rescue nil
-Process::Sys.setgid(1000) rescue nil
-
 # Because of a bug in Jekyll 2.4 that was resolved somewhere between 2.4 and 2.5
 # we work around problems with `s` and host by just changing s to serve for you
 # so that you get -H that works.
@@ -13,12 +10,21 @@ if "s" == ARGV[0]
   )
 end
 
+# Give a default listener of everything for Jekyll inside of Docker so that you
+# can view your site if you are using the server provided by Jekyll.
+
 if %W(serve server).include?(ARGV[0])
   ARGV.unshift(ARGV.shift,
     "-H", "0.0.0.0"
   )
 end
 
-load Gem.bin_path(
-  "jekyll", "jekyll"
-)
+# Pass it onto chpst.
+if Process.uid == 0
+  exec "chpst", "-u", "jekyll:jekyll", Gem.bin_path("jekyll", "jekyll"), \
+    *ARGV
+else
+  load Gem.bin_path(
+    "jekyll", "jekyll"
+  )
+end
diff --git a/tags/master/copy/usr/local/bin/jekyll b/tags/master/copy/usr/local/bin/jekyll
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-Process::Sys.setuid(1000) rescue nil
-Process::Sys.setgid(1000) rescue nil
-
 # Because of a bug in Jekyll 2.4 that was resolved somewhere between 2.4 and 2.5
 # we work around problems with `s` and host by just changing s to serve for you
 # so that you get -H that works.
@@ -13,12 +10,21 @@ if "s" == ARGV[0]
   )
 end
 
+# Give a default listener of everything for Jekyll inside of Docker so that you
+# can view your site if you are using the server provided by Jekyll.
+
 if %W(serve server).include?(ARGV[0])
   ARGV.unshift(ARGV.shift,
     "-H", "0.0.0.0"
   )
 end
 
-load Gem.bin_path(
-  "jekyll", "jekyll"
-)
+# Pass it onto chpst.
+if Process.uid == 0
+  exec "chpst", "-u", "jekyll:jekyll", Gem.bin_path("jekyll", "jekyll"), \
+    *ARGV
+else
+  load Gem.bin_path(
+    "jekyll", "jekyll"
+  )
+end
diff --git a/tags/pages/copy/usr/local/bin/jekyll b/tags/pages/copy/usr/local/bin/jekyll
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-Process::Sys.setuid(1000) rescue nil
-Process::Sys.setgid(1000) rescue nil
-
 # Because of a bug in Jekyll 2.4 that was resolved somewhere between 2.4 and 2.5
 # we work around problems with `s` and host by just changing s to serve for you
 # so that you get -H that works.
@@ -13,12 +10,21 @@ if "s" == ARGV[0]
   )
 end
 
+# Give a default listener of everything for Jekyll inside of Docker so that you
+# can view your site if you are using the server provided by Jekyll.
+
 if %W(serve server).include?(ARGV[0])
   ARGV.unshift(ARGV.shift,
     "-H", "0.0.0.0"
   )
 end
 
-load Gem.bin_path(
-  "jekyll", "jekyll"
-)
+# Pass it onto chpst.
+if Process.uid == 0
+  exec "chpst", "-u", "jekyll:jekyll", Gem.bin_path("jekyll", "jekyll"), \
+    *ARGV
+else
+  load Gem.bin_path(
+    "jekyll", "jekyll"
+  )
+end
diff --git a/tags/stable/copy/usr/local/bin/jekyll b/tags/stable/copy/usr/local/bin/jekyll
@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-Process::Sys.setuid(1000) rescue nil
-Process::Sys.setgid(1000) rescue nil
-
 # Because of a bug in Jekyll 2.4 that was resolved somewhere between 2.4 and 2.5
 # we work around problems with `s` and host by just changing s to serve for you
 # so that you get -H that works.
@@ -13,12 +10,21 @@ if "s" == ARGV[0]
   )
 end
 
+# Give a default listener of everything for Jekyll inside of Docker so that you
+# can view your site if you are using the server provided by Jekyll.
+
 if %W(serve server).include?(ARGV[0])
   ARGV.unshift(ARGV.shift,
     "-H", "0.0.0.0"
   )
 end
 
-load Gem.bin_path(
-  "jekyll", "jekyll"
-)
+# Pass it onto chpst.
+if Process.uid == 0
+  exec "chpst", "-u", "jekyll:jekyll", Gem.bin_path("jekyll", "jekyll"), \
+    *ARGV
+else
+  load Gem.bin_path(
+    "jekyll", "jekyll"
+  )
+end