Initial changes for FS restructure

Dockerfile

-FROM nginx:stable
+FROM nginx:alpine
 
 # We will map these using volumes
 RUN rm /etc/nginx/nginx.conf
 RUN rm /etc/nginx/conf.d/default.conf
 
-RUN touch /var/run/nginx.pid && \
-  chown -R www-data:www-data /etc/nginx && \
-  chown -R www-data:www-data /var/run/nginx.pid && \
-  chown -R www-data:www-data /var/cache/nginx && \
-  chown -R www-data:www-data /var/log/nginx/
+RUN touch /var/run/nginx.pid
+#RUN chown -R www-data:www-data /etc/nginx && \
+#  chown -R www-data:www-data /var/run/nginx.pid && \
+#  chown -R www-data:www-data /var/cache/nginx && \
+#  chown -R www-data:www-data /var/log/nginx/
 
-USER www-data
+#RUN usermod -u 1000 www-data
+
+#USER www-data

erb/default.conf.erb

@@ -213,7 +213,7 @@ server {
    }
 
    location /uploads {
-      alias /data/uploads/<%= course_name %>;
+      alias /data/content/<%= course_name %>/uploads/;
       sendfile off;
       expires           0;
       add_header        Cache-Control private;
@@ -226,7 +226,7 @@ server {
       break;
    }
    location /filemanager {
-      alias /data;
+      alias /data/content/;
       sendfile off;
       expires           0;
       add_header        Cache-Control private;
@@ -298,8 +298,6 @@ server {
  }
 
 
-
-
 ## end -enote version
 <% end %>
 
@@ -349,7 +347,7 @@ server {
    }
 
    location /uploads {
-      alias /data/uploads;
+      alias /data/content/<%= course_name %>/uploads/;
       sendfile off;
       expires           0;
       add_header        Cache-Control private;
@@ -362,7 +360,7 @@ server {
       break;
    }
    location /filemanager {
-      alias /data;
+      alias /data/content/;
       sendfile off;
       expires           0;
       add_header        Cache-Control private;

erb/docker-compose-enote.yml.erb

@@ -6,7 +6,7 @@ services:
 
   redis:
     container_name: redis
-    image: redis
+    image: redis:alpine
 <% if public_server %>
     expose:
       - "6379"
@@ -41,7 +41,7 @@ services:
       - <%= @data_root %>/config/quiz-db.yaml:/data/mongo-db.yaml
       - <%= @data_root %>/quiz-db:/data/db
       - <%= @data_root %>/quiz-db-backups:/data/backups
-      - <%= @data_root %>/log/quiz-db:/var/log/mongodb
+      - <%= @log_root %>/quiz-db:/var/log/mongodb
     environment:
       AUTH: 'yes'
       TZ: '<%= timezone %>'
@@ -75,7 +75,7 @@ services:
     - <%= @data_root %>/quiz-public:/data/quiz-public  # assets for the quiz web-app
     - <%= @data_root %>/quiz-keys:/data/quiz-keys      # keys for the course github repos for the quizzes
     - <%= @data_root %>/quiz-repos:/data/quiz-repos    # kcourse github repos for the quizzes
-    - <%= @data_root %>/log/quiz:/dtu-quiz/log
+    - <%= @log_root %>/quiz:/dtu-quiz/log
     environment:
       RAILS_ENV: 'production'
       allow_testing: '<%= allow_testing %>'
@@ -103,8 +103,8 @@ services:
 <% end %>
     volumes:
       - <%= @data_root %>/config:/data/config
-      - <%= @data_root %>/website-enotes-staging:/enotes
-      - <%= @data_root %>/getpdf-keys:/root/.ssh
+      - <%= @data_root %>/content:/content
+#      - <%= @data_root %>/getpdf-keys:/root/.ssh
       - <%= @data_root %>/sharelatex-data/:/var/lib/sharelatex
     environment:
       TIMEZONE_CITY: '<%= timezone_city %>'
@@ -116,7 +116,7 @@ services:
 <% if enabled_features[:sharelatexdb] %>
   sharelatex-db:
     container_name: <%= @container_prefix %>sharelatex-db
-    image: mongo:4.0.0
+    image: mongo:4.0.6-xenial
     expose:
       - "27017"
     ports:
@@ -124,7 +124,7 @@ services:
     volumes:
       - <%= @data_root %>/config/sharelatex-db.yaml:/data/mongo-db.yaml
       - <%= @data_root %>/sharelatex-db:/data/db
-      - <%= @data_root %>/log/sharelatex-db:/var/log/mongodb
+      - <%= @log_root %>/sharelatex-db:/var/log/mongodb
     environment:
       TIMEZONE_CITY: '<%= timezone_city %>'
       TZ: '<%= timezone %>'
@@ -135,7 +135,7 @@ services:
 <% if enabled_features[:sharelatex] %>
   sharelatex-redis:
     container_name: <%= @container_prefix %>redis_sharelatex
-    image: redis
+    image: redis:alpine
     expose:
       - "6379"
     environment:
@@ -210,14 +210,11 @@ services:
       - <%= @data_root %>/config:/data/config
       - <%= @data_root %>/cndumper:/data/user_config
       - <%= @gen_root %>/deployment-info.yaml:/data/env_config/deployment-info.yaml
-      - <%= @data_root %>/website-uploads/:/filemanager/uploads/
-      - <%= @data_root %>/website-enotes/:/filemanager/enotes/
-      - <%= @data_root %>/website-enotes-staging/:/filemanager/enotes-staging/
+      - <%= @data_root %>/content/:/data/content
       - <%= @data_root %>/website-db/:/data/website-db/
       - <%= @data_root %>/website-public/:/data/website-public/
-      - <%= @data_root %>/website-raw/:/data/website-raw/
-      - <%= @data_root %>/log/course-website:/dtu-course/app/log
-      - <%= @data_root %>/getpdf-keys:/get-pdf-keys
+      - <%= @log_root %>/course-website:/dtu-course/app/log
+#      - <%= @data_root %>/getpdf-keys:/get-pdf-keys
     expose:
       - "3000"
     networks:
@@ -235,14 +232,11 @@ services:
       - <%= @gen_root %>/default.conf:/etc/nginx/conf.d/default.conf
       - <%= @src_root %>/dtu-enote/nginx.conf:/etc/nginx/nginx.conf
       - <%= @data_root %>/certs:/data/certs/:ro
-      - <%= @data_root %>/log/revproxy:/var/log/nginx
+      - <%= @log_root %>/revproxy:/var/log/nginx
       - <%= @data_root %>/quiz-public/:/data/quiz-public
       - <%= @data_root %>/quiz-assets/:/data/quiz-assets
       - <%= @data_root %>/website-public/:/data/website-public
-      - <%= @data_root %>/website-raw/:/data/website-raw
-      - <%= @data_root %>/website-uploads/:/data/uploads
-      - <%= @data_root %>/website-enotes/:/data/enotes
-      - <%= @data_root %>/website-enotes-staging/:/data/enotes-staging
+      - <%= @data_root %>/content/:/data/content
       - <%= @data_root %>/root/:/var/www
     networks:
       - revproxynet

lib/enote_config.rb

@@ -33,6 +33,7 @@ module EnoteConfig
     @logger.level = Logger::DEBUG
 
     @data_root = ENV['DTU_ENOTE_VOL'] || '/enote/vol'
+    @log_root = ENV['DTU_ENOTE_LOG'] || '/enote/log'
     @gen_root = ENV['DTU_ENOTE_GEN'] || '/enote/gen'
     @src_root = ENV['DTU_ENOTE_SRC'] || '/enote/src'
     @config_root = File.join(data_root, 'config')