Merge pull request #805 from moonstream-to/struct-moonstreamdb

Updated moonstreamdb placement
2023-06-06 08:30:40 -07:00 · 2023-06-06 08:30:40 -07:00 · 3d7897b0b1
commit 3d7897b0b1
--- a/db/deploy/moonstreamdb.service
+++ b/db/deploy/moonstreamdb.service
@ -1,14 +0,0 @@
-[Unit]
-Description=moonstreamdb-service
-After=network.target
-
-[Service]
-User=ubuntu
-Group=www-data
-WorkingDirectory=/home/ubuntu/moonstream/db/server
-EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream/db/server/moonstreamdb -host 127.0.0.1 -port "${MOONSTREAM_DB_SERVER_PORT}"
-SyslogIdentifier=moonstreamdb
-
-[Install]
-WantedBy=multi-user.target
--- a/moonstreamdb/.dockerignore
+++ b/moonstreamdb/.dockerignore
--- a/moonstreamdb/.gitignore
+++ b/moonstreamdb/.gitignore
--- a/moonstreamdb/Dockerfile
+++ b/moonstreamdb/Dockerfile
--- a/moonstreamdb/README.md
+++ b/moonstreamdb/README.md
--- a/moonstreamdb/alembic.sh
+++ b/moonstreamdb/alembic.sh
--- a/moonstreamdb/alembic/README
+++ b/moonstreamdb/alembic/README
--- a/moonstreamdb/alembic/env.py
+++ b/moonstreamdb/alembic/env.py
--- a/moonstreamdb/alembic/script.py.mako
+++ b/moonstreamdb/alembic/script.py.mako
--- a/moonstreamdb/alembic/versions/0b46c8e17bf2_fields_for_eip_1559.py
+++ b/moonstreamdb/alembic/versions/0b46c8e17bf2_fields_for_eip_1559.py
--- a/moonstreamdb/alembic/versions/11233cf42d62_mumbai_model.py
+++ b/moonstreamdb/alembic/versions/11233cf42d62_mumbai_model.py
--- a/moonstreamdb/alembic/versions/21cced47077c_inital_migration.py
+++ b/moonstreamdb/alembic/versions/21cced47077c_inital_migration.py
--- a/moonstreamdb/alembic/versions/240476c67b9f_drop_ethereum_addresses_and_address_id.py
+++ b/moonstreamdb/alembic/versions/240476c67b9f_drop_ethereum_addresses_and_address_id.py
--- a/moonstreamdb/alembic/versions/2fa541f6f6fc_xdai_model.py
+++ b/moonstreamdb/alembic/versions/2fa541f6f6fc_xdai_model.py
--- a/moonstreamdb/alembic/versions/3d55105b0603_drop_pending_tx_table.py
+++ b/moonstreamdb/alembic/versions/3d55105b0603_drop_pending_tx_table.py
--- a/moonstreamdb/alembic/versions/40871a7807f6_labels_for_addresses.py
+++ b/moonstreamdb/alembic/versions/40871a7807f6_labels_for_addresses.py
--- a/moonstreamdb/alembic/versions/42ca451a9c33_fix_indexes.py
+++ b/moonstreamdb/alembic/versions/42ca451a9c33_fix_indexes.py
--- a/moonstreamdb/alembic/versions/571f33ad7587_ethereum_smart_contracts.py
+++ b/moonstreamdb/alembic/versions/571f33ad7587_ethereum_smart_contracts.py
--- a/moonstreamdb/alembic/versions/5f5b8f19570f_added_index_for_address_type_and_name_.py
+++ b/moonstreamdb/alembic/versions/5f5b8f19570f_added_index_for_address_type_and_name_.py
--- a/moonstreamdb/alembic/versions/72f1ad512b2e_support_labels_on_transactions.py
+++ b/moonstreamdb/alembic/versions/72f1ad512b2e_support_labels_on_transactions.py
--- a/moonstreamdb/alembic/versions/c413d5265f76_add_wyrm_chain.py
+++ b/moonstreamdb/alembic/versions/c413d5265f76_add_wyrm_chain.py
--- a/moonstreamdb/alembic/versions/d6ed4b1b43d5_drop_foreign_key_constraint_on_tx_hash_.py
+++ b/moonstreamdb/alembic/versions/d6ed4b1b43d5_drop_foreign_key_constraint_on_tx_hash_.py
--- a/moonstreamdb/alembic/versions/ea8185bd24c7_unique_const_for_addr.py
+++ b/moonstreamdb/alembic/versions/ea8185bd24c7_unique_const_for_addr.py
--- a/moonstreamdb/alembic/versions/ecb7817db377_add_opensea_state_table_and_add_index_.py
+++ b/moonstreamdb/alembic/versions/ecb7817db377_add_opensea_state_table_and_add_index_.py
--- a/moonstreamdb/alembic/versions/f1e8cf50a3ff_add_log_index_block_number_timestamp_.py
+++ b/moonstreamdb/alembic/versions/f1e8cf50a3ff_add_log_index_block_number_timestamp_.py
--- a/moonstreamdb/alembic/versions/f991fc7493c8_polygon_models.py
+++ b/moonstreamdb/alembic/versions/f991fc7493c8_polygon_models.py
--- a/moonstreamdb/configs/alembic.sample.ini
+++ b/moonstreamdb/configs/alembic.sample.ini
--- a/moonstreamdb/configs/docker_generate_env.bash
+++ b/moonstreamdb/configs/docker_generate_env.bash
--- a/moonstreamdb/configs/sample.env
+++ b/moonstreamdb/configs/sample.env
--- a/moonstreamdb/deploy/deploy.bash
+++ b/moonstreamdb/deploy/deploy.bash
@ -4,7 +4,7 @@

 # Main
 APP_DIR="${APP_DIR:-/home/ubuntu/moonstream}"
-APP_DB_SERVER_DIR="${APP_DIR}/db/server"
+APP_DB_SERVER_DIR="${APP_DIR}/moonstreamdb/server"
 SECRETS_DIR="${SECRETS_DIR:-/home/ubuntu/moonstream-secrets}"
 SCRIPT_DIR="$(realpath $(dirname $0))"
 SERVICE_FILE="${SCRIPT_DIR}/moonstreamdb.service"
--- a/moonstreamdb/deploy/moonstreamdb.service
+++ b/moonstreamdb/deploy/moonstreamdb.service
@ -0,0 +1,14 @@
+[Unit]
+Description=Moonstream DB status service
+After=network.target
+
+[Service]
+User=ubuntu
+Group=www-data
+WorkingDirectory=/home/ubuntu/moonstream/moonstreamdb/server
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+ExecStart=/home/ubuntu/moonstream/moonstreamdb/server/moonstreamdb -host 127.0.0.1 -port "${MOONSTREAM_DB_SERVER_PORT}"
+SyslogIdentifier=moonstreamdb
+
+[Install]
+WantedBy=multi-user.target
--- a/moonstreamdb/migrate.sh
+++ b/moonstreamdb/migrate.sh
--- a/moonstreamdb/moonstreamdb/init.py
+++ b/moonstreamdb/moonstreamdb/init.py
--- a/moonstreamdb/moonstreamdb/blockchain.py
+++ b/moonstreamdb/moonstreamdb/blockchain.py
--- a/moonstreamdb/moonstreamdb/cli.py
+++ b/moonstreamdb/moonstreamdb/cli.py
--- a/moonstreamdb/moonstreamdb/db.py
+++ b/moonstreamdb/moonstreamdb/db.py
--- a/moonstreamdb/moonstreamdb/models.py
+++ b/moonstreamdb/moonstreamdb/models.py
--- a/moonstreamdb/moonstreamdb/networks.py
+++ b/moonstreamdb/moonstreamdb/networks.py
--- a/moonstreamdb/moonstreamdb/version.py
+++ b/moonstreamdb/moonstreamdb/version.py
--- a/moonstreamdb/mypy.ini
+++ b/moonstreamdb/mypy.ini
--- a/moonstreamdb/scm.nix
+++ b/moonstreamdb/scm.nix
--- a/moonstreamdb/scripts/f1e8cf50a3ff_add_log_index_block_number_timestamp_test.py
+++ b/moonstreamdb/scripts/f1e8cf50a3ff_add_log_index_block_number_timestamp_test.py
--- a/moonstreamdb/server/cmd/data.go
+++ b/moonstreamdb/server/cmd/data.go
--- a/moonstreamdb/server/cmd/db.go
+++ b/moonstreamdb/server/cmd/db.go
--- a/moonstreamdb/server/cmd/middlewares.go
+++ b/moonstreamdb/server/cmd/middlewares.go
--- a/moonstreamdb/server/cmd/routes.go
+++ b/moonstreamdb/server/cmd/routes.go
--- a/moonstreamdb/server/cmd/server.go
+++ b/moonstreamdb/server/cmd/server.go
--- a/moonstreamdb/server/configs/settings.go
+++ b/moonstreamdb/server/configs/settings.go
--- a/moonstreamdb/server/dev.sh
+++ b/moonstreamdb/server/dev.sh
--- a/moonstreamdb/server/go.mod
+++ b/moonstreamdb/server/go.mod
--- a/moonstreamdb/server/go.sum
+++ b/moonstreamdb/server/go.sum
--- a/moonstreamdb/server/main.go
+++ b/moonstreamdb/server/main.go
--- a/moonstreamdb/server/sample.env
+++ b/moonstreamdb/server/sample.env
--- a/moonstreamdb/setup.py
+++ b/moonstreamdb/setup.py
--- a/moonstreamdb/sync_conf.yml
+++ b/moonstreamdb/sync_conf.yml