Removed AWS Integration

Added Finalize feature for Team Leaders

Author: emil916

AUTHORS.txt

@@ -10,3 +10,7 @@ OTHER CONTRIBUTORS
 Kian Mirjalali <[email protected]>
 Eqbal Sarjami <[email protected]>
 Mohammadreza Montazeri <[email protected]>
+
+OTHER CONTRIBUTORS [ioi-2019-baku]
+
+Emil Abbasov <[email protected]>

README.md

@@ -5,7 +5,7 @@ The IOI Translation System provides a web interface for translating the tasks (p
 into various languages during the International Olympiads in Informatics.
 The system has been developed and first used in the IOI 2017 in Tehran, Iran.
 
-This fork, used in IOI 2018, contains AWS S3 support for the file storage and CMS integration.
+This fork, used in IOI 2019 Baku.
 
 Features
 --------
@@ -27,7 +27,7 @@ Deployment
 
 ioi-translation is designed to be deployed on a Docker-compatible container platform. PostgreSQL and Redis are required for persistent storage and session store, respectively. Deployment behind reverse proxy such as nginx is recommended.
 
-See `docker-compose.yml` for example deployment configurations (Note that `docker-compose.yml` in this repository is for development and not intended for use in production deployment). For the actual deployment in IOI 2018, refer to <https://github.com/jcioi/ioi-htc> (especially [ECS and nginx configuration](https://github.com/jcioi/ioi-htc/blob/master/hako/translation-prd.jsonnet) and [CMS integration](https://github.com/jcioi/ioi-htc/blob/master/itamae/cookbooks/ioi-cms-import-statement-worker/files/usr/bin/ioi-cms-import-statement-worker.rb))
+See `docker-compose.yml` for example deployment configurations (Note that `docker-compose.yml` in this repository is for development and not intended for use in production deployment). For the actual deployment in IOI 2019, refer to <https://github.com/ioi-2019>.
 
 
 Development Installation
@@ -40,7 +40,7 @@ You can install the translation system in just three steps:
 3. Run `docker-compose up -d`.
 
 At this point, you will have a copy of the translation system up
-and running at `http://your_server_address:8000/`.
+and running at `http://your_server_address:9000/`.
 You may optionally perform the following tasks:
 
 * To create essential data for the system such as admin users and groups,

Translation/settings.py

@@ -166,7 +166,8 @@
     },
     'loggers': {
         'django': {
-            'handlers': os.environ.get('LOG_HANDLERS', 'stderr').split(','),
+            'handlers': os.environ.get('LOG_HANDLERS', 'stderr').split(','), 	#show errors
+#            'handlers': ['file', 'sentry'],	#not show errors
             'level': 'DEBUG',
             'propagate': True,
         },
@@ -196,12 +197,3 @@
 STATIC_ROOT = os.path.join(BASE_DIR, "static/")
 HOST_URL = 'http://127.0.0.1:9000/'
 
-if 'S3_BUCKET' in os.environ:
-    DEFAULT_FILE_STORAGE = 'trans.s3storage.S3Storage'
-    AWS_STORAGE_BUCKET_NAME = os.environ['S3_BUCKET']
-    AWS_S3_REGION_NAME = os.environ.get('S3_REGION')
-    AWS_DEFAULT_ACL = 'private'
-
-SQS_QUEUE_NAME = os.environ.get('SQS_QUEUE_NAME')
-SQS_REGION_NAME = os.environ.get('SQS_REGION_NAME')
-

buildspec.yml

@@ -11,7 +11,7 @@ services:
     - postgres
     - redis
     environment:
-      SECRET_KEY: 'secret_key_for_development_2969b4b149439648a52aa663bd740a4f'
+      SECRET_KEY: 'secret_key_for_development_3969b4b149439648a52aa663bd740a4f'
       SESSION_COOKIE_SECURE: 0
       DB_HOST: postgres
       DB_USER: &db_user postgres
@@ -20,14 +20,8 @@ services:
       REDIS_HOST: redis
       REDIS_DB: 1
       GUNICORN_WORKERS: 2
-      PRINT_SYSTEM_URL: http://print.ioi18.net
-#      S3_BUCKET: ioi18-translation-files-dev
-#      S3_REGION: ap-northeast-1
-#      SQS_QUEUE_NAME: cms-statement-dev
-#      SQS_REGION_NAME: ap-northeast-1
-#      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
-#      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
-#      AWS_SESSION_TOKEN: '${AWS_SESSION_TOKEN}'
+      PRINT_SYSTEM_URL: http://localhost
+
 
   nginx:
     restart: always
@@ -38,6 +32,7 @@ services:
     - app
     volumes:
     - ioi_static:/usr/src/app/static/:ro
+    - ioi_media:/usr/src/app/media/:ro
 
   postgres:
     restart: always

data/countries.csv

@@ -21,7 +21,9 @@ if [[ $# -eq 0 ]]; then
     python3 manage.py migrate
 
     echo "Starting Gunicorn"
-    exec /usr/local/bin/gunicorn Translation.wsgi:application -w "${GUNICORN_WORKERS:-1}" -b :9000
+	
+#	For using docker in development settings, add `--reload` option below to the execution line of gunicorn
+    exec /usr/local/bin/gunicorn Translation.wsgi:application --reload -w "${GUNICORN_WORKERS:-1}" -b :9000
 fi
 
 exec "$@"

data/languages.csv

@@ -11,7 +11,10 @@ server {
     location /static {
         alias /usr/src/app/static;
     }
-
+	location /media {
+        alias /usr/src/app/media;
+    }
+	
     location / {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -21,14 +24,4 @@ server {
     }
 
     include /etc/nginx/resolver;
-    location /s3proxy {
-        internal;
-        set $s3url $upstream_http_location;
-
-        proxy_ssl_protocols TLSv1.2;
-        proxy_set_header Authorization "";
-        proxy_pass $s3url;
-
-        add_header Cache-Control "private, no-cache";
-    }
 }