diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index b4fcc73eb2..0000000000 --- a/Vagrantfile +++ /dev/null @@ -1,33 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "ubuntu/trusty64" - - config.vm.provider :lxc do |v, override| - override.vm.box = "fgrehm/trusty64-lxc" - end - - config.vm.provider :virtualbox do |vb| - vb.customize ["modifyvm", :id, "--memory", "1024"] - end - - # Development box - config.vm.define "development", autostart: false do |development| - development.vm.network "forwarded_port", guest: 8000, host: 8000 - development.vm.synced_folder ".", "/mayan-edms-repository" - development.vm.provision :shell, :path => "contrib/scripts/install/development.sh", privileged: false - - development.vm.provision "file", destination: "/home/vagrant/mayan-edms/mayan/settings/celery_redis.py", source: "contrib/settings/celery_redis.py" - development.vm.provision "file", destination: "/home/vagrant/mayan-edms/mayan_edms_worker.sh", source: "contrib/misc/mayan_edms_worker.sh" - end - - # Production box - config.vm.define "production", autostart: false do |production| - production.vm.network "forwarded_port", guest: 80, host: 8080 - production.vm.provision :shell, :path => "contrib/scripts/install/production.sh", privileged: true - end - -end diff --git a/contrib/misc/mayan_edms_worker.sh b/contrib/misc/mayan_edms_worker.sh deleted file mode 100755 index 59e1c4055b..0000000000 --- a/contrib/misc/mayan_edms_worker.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -DJANGO_SETTINGS_MODULE='mayan.settings.celery_redis' celery -A mayan worker -l DEBUG -Ofair -B diff --git a/contrib/nginx/mayan b/contrib/nginx/mayan deleted file mode 100644 index 1d8f6ec95f..0000000000 --- a/contrib/nginx/mayan +++ /dev/null @@ -1,22 +0,0 @@ -server { - listen 80; - server_name localhost; - - location / { - include uwsgi_params; - uwsgi_pass unix:/usr/share/mayan-edms/uwsgi.sock; - - client_max_body_size 30M; # Increse if your plan to upload bigger documents - proxy_read_timeout 30s; # Increase if your document uploads take more than 30 seconds - } - - location /static { - alias /usr/share/mayan-edms/mayan/media/static; - expires 1h; - } - - location /favicon.ico { - alias /usr/share/mayan-edms/mayan/media/static/appearance/images/favicon.ico; - expires 1h; - } -} diff --git a/contrib/scripts/PEP8_check.sh b/contrib/scripts/PEP8_check.sh deleted file mode 100755 index 742cbc4fe4..0000000000 --- a/contrib/scripts/PEP8_check.sh +++ /dev/null @@ -1 +0,0 @@ -flake8 --ignore=E501 mayan/apps | grep -v "F401 'models' imported but unused" | grep -v "F811 redefinition of unused 'models'"| grep -v "F401 'db' imported but unused" | grep -v "F812 list comprehension redefines 'user_id'" | grep -v "F812 list comprehension redefines 'document_id'" |less diff --git a/contrib/scripts/make_fabfile_tar.sh b/contrib/scripts/make_fabfile_tar.sh deleted file mode 100755 index ee8714609b..0000000000 --- a/contrib/scripts/make_fabfile_tar.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -find 'fabfile' -depth -name '*.pyc' -exec rm {} \; -tar -czvf contrib/fabfile.tar.gz fabfile diff --git a/contrib/settings/celery_redis.py b/contrib/settings/celery_redis.py deleted file mode 100644 index e05f5c450a..0000000000 --- a/contrib/settings/celery_redis.py +++ /dev/null @@ -1,5 +0,0 @@ -from .local import * - -CELERY_ALWAYS_EAGER = False -BROKER_URL = 'redis://127.0.0.1:6379/0' -CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0' diff --git a/contrib/supervisor/mayan-celery.conf b/contrib/supervisor/mayan-celery.conf deleted file mode 100644 index ab7f24b279..0000000000 --- a/contrib/supervisor/mayan-celery.conf +++ /dev/null @@ -1,26 +0,0 @@ -[program:mayan-worker] -command = /usr/share/mayan-edms/bin/python /usr/share/mayan-edms/bin/mayan-edms.py celery --settings=mayan.settings.production worker -Ofair -l ERROR -directory = /usr/share/mayan-edms -user = www-data -stdout_logfile = /var/log/mayan/worker-stdout.log -stderr_logfile = /var/log/mayan/worker-stderr.log -autostart = true -autorestart = true -startsecs = 10 -stopwaitsecs = 10 -killasgroup = true -priority = 998 - -[program:mayan-beat] -command = /usr/share/mayan-edms/bin/python /usr/share/mayan-edms/bin/mayan-edms.py celery --settings=mayan.settings.production beat -l ERROR -directory = /usr/share/mayan-edms -user = www-data -numprocs = 1 -stdout_logfile = /var/log/mayan/beat-stdout.log -stderr_logfile = /var/log/mayan/beat-stderr.log -autostart = true -autorestart = true -startsecs = 10 -stopwaitsecs = 1 -killasgroup = true -priority = 998 diff --git a/contrib/supervisor/mayan-uwsgi.conf b/contrib/supervisor/mayan-uwsgi.conf deleted file mode 100644 index 89f0e77f14..0000000000 --- a/contrib/supervisor/mayan-uwsgi.conf +++ /dev/null @@ -1,6 +0,0 @@ -[program:mayan-uwsgi] -command = /usr/share/mayan-edms/bin/uwsgi --ini /usr/share/mayan-edms/uwsgi.ini -user = root -autostart = true -autorestart = true -redirect_stderr = true diff --git a/mayan/apps/django_gpg/tests/literals.py b/mayan/apps/django_gpg/tests/literals.py index eb1fc37ceb..6e3a31a5f9 100644 --- a/mayan/apps/django_gpg/tests/literals.py +++ b/mayan/apps/django_gpg/tests/literals.py @@ -5,12 +5,12 @@ import os from django.conf import settings TEST_DETACHED_SIGNATURE = os.path.join( - settings.BASE_DIR, 'mayan', 'apps', 'django_gpg', 'tests', 'contrib', + settings.BASE_DIR, 'apps', 'django_gpg', 'tests', 'contrib', 'test_files', 'test_file.txt.asc' ) TEST_FILE = os.path.join( - settings.BASE_DIR, 'mayan', 'apps', 'django_gpg', 'tests', 'contrib', + settings.BASE_DIR, 'apps', 'django_gpg', 'tests', 'contrib', 'test_files', 'test_file.txt' ) @@ -84,7 +84,7 @@ TEST_SEARCH_UID = 'Roberto Rosario' TEST_SEARCH_FINGERPRINT = '607138F1AECC5A5CA31CB7715F3F7F75D210724D' TEST_SIGNED_FILE = os.path.join( - settings.BASE_DIR, 'mayan', 'apps', 'django_gpg', 'tests', 'contrib', + settings.BASE_DIR, 'apps', 'django_gpg', 'tests', 'contrib', 'test_files', 'test_file.txt.gpg' ) TEST_SIGNED_FILE_CONTENT = 'test_file.txt\n' diff --git a/contrib/sample_documents/key0x5F3F7F75D210724D.asc b/mayan/apps/document_signatures/tests/contrib/sample_documents/key0x5F3F7F75D210724D.asc similarity index 100% rename from contrib/sample_documents/key0x5F3F7F75D210724D.asc rename to mayan/apps/document_signatures/tests/contrib/sample_documents/key0x5F3F7F75D210724D.asc diff --git a/contrib/sample_documents/mayan_11_1.pdf.gpg b/mayan/apps/document_signatures/tests/contrib/sample_documents/mayan_11_1.pdf.gpg similarity index 100% rename from contrib/sample_documents/mayan_11_1.pdf.gpg rename to mayan/apps/document_signatures/tests/contrib/sample_documents/mayan_11_1.pdf.gpg diff --git a/contrib/sample_documents/mayan_11_1.pdf.sig b/mayan/apps/document_signatures/tests/contrib/sample_documents/mayan_11_1.pdf.sig similarity index 100% rename from contrib/sample_documents/mayan_11_1.pdf.sig rename to mayan/apps/document_signatures/tests/contrib/sample_documents/mayan_11_1.pdf.sig diff --git a/mayan/apps/document_signatures/tests/literals.py b/mayan/apps/document_signatures/tests/literals.py index 1d3f3380a4..1cda72593a 100644 --- a/mayan/apps/document_signatures/tests/literals.py +++ b/mayan/apps/document_signatures/tests/literals.py @@ -5,14 +5,16 @@ import os from django.conf import settings TEST_SIGNED_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', 'mayan_11_1.pdf.gpg' + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', 'mayan_11_1.pdf.gpg' ) TEST_SIGNATURE_FILE_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', 'mayan_11_1.pdf.sig' + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', 'mayan_11_1.pdf.sig' ) TEST_KEY_FILE = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - 'key0x5F3F7F75D210724D.asc' + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', 'key0x5F3F7F75D210724D.asc' ) TEST_KEY_ID = '5F3F7F75D210724D' TEST_SIGNATURE_ID = 'XVkoGKw35yU1iq11dZPiv7uAY7k' diff --git a/contrib/sample_documents/I18N_title_áéíóúüñÑ.png b/mayan/apps/documents/tests/contrib/sample_documents/I18N_title_áéíóúüñÑ.png similarity index 100% rename from contrib/sample_documents/I18N_title_áéíóúüñÑ.png rename to mayan/apps/documents/tests/contrib/sample_documents/I18N_title_áéíóúüñÑ.png diff --git a/contrib/sample_documents/I18N_title_áéíóúüñÑ.png.zip b/mayan/apps/documents/tests/contrib/sample_documents/I18N_title_áéíóúüñÑ.png.zip similarity index 100% rename from contrib/sample_documents/I18N_title_áéíóúüñÑ.png.zip rename to mayan/apps/documents/tests/contrib/sample_documents/I18N_title_áéíóúüñÑ.png.zip diff --git a/contrib/sample_documents/compressed_documents.zip b/mayan/apps/documents/tests/contrib/sample_documents/compressed_documents.zip similarity index 100% rename from contrib/sample_documents/compressed_documents.zip rename to mayan/apps/documents/tests/contrib/sample_documents/compressed_documents.zip diff --git a/contrib/sample_documents/deu_website.png b/mayan/apps/documents/tests/contrib/sample_documents/deu_website.png similarity index 100% rename from contrib/sample_documents/deu_website.png rename to mayan/apps/documents/tests/contrib/sample_documents/deu_website.png diff --git a/contrib/sample_documents/hybrid_text_and_image.pdf b/mayan/apps/documents/tests/contrib/sample_documents/hybrid_text_and_image.pdf similarity index 100% rename from contrib/sample_documents/hybrid_text_and_image.pdf rename to mayan/apps/documents/tests/contrib/sample_documents/hybrid_text_and_image.pdf diff --git a/contrib/sample_documents/mayan_11_1.pdf b/mayan/apps/documents/tests/contrib/sample_documents/mayan_11_1.pdf similarity index 100% rename from contrib/sample_documents/mayan_11_1.pdf rename to mayan/apps/documents/tests/contrib/sample_documents/mayan_11_1.pdf diff --git a/contrib/sample_documents/multi_page.tiff b/mayan/apps/documents/tests/contrib/sample_documents/multi_page.tiff similarity index 100% rename from contrib/sample_documents/multi_page.tiff rename to mayan/apps/documents/tests/contrib/sample_documents/multi_page.tiff diff --git a/contrib/sample_documents/simple_2_page_document.doc b/mayan/apps/documents/tests/contrib/sample_documents/simple_2_page_document.doc similarity index 100% rename from contrib/sample_documents/simple_2_page_document.doc rename to mayan/apps/documents/tests/contrib/sample_documents/simple_2_page_document.doc diff --git a/contrib/sample_documents/title_page.png b/mayan/apps/documents/tests/contrib/sample_documents/title_page.png similarity index 100% rename from contrib/sample_documents/title_page.png rename to mayan/apps/documents/tests/contrib/sample_documents/title_page.png diff --git a/mayan/apps/documents/tests/literals.py b/mayan/apps/documents/tests/literals.py index 4956dbbee1..7af94441aa 100644 --- a/mayan/apps/documents/tests/literals.py +++ b/mayan/apps/documents/tests/literals.py @@ -36,37 +36,39 @@ afc7fd6d4c02124879a' # File paths TEST_COMPRESSED_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_COMPRESSED_DOCUMENTS_FILENAME + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_COMPRESSED_DOCUMENTS_FILENAME ) TEST_DEU_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_DEU_DOCUMENT_FILENAME + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_DEU_DOCUMENT_FILENAME ) TEST_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', TEST_DOCUMENT_FILENAME + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_DOCUMENT_FILENAME ) TEST_DOCUMENT_TYPE_QUICK_LABEL = 'test quick label' TEST_HYBRID_DOCUMENT_PATH = os.path.join( - 'contrib', 'sample_documents', TEST_HYBRID_DOCUMENT + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_HYBRID_DOCUMENT ) TEST_MULTI_PAGE_TIFF_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_MULTI_PAGE_TIFF + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_MULTI_PAGE_TIFF ) TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME ) TEST_NON_ASCII_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_NON_ASCII_DOCUMENT_FILENAME + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_NON_ASCII_DOCUMENT_FILENAME ) TEST_OFFICE_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_OFFICE_DOCUMENT + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_OFFICE_DOCUMENT ) TEST_SMALL_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_SMALL_DOCUMENT_FILENAME + settings.BASE_DIR, 'apps', 'documents', 'tests', 'contrib', + 'sample_documents', TEST_SMALL_DOCUMENT_FILENAME )