flatten directory for simpler deploy

joelshea · Jan 20, 2019 · 02320c8 · 02320c8
1 parent fefa52d
commit 02320c8
Show file tree

Hide file tree

Showing 66 changed files with 2 additions and 4 deletions.
diff --git 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 → Pipfile b/server/Pipfile → Pipfile
diff --git a/server/Pipfile.lock → Pipfile.lock b/server/Pipfile.lock → Pipfile.lock
diff --git a/server/Pipfile.tmp → Pipfile.tmp b/server/Pipfile.tmp → Pipfile.tmp
diff --git a/server/api/__init__.py → api/__init__.py b/server/api/__init__.py → api/__init__.py
diff --git a/server/api/admin.py → api/admin.py b/server/api/admin.py → api/admin.py
diff --git a/server/api/apps.py → api/apps.py b/server/api/apps.py → api/apps.py
diff --git a/server/api/management/__init__.py → api/management/__init__.py b/server/api/management/__init__.py → api/management/__init__.py
diff --git a/server/api/management/commands/__init__.py → api/management/commands/__init__.py b/server/api/management/commands/__init__.py → api/management/commands/__init__.py
diff --git a/server/api/management/commands/importer.py → api/management/commands/importer.py b/server/api/management/commands/importer.py → api/management/commands/importer.py
diff --git a/server/api/management/commands/populatedb.py → api/management/commands/populatedb.py b/server/api/management/commands/populatedb.py → api/management/commands/populatedb.py
diff --git a/server/api/migrations/0001_initial.py → api/migrations/0001_initial.py b/server/api/migrations/0001_initial.py → api/migrations/0001_initial.py
diff --git a/...api/migrations/0002_auto_20180826_1613.py → api/migrations/0002_auto_20180826_1613.py b/...api/migrations/0002_auto_20180826_1613.py → api/migrations/0002_auto_20180826_1613.py
diff --git a/...i/migrations/0003_remove_race_subtypes.py → api/migrations/0003_remove_race_subtypes.py b/...i/migrations/0003_remove_race_subtypes.py → api/migrations/0003_remove_race_subtypes.py
diff --git a/...api/migrations/0004_auto_20180826_2043.py → api/migrations/0004_auto_20180826_2043.py b/...api/migrations/0004_auto_20180826_2043.py → api/migrations/0004_auto_20180826_2043.py
diff --git a/...api/migrations/0005_auto_20180828_0106.py → api/migrations/0005_auto_20180828_0106.py b/...api/migrations/0005_auto_20180828_0106.py → api/migrations/0005_auto_20180828_0106.py
diff --git a/...api/migrations/0006_monster_speed_json.py → api/migrations/0006_monster_speed_json.py b/...api/migrations/0006_monster_speed_json.py → api/migrations/0006_monster_speed_json.py
diff --git a/...rations/0007_remove_monster_speed_json.py → ...rations/0007_remove_monster_speed_json.py b/...rations/0007_remove_monster_speed_json.py → ...rations/0007_remove_monster_speed_json.py
diff --git a/...api/migrations/0008_auto_20180903_0344.py → api/migrations/0008_auto_20180903_0344.py b/...api/migrations/0008_auto_20180903_0344.py → api/migrations/0008_auto_20180903_0344.py
diff --git a/server/api/migrations/0009_magicitem.py → api/migrations/0009_magicitem.py b/server/api/migrations/0009_magicitem.py → api/migrations/0009_magicitem.py
diff --git a/...igrations/0010_background_feature_desc.py → ...igrations/0010_background_feature_desc.py b/...igrations/0010_background_feature_desc.py → ...igrations/0010_background_feature_desc.py
diff --git a/...api/migrations/0011_auto_20180921_0233.py → api/migrations/0011_auto_20180921_0233.py b/...api/migrations/0011_auto_20180921_0233.py → api/migrations/0011_auto_20180921_0233.py
diff --git a/...r/api/migrations/0012_subrace_asi_json.py → api/migrations/0012_subrace_asi_json.py b/...r/api/migrations/0012_subrace_asi_json.py → api/migrations/0012_subrace_asi_json.py
diff --git a/...api/migrations/0013_auto_20180921_0257.py → api/migrations/0013_auto_20180921_0257.py b/...api/migrations/0013_auto_20180921_0257.py → api/migrations/0013_auto_20180921_0257.py
diff --git a/...api/migrations/0014_auto_20180926_2101.py → api/migrations/0014_auto_20180926_2101.py b/...api/migrations/0014_auto_20180926_2101.py → api/migrations/0014_auto_20180926_2101.py
diff --git a/...api/migrations/0015_auto_20181112_0537.py → api/migrations/0015_auto_20181112_0537.py b/...api/migrations/0015_auto_20181112_0537.py → api/migrations/0015_auto_20181112_0537.py
diff --git a/server/api/migrations/__init__.py → api/migrations/__init__.py b/server/api/migrations/__init__.py → api/migrations/__init__.py
diff --git a/server/api/models.py → api/models.py b/server/api/models.py → api/models.py
diff --git a/server/api/search_indexes.py → api/search_indexes.py b/server/api/search_indexes.py → api/search_indexes.py
diff --git a/server/api/serializers.py → api/serializers.py b/server/api/serializers.py → api/serializers.py
diff --git a/server/api/templatetags/__init__.py → api/templatetags/__init__.py b/server/api/templatetags/__init__.py → api/templatetags/__init__.py
diff --git a/server/api/templatetags/custom_markdown.py → api/templatetags/custom_markdown.py b/server/api/templatetags/custom_markdown.py → api/templatetags/custom_markdown.py
diff --git a/server/api/tests.py → api/tests.py b/server/api/tests.py → api/tests.py
diff --git a/server/api/utils.py → api/utils.py b/server/api/utils.py → api/utils.py
diff --git a/server/api/views.py → api/views.py b/server/api/views.py → api/views.py
diff --git a/server/manage.py → manage.py b/server/manage.py → manage.py
diff --git a/server/scripts/add_srd_class.py → scripts/add_srd_class.py b/server/scripts/add_srd_class.py → scripts/add_srd_class.py
diff --git a/server/scripts/add_srd_monsters.py → scripts/add_srd_monsters.py b/server/scripts/add_srd_monsters.py → scripts/add_srd_monsters.py
diff --git a/server/scripts/add_srd_spells.py → scripts/add_srd_spells.py b/server/scripts/add_srd_spells.py → scripts/add_srd_spells.py
diff --git a/server/scripts/deploy.sh → scripts/deploy.sh b/server/scripts/deploy.sh → scripts/deploy.sh
diff --git a/server/scripts/generate_self_signed_cert.sh → scripts/generate_self_signed_cert.sh b/server/scripts/generate_self_signed_cert.sh → scripts/generate_self_signed_cert.sh
diff --git a/server/scripts/generate_spell_data.py → scripts/generate_spell_data.py b/server/scripts/generate_spell_data.py → scripts/generate_spell_data.py
diff --git a/server/scripts/load_srd_content.py → scripts/load_srd_content.py b/server/scripts/load_srd_content.py → scripts/load_srd_content.py
diff --git a/server/scripts/parse_content.py → scripts/parse_content.py b/server/scripts/parse_content.py → scripts/parse_content.py
diff --git a/server/scripts/server_setup.sh → scripts/server_setup.sh b/server/scripts/server_setup.sh → scripts/server_setup.sh
diff --git a/server/server/__init__.py → server/__init__.py b/server/server/__init__.py → server/__init__.py
diff --git a/server/server/settings.py → server/settings.py b/server/server/settings.py → server/settings.py
diff --git a/server/server/urls.py → server/urls.py b/server/server/urls.py → server/urls.py
diff --git a/...er/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg → ...er/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg b/...er/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg → ...er/whoosh_index/MAIN_4rlbgb3p0rq5p83d.seg
diff --git a/server/server/whoosh_index/MAIN_WRITELOCK → server/whoosh_index/MAIN_WRITELOCK b/server/server/whoosh_index/MAIN_WRITELOCK → server/whoosh_index/MAIN_WRITELOCK
diff --git a/...er/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg → ...er/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg b/...er/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg → ...er/whoosh_index/MAIN_m0cy8st9j2hcb9bl.seg
diff --git a/...er/whoosh_index/MAIN_ocywz2asp2tobqou.seg → ...er/whoosh_index/MAIN_ocywz2asp2tobqou.seg b/...er/whoosh_index/MAIN_ocywz2asp2tobqou.seg → ...er/whoosh_index/MAIN_ocywz2asp2tobqou.seg
diff --git a/...er/whoosh_index/MAIN_rm7ioktguf21jrb6.seg → ...er/whoosh_index/MAIN_rm7ioktguf21jrb6.seg b/...er/whoosh_index/MAIN_rm7ioktguf21jrb6.seg → ...er/whoosh_index/MAIN_rm7ioktguf21jrb6.seg
diff --git a/...er/whoosh_index/MAIN_s9e3elhixxextzj8.seg → ...er/whoosh_index/MAIN_s9e3elhixxextzj8.seg b/...er/whoosh_index/MAIN_s9e3elhixxextzj8.seg → ...er/whoosh_index/MAIN_s9e3elhixxextzj8.seg
diff --git a/...er/whoosh_index/MAIN_vfxa9hknlnl7csix.seg → ...er/whoosh_index/MAIN_vfxa9hknlnl7csix.seg b/...er/whoosh_index/MAIN_vfxa9hknlnl7csix.seg → ...er/whoosh_index/MAIN_vfxa9hknlnl7csix.seg
diff --git a/...er/whoosh_index/MAIN_xjczbq8saada6zht.seg → ...er/whoosh_index/MAIN_xjczbq8saada6zht.seg b/...er/whoosh_index/MAIN_xjczbq8saada6zht.seg → ...er/whoosh_index/MAIN_xjczbq8saada6zht.seg
diff --git a/server/server/whoosh_index/_MAIN_7.toc → server/whoosh_index/_MAIN_7.toc b/server/server/whoosh_index/_MAIN_7.toc → server/whoosh_index/_MAIN_7.toc
diff --git a/server/server/wsgi.py → server/wsgi.py b/server/server/wsgi.py → server/wsgi.py
diff --git a/...tes/search/indexes/api/charclass_text.txt → ...tes/search/indexes/api/charclass_text.txt b/...tes/search/indexes/api/charclass_text.txt → ...tes/search/indexes/api/charclass_text.txt
diff --git a/...tes/search/indexes/api/condition_text.txt → ...tes/search/indexes/api/condition_text.txt b/...tes/search/indexes/api/condition_text.txt → ...tes/search/indexes/api/condition_text.txt
diff --git a/...tes/search/indexes/api/magicitem_text.txt → ...tes/search/indexes/api/magicitem_text.txt b/...tes/search/indexes/api/magicitem_text.txt → ...tes/search/indexes/api/magicitem_text.txt
diff --git a/...lates/search/indexes/api/monster_text.txt → ...lates/search/indexes/api/monster_text.txt b/...lates/search/indexes/api/monster_text.txt → ...lates/search/indexes/api/monster_text.txt
diff --git a/...emplates/search/indexes/api/race_text.txt → templates/search/indexes/api/race_text.txt b/...emplates/search/indexes/api/race_text.txt → templates/search/indexes/api/race_text.txt
diff --git a/...lates/search/indexes/api/section_text.txt → ...lates/search/indexes/api/section_text.txt b/...lates/search/indexes/api/section_text.txt → ...lates/search/indexes/api/section_text.txt
diff --git a/...mplates/search/indexes/api/spell_text.txt → templates/search/indexes/api/spell_text.txt b/...mplates/search/indexes/api/spell_text.txt → templates/search/indexes/api/spell_text.txt
diff --git a/server/templates/search/search.html → templates/search/search.html b/server/templates/search/search.html → templates/search/search.html