restore /dev/ for non-root users

Fixes #48
fly-apps · Aug 1, 2023 · 8292135 · 8292135
1 parent 33d111e
commit 8292135
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/generators/templates/_nginx.erb b/lib/generators/templates/_nginx.erb
@@ -3,14 +3,14 @@ RUN gem install foreman && \
 <% unless run_as_root? -%>
     sed -i 's|pid /run|pid /rails/tmp/pids|' /etc/nginx/nginx.conf && \
 <% end -%>
-    sed -i 's/access_log\s.*;/access_log stdout;/' /etc/nginx/nginx.conf && \
-    sed -i 's/error_log\s.*;/error_log stderr info;/' /etc/nginx/nginx.conf
+    sed -i 's/access_log\s.*;/access_log <% unless run_as_root? %>\/dev\/<% end %>stdout;/' /etc/nginx/nginx.conf && \
+    sed -i 's/error_log\s.*;/error_log <% unless run_as_root? %>\/dev\/<% end %>stderr info;/' /etc/nginx/nginx.conf
 
 COPY <<-"EOF" /etc/nginx/sites-available/default
 server {
   listen 3000 default_server;
   listen [::]:3000 default_server;
-  access_log stdout;
+  access_log <% unless run_as_root? %>/dev/<% end %>stdout;
 
   root /rails/public;
 

diff --git a/test/results/nginx/Dockerfile b/test/results/nginx/Dockerfile
@@ -47,14 +47,14 @@ RUN apt-get update -qq && \
 # configure nginx
 RUN gem install foreman && \
     sed -i 's|pid /run|pid /rails/tmp/pids|' /etc/nginx/nginx.conf && \
-    sed -i 's/access_log\s.*;/access_log stdout;/' /etc/nginx/nginx.conf && \
-    sed -i 's/error_log\s.*;/error_log stderr info;/' /etc/nginx/nginx.conf
+    sed -i 's/access_log\s.*;/access_log \/dev\/stdout;/' /etc/nginx/nginx.conf && \
+    sed -i 's/error_log\s.*;/error_log \/dev\/stderr info;/' /etc/nginx/nginx.conf
 
 COPY <<-"EOF" /etc/nginx/sites-available/default
 server {
   listen 3000 default_server;
   listen [::]:3000 default_server;
-  access_log stdout;
+  access_log /dev/stdout;
 
   root /rails/public;