From 02320c8a9becd3aa955ea5995e8dcc24ffee3764 Mon Sep 17 00:00:00 2001 From: eepMoody Date: Sat, 19 Jan 2019 21:55:21 -0500 Subject: [PATCH] flatten directory for simpler deploy --- Dockerfile | 6 ++---- server/Pipfile => Pipfile | 0 server/Pipfile.lock => Pipfile.lock | 0 server/Pipfile.tmp => Pipfile.tmp | 0 {server/api => api}/__init__.py | 0 {server/api => api}/admin.py | 0 {server/api => api}/apps.py | 0 {server/api => api}/management/__init__.py | 0 {server/api => api}/management/commands/__init__.py | 0 {server/api => api}/management/commands/importer.py | 0 .../api => api}/management/commands/populatedb.py | 0 {server/api => api}/migrations/0001_initial.py | 0 .../migrations/0002_auto_20180826_1613.py | 0 .../migrations/0003_remove_race_subtypes.py | 0 .../migrations/0004_auto_20180826_2043.py | 0 .../migrations/0005_auto_20180828_0106.py | 0 .../migrations/0006_monster_speed_json.py | 0 .../migrations/0007_remove_monster_speed_json.py | 0 .../migrations/0008_auto_20180903_0344.py | 0 {server/api => api}/migrations/0009_magicitem.py | 0 .../migrations/0010_background_feature_desc.py | 0 .../migrations/0011_auto_20180921_0233.py | 0 .../api => api}/migrations/0012_subrace_asi_json.py | 0 .../migrations/0013_auto_20180921_0257.py | 0 .../migrations/0014_auto_20180926_2101.py | 0 .../migrations/0015_auto_20181112_0537.py | 0 {server/api => api}/migrations/__init__.py | 0 {server/api => api}/models.py | 0 {server/api => api}/search_indexes.py | 0 {server/api => api}/serializers.py | 0 {server/api => api}/templatetags/__init__.py | 0 {server/api => api}/templatetags/custom_markdown.py | 0 {server/api => api}/tests.py | 0 {server/api => api}/utils.py | 0 {server/api => api}/views.py | 0 server/manage.py => manage.py | 0 {server/scripts => scripts}/add_srd_class.py | 0 {server/scripts => scripts}/add_srd_monsters.py | 0 {server/scripts => scripts}/add_srd_spells.py | 0 {server/scripts => scripts}/deploy.sh | 0 .../generate_self_signed_cert.sh | 0 {server/scripts => scripts}/generate_spell_data.py | 0 {server/scripts => scripts}/load_srd_content.py | 0 {server/scripts => scripts}/parse_content.py | 0 {server/scripts => scripts}/server_setup.sh | 0 server/{server => }/__init__.py | 0 server/{server => }/settings.py | 0 server/{server => }/urls.py | 0 .../whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg | Bin server/{server => }/whoosh_index/MAIN_WRITELOCK | 0 .../whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg | Bin .../whoosh_index/MAIN_ocywz2asp2tobqou.seg | Bin .../whoosh_index/MAIN_rm7ioktguf21jrb6.seg | Bin .../whoosh_index/MAIN_s9e3elhixxextzj8.seg | Bin .../whoosh_index/MAIN_vfxa9hknlnl7csix.seg | Bin .../whoosh_index/MAIN_xjczbq8saada6zht.seg | Bin server/{server => }/whoosh_index/_MAIN_7.toc | Bin server/{server => }/wsgi.py | 0 .../search/indexes/api/charclass_text.txt | 0 .../search/indexes/api/condition_text.txt | 0 .../search/indexes/api/magicitem_text.txt | 0 .../search/indexes/api/monster_text.txt | 0 .../search/indexes/api/race_text.txt | 0 .../search/indexes/api/section_text.txt | 0 .../search/indexes/api/spell_text.txt | 0 {server/templates => templates}/search/search.html | 0 66 files changed, 2 insertions(+), 4 deletions(-) rename server/Pipfile => Pipfile (100%) rename server/Pipfile.lock => Pipfile.lock (100%) rename server/Pipfile.tmp => Pipfile.tmp (100%) rename {server/api => api}/__init__.py (100%) rename {server/api => api}/admin.py (100%) rename {server/api => api}/apps.py (100%) rename {server/api => api}/management/__init__.py (100%) rename {server/api => api}/management/commands/__init__.py (100%) rename {server/api => api}/management/commands/importer.py (100%) rename {server/api => api}/management/commands/populatedb.py (100%) rename {server/api => api}/migrations/0001_initial.py (100%) rename {server/api => api}/migrations/0002_auto_20180826_1613.py (100%) rename {server/api => api}/migrations/0003_remove_race_subtypes.py (100%) rename {server/api => api}/migrations/0004_auto_20180826_2043.py (100%) rename {server/api => api}/migrations/0005_auto_20180828_0106.py (100%) rename {server/api => api}/migrations/0006_monster_speed_json.py (100%) rename {server/api => api}/migrations/0007_remove_monster_speed_json.py (100%) rename {server/api => api}/migrations/0008_auto_20180903_0344.py (100%) rename {server/api => api}/migrations/0009_magicitem.py (100%) rename {server/api => api}/migrations/0010_background_feature_desc.py (100%) rename {server/api => api}/migrations/0011_auto_20180921_0233.py (100%) rename {server/api => api}/migrations/0012_subrace_asi_json.py (100%) rename {server/api => api}/migrations/0013_auto_20180921_0257.py (100%) rename {server/api => api}/migrations/0014_auto_20180926_2101.py (100%) rename {server/api => api}/migrations/0015_auto_20181112_0537.py (100%) rename {server/api => api}/migrations/__init__.py (100%) rename {server/api => api}/models.py (100%) rename {server/api => api}/search_indexes.py (100%) rename {server/api => api}/serializers.py (100%) rename {server/api => api}/templatetags/__init__.py (100%) rename {server/api => api}/templatetags/custom_markdown.py (100%) rename {server/api => api}/tests.py (100%) rename {server/api => api}/utils.py (100%) rename {server/api => api}/views.py (100%) rename server/manage.py => manage.py (100%) rename {server/scripts => scripts}/add_srd_class.py (100%) rename {server/scripts => scripts}/add_srd_monsters.py (100%) rename {server/scripts => scripts}/add_srd_spells.py (100%) rename {server/scripts => scripts}/deploy.sh (100%) rename {server/scripts => scripts}/generate_self_signed_cert.sh (100%) rename {server/scripts => scripts}/generate_spell_data.py (100%) rename {server/scripts => scripts}/load_srd_content.py (100%) rename {server/scripts => scripts}/parse_content.py (100%) rename {server/scripts => scripts}/server_setup.sh (100%) rename server/{server => }/__init__.py (100%) rename server/{server => }/settings.py (100%) rename server/{server => }/urls.py (100%) rename server/{server => }/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg (100%) rename server/{server => }/whoosh_index/MAIN_WRITELOCK (100%) rename server/{server => }/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg (100%) rename server/{server => }/whoosh_index/MAIN_ocywz2asp2tobqou.seg (100%) rename server/{server => }/whoosh_index/MAIN_rm7ioktguf21jrb6.seg (100%) rename server/{server => }/whoosh_index/MAIN_s9e3elhixxextzj8.seg (100%) rename server/{server => }/whoosh_index/MAIN_vfxa9hknlnl7csix.seg (100%) rename server/{server => }/whoosh_index/MAIN_xjczbq8saada6zht.seg (100%) rename server/{server => }/whoosh_index/_MAIN_7.toc (100%) rename server/{server => }/wsgi.py (100%) rename {server/templates => templates}/search/indexes/api/charclass_text.txt (100%) rename {server/templates => templates}/search/indexes/api/condition_text.txt (100%) rename {server/templates => templates}/search/indexes/api/magicitem_text.txt (100%) rename {server/templates => templates}/search/indexes/api/monster_text.txt (100%) rename {server/templates => templates}/search/indexes/api/race_text.txt (100%) rename {server/templates => templates}/search/indexes/api/section_text.txt (100%) rename {server/templates => templates}/search/indexes/api/spell_text.txt (100%) rename {server/templates => templates}/search/search.html (100%) diff --git a/Dockerfile b/Dockerfile index da23d9b7..1a3c4ae8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,9 @@ ENV DJANGO_SECRET=default ENV OPEN5E_DEBUG=False ENV SERVER_NAME=localhost -COPY ./server /server +COPY ./ / -COPY ./data /data - -WORKDIR /server +WORKDIR / RUN sh scripts/generate_self_signed_cert.sh && \ pip install pipenv && pipenv install && \ diff --git a/server/Pipfile b/Pipfile similarity index 100% rename from server/Pipfile rename to Pipfile diff --git a/server/Pipfile.lock b/Pipfile.lock similarity index 100% rename from server/Pipfile.lock rename to Pipfile.lock diff --git a/server/Pipfile.tmp b/Pipfile.tmp similarity index 100% rename from server/Pipfile.tmp rename to Pipfile.tmp diff --git a/server/api/__init__.py b/api/__init__.py similarity index 100% rename from server/api/__init__.py rename to api/__init__.py diff --git a/server/api/admin.py b/api/admin.py similarity index 100% rename from server/api/admin.py rename to api/admin.py diff --git a/server/api/apps.py b/api/apps.py similarity index 100% rename from server/api/apps.py rename to api/apps.py diff --git a/server/api/management/__init__.py b/api/management/__init__.py similarity index 100% rename from server/api/management/__init__.py rename to api/management/__init__.py diff --git a/server/api/management/commands/__init__.py b/api/management/commands/__init__.py similarity index 100% rename from server/api/management/commands/__init__.py rename to api/management/commands/__init__.py diff --git a/server/api/management/commands/importer.py b/api/management/commands/importer.py similarity index 100% rename from server/api/management/commands/importer.py rename to api/management/commands/importer.py diff --git a/server/api/management/commands/populatedb.py b/api/management/commands/populatedb.py similarity index 100% rename from server/api/management/commands/populatedb.py rename to api/management/commands/populatedb.py diff --git a/server/api/migrations/0001_initial.py b/api/migrations/0001_initial.py similarity index 100% rename from server/api/migrations/0001_initial.py rename to api/migrations/0001_initial.py diff --git a/server/api/migrations/0002_auto_20180826_1613.py b/api/migrations/0002_auto_20180826_1613.py similarity index 100% rename from server/api/migrations/0002_auto_20180826_1613.py rename to api/migrations/0002_auto_20180826_1613.py diff --git a/server/api/migrations/0003_remove_race_subtypes.py b/api/migrations/0003_remove_race_subtypes.py similarity index 100% rename from server/api/migrations/0003_remove_race_subtypes.py rename to api/migrations/0003_remove_race_subtypes.py diff --git a/server/api/migrations/0004_auto_20180826_2043.py b/api/migrations/0004_auto_20180826_2043.py similarity index 100% rename from server/api/migrations/0004_auto_20180826_2043.py rename to api/migrations/0004_auto_20180826_2043.py diff --git a/server/api/migrations/0005_auto_20180828_0106.py b/api/migrations/0005_auto_20180828_0106.py similarity index 100% rename from server/api/migrations/0005_auto_20180828_0106.py rename to api/migrations/0005_auto_20180828_0106.py diff --git a/server/api/migrations/0006_monster_speed_json.py b/api/migrations/0006_monster_speed_json.py similarity index 100% rename from server/api/migrations/0006_monster_speed_json.py rename to api/migrations/0006_monster_speed_json.py diff --git a/server/api/migrations/0007_remove_monster_speed_json.py b/api/migrations/0007_remove_monster_speed_json.py similarity index 100% rename from server/api/migrations/0007_remove_monster_speed_json.py rename to api/migrations/0007_remove_monster_speed_json.py diff --git a/server/api/migrations/0008_auto_20180903_0344.py b/api/migrations/0008_auto_20180903_0344.py similarity index 100% rename from server/api/migrations/0008_auto_20180903_0344.py rename to api/migrations/0008_auto_20180903_0344.py diff --git a/server/api/migrations/0009_magicitem.py b/api/migrations/0009_magicitem.py similarity index 100% rename from server/api/migrations/0009_magicitem.py rename to api/migrations/0009_magicitem.py diff --git a/server/api/migrations/0010_background_feature_desc.py b/api/migrations/0010_background_feature_desc.py similarity index 100% rename from server/api/migrations/0010_background_feature_desc.py rename to api/migrations/0010_background_feature_desc.py diff --git a/server/api/migrations/0011_auto_20180921_0233.py b/api/migrations/0011_auto_20180921_0233.py similarity index 100% rename from server/api/migrations/0011_auto_20180921_0233.py rename to api/migrations/0011_auto_20180921_0233.py diff --git a/server/api/migrations/0012_subrace_asi_json.py b/api/migrations/0012_subrace_asi_json.py similarity index 100% rename from server/api/migrations/0012_subrace_asi_json.py rename to api/migrations/0012_subrace_asi_json.py diff --git a/server/api/migrations/0013_auto_20180921_0257.py b/api/migrations/0013_auto_20180921_0257.py similarity index 100% rename from server/api/migrations/0013_auto_20180921_0257.py rename to api/migrations/0013_auto_20180921_0257.py diff --git a/server/api/migrations/0014_auto_20180926_2101.py b/api/migrations/0014_auto_20180926_2101.py similarity index 100% rename from server/api/migrations/0014_auto_20180926_2101.py rename to api/migrations/0014_auto_20180926_2101.py diff --git a/server/api/migrations/0015_auto_20181112_0537.py b/api/migrations/0015_auto_20181112_0537.py similarity index 100% rename from server/api/migrations/0015_auto_20181112_0537.py rename to api/migrations/0015_auto_20181112_0537.py diff --git a/server/api/migrations/__init__.py b/api/migrations/__init__.py similarity index 100% rename from server/api/migrations/__init__.py rename to api/migrations/__init__.py diff --git a/server/api/models.py b/api/models.py similarity index 100% rename from server/api/models.py rename to api/models.py diff --git a/server/api/search_indexes.py b/api/search_indexes.py similarity index 100% rename from server/api/search_indexes.py rename to api/search_indexes.py diff --git a/server/api/serializers.py b/api/serializers.py similarity index 100% rename from server/api/serializers.py rename to api/serializers.py diff --git a/server/api/templatetags/__init__.py b/api/templatetags/__init__.py similarity index 100% rename from server/api/templatetags/__init__.py rename to api/templatetags/__init__.py diff --git a/server/api/templatetags/custom_markdown.py b/api/templatetags/custom_markdown.py similarity index 100% rename from server/api/templatetags/custom_markdown.py rename to api/templatetags/custom_markdown.py diff --git a/server/api/tests.py b/api/tests.py similarity index 100% rename from server/api/tests.py rename to api/tests.py diff --git a/server/api/utils.py b/api/utils.py similarity index 100% rename from server/api/utils.py rename to api/utils.py diff --git a/server/api/views.py b/api/views.py similarity index 100% rename from server/api/views.py rename to api/views.py diff --git a/server/manage.py b/manage.py similarity index 100% rename from server/manage.py rename to manage.py diff --git a/server/scripts/add_srd_class.py b/scripts/add_srd_class.py similarity index 100% rename from server/scripts/add_srd_class.py rename to scripts/add_srd_class.py diff --git a/server/scripts/add_srd_monsters.py b/scripts/add_srd_monsters.py similarity index 100% rename from server/scripts/add_srd_monsters.py rename to scripts/add_srd_monsters.py diff --git a/server/scripts/add_srd_spells.py b/scripts/add_srd_spells.py similarity index 100% rename from server/scripts/add_srd_spells.py rename to scripts/add_srd_spells.py diff --git a/server/scripts/deploy.sh b/scripts/deploy.sh similarity index 100% rename from server/scripts/deploy.sh rename to scripts/deploy.sh diff --git a/server/scripts/generate_self_signed_cert.sh b/scripts/generate_self_signed_cert.sh similarity index 100% rename from server/scripts/generate_self_signed_cert.sh rename to scripts/generate_self_signed_cert.sh diff --git a/server/scripts/generate_spell_data.py b/scripts/generate_spell_data.py similarity index 100% rename from server/scripts/generate_spell_data.py rename to scripts/generate_spell_data.py diff --git a/server/scripts/load_srd_content.py b/scripts/load_srd_content.py similarity index 100% rename from server/scripts/load_srd_content.py rename to scripts/load_srd_content.py diff --git a/server/scripts/parse_content.py b/scripts/parse_content.py similarity index 100% rename from server/scripts/parse_content.py rename to scripts/parse_content.py diff --git a/server/scripts/server_setup.sh b/scripts/server_setup.sh similarity index 100% rename from server/scripts/server_setup.sh rename to scripts/server_setup.sh diff --git a/server/server/__init__.py b/server/__init__.py similarity index 100% rename from server/server/__init__.py rename to server/__init__.py diff --git a/server/server/settings.py b/server/settings.py similarity index 100% rename from server/server/settings.py rename to server/settings.py diff --git a/server/server/urls.py b/server/urls.py similarity index 100% rename from server/server/urls.py rename to server/urls.py diff --git a/server/server/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg b/server/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg similarity index 100% rename from server/server/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg rename to server/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg diff --git a/server/server/whoosh_index/MAIN_WRITELOCK b/server/whoosh_index/MAIN_WRITELOCK similarity index 100% rename from server/server/whoosh_index/MAIN_WRITELOCK rename to server/whoosh_index/MAIN_WRITELOCK diff --git a/server/server/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg b/server/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg similarity index 100% rename from server/server/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg rename to server/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg diff --git a/server/server/whoosh_index/MAIN_ocywz2asp2tobqou.seg b/server/whoosh_index/MAIN_ocywz2asp2tobqou.seg similarity index 100% rename from server/server/whoosh_index/MAIN_ocywz2asp2tobqou.seg rename to server/whoosh_index/MAIN_ocywz2asp2tobqou.seg diff --git a/server/server/whoosh_index/MAIN_rm7ioktguf21jrb6.seg b/server/whoosh_index/MAIN_rm7ioktguf21jrb6.seg similarity index 100% rename from server/server/whoosh_index/MAIN_rm7ioktguf21jrb6.seg rename to server/whoosh_index/MAIN_rm7ioktguf21jrb6.seg diff --git a/server/server/whoosh_index/MAIN_s9e3elhixxextzj8.seg b/server/whoosh_index/MAIN_s9e3elhixxextzj8.seg similarity index 100% rename from server/server/whoosh_index/MAIN_s9e3elhixxextzj8.seg rename to server/whoosh_index/MAIN_s9e3elhixxextzj8.seg diff --git a/server/server/whoosh_index/MAIN_vfxa9hknlnl7csix.seg b/server/whoosh_index/MAIN_vfxa9hknlnl7csix.seg similarity index 100% rename from server/server/whoosh_index/MAIN_vfxa9hknlnl7csix.seg rename to server/whoosh_index/MAIN_vfxa9hknlnl7csix.seg diff --git a/server/server/whoosh_index/MAIN_xjczbq8saada6zht.seg b/server/whoosh_index/MAIN_xjczbq8saada6zht.seg similarity index 100% rename from server/server/whoosh_index/MAIN_xjczbq8saada6zht.seg rename to server/whoosh_index/MAIN_xjczbq8saada6zht.seg diff --git a/server/server/whoosh_index/_MAIN_7.toc b/server/whoosh_index/_MAIN_7.toc similarity index 100% rename from server/server/whoosh_index/_MAIN_7.toc rename to server/whoosh_index/_MAIN_7.toc diff --git a/server/server/wsgi.py b/server/wsgi.py similarity index 100% rename from server/server/wsgi.py rename to server/wsgi.py diff --git a/server/templates/search/indexes/api/charclass_text.txt b/templates/search/indexes/api/charclass_text.txt similarity index 100% rename from server/templates/search/indexes/api/charclass_text.txt rename to templates/search/indexes/api/charclass_text.txt diff --git a/server/templates/search/indexes/api/condition_text.txt b/templates/search/indexes/api/condition_text.txt similarity index 100% rename from server/templates/search/indexes/api/condition_text.txt rename to templates/search/indexes/api/condition_text.txt diff --git a/server/templates/search/indexes/api/magicitem_text.txt b/templates/search/indexes/api/magicitem_text.txt similarity index 100% rename from server/templates/search/indexes/api/magicitem_text.txt rename to templates/search/indexes/api/magicitem_text.txt diff --git a/server/templates/search/indexes/api/monster_text.txt b/templates/search/indexes/api/monster_text.txt similarity index 100% rename from server/templates/search/indexes/api/monster_text.txt rename to templates/search/indexes/api/monster_text.txt diff --git a/server/templates/search/indexes/api/race_text.txt b/templates/search/indexes/api/race_text.txt similarity index 100% rename from server/templates/search/indexes/api/race_text.txt rename to templates/search/indexes/api/race_text.txt diff --git a/server/templates/search/indexes/api/section_text.txt b/templates/search/indexes/api/section_text.txt similarity index 100% rename from server/templates/search/indexes/api/section_text.txt rename to templates/search/indexes/api/section_text.txt diff --git a/server/templates/search/indexes/api/spell_text.txt b/templates/search/indexes/api/spell_text.txt similarity index 100% rename from server/templates/search/indexes/api/spell_text.txt rename to templates/search/indexes/api/spell_text.txt diff --git a/server/templates/search/search.html b/templates/search/search.html similarity index 100% rename from server/templates/search/search.html rename to templates/search/search.html