tweaks

Author: pipermerriam

fabfile.py

@@ -31,23 +31,19 @@ def provision(conn, domain):
     conn.run(f"pyenv install {PYTHON_VERSION}")
     conn.run(f"pyenv global {PYTHON_VERSION}")
 
-    # Tell redis to use systemd
-    conn.run('sed -i "s/supervised no/supervised systemd/g" /etc/redis/redis.conf')
-    conn.run("service redis restart")
-
     # Create the `web` user with their own home director and group
-    conn.run("useradd --create-home --user-group")
+    conn.run("useradd --create-home --user-group web")
 
     # Clone the repository
-    conn.run("git clone https://github.com/pipermerriam/ethereum-function-signature-database.git /home/web")
+    conn.run("git clone https://github.com/pipermerriam/ethereum-function-signature-registry.git /home/web/ethereum-function-signature-registry")
 
     #
     # Setup and Install project dependencies
     #
     conn.run("pip install virtualenv")
     conn.run("python -m virtualenv /home/web/venv")
 
-    conn.run("/home/web/venv/bin/pip install -r /home/web/ethereum-function-signature-database/requirements.txt")
+    conn.run("/home/web/venv/bin/pip install -r /home/web/ethereum-function-signature-registry/requirements.txt")
 
     with tempfile.TemporaryDirectory() as base_path:
         dotenv_file_path = pathlib.Path(base_path) / '.env'
@@ -57,21 +53,27 @@ def provision(conn, domain):
             SECRET_KEY=django_secret_key,
         ))
 
-        conn.put(str(dotenv_file_path), remote='/home/web/ethereum-function-signature-database/.env')
+        conn.put(str(dotenv_file_path), remote='/home/web/ethereum-function-signature-registry/.env')
+
+
+     Setup Postgres User and Database
 
-    #
-    # Setup Postgres User and Database
-    #
     with tempfile.TemporaryDirectory() as base_path:
         # systemd service for worker
         pgpass_file_path = pathlib.Path(base_path) / '.pgpass'
-        pgpass_file_path.write_text(f"*.*.*.4byte.{postgress_password}")
+        pgpass_file_path.write_text(f"*.*.*.bytes4.{postgres_password}")
 
         conn.put(str(pgpass_file_path), remote='/root/.pgpass')
         conn.run("chmod 600 /root/.pgpass")
 
-    conn.run(f"sudo -u postgres psql -c 'CREATE ROLE joe PASSWORD \"{postgres_password}\" CREATEDB LOGIN;'")
-    conn.run("sudo -u postgres createdb --username 4byte --no-password 4byte")
+    conn.run(f"sudo -u postgres psql -c \"CREATE ROLE bytes4 PASSWORD '{postgres_password}' SUPERUSER LOGIN;\"")
+    conn.run("sudo -u postgres createdb --no-password bytes4")
+
+    #
+    # Setup Redis
+    #
+    conn.run('sed -i "s/supervised no/supervised systemd/g" /etc/redis/redis.conf')
+    conn.run("service redis restart")
 
     #
     # Setup config files for uwsgi/nginx/4byte-worker
@@ -81,7 +83,7 @@ def provision(conn, domain):
         worker_service_file_path = pathlib.Path(base_path) / '4byte.service'
         worker_service_file_path.write_text(SYSTEMD_WORKER_SERVICE)
 
-        conn.put(str(worker_service_file_path), remote='/ect/systemd/system/4byte.service')
+        conn.put(str(worker_service_file_path), remote='/etc/systemd/system/4byte.service')
 
         # nginx configuration file
         nginx_4byte_conf = pathlib.Path(base_path) / '4byte'
@@ -118,12 +120,21 @@ def _append_bashrc(conn, content: str) -> None:
     "gpg",
     "software-properties-common",
     "pkg-config",
+    "zlib1g",
+    "zlib1g-dev",
+    "libbz2-dev",
+    "libreadline-dev",
+    "libssl-dev",
+    "libsqlite3-dev",
+    "libffi-dev",
     # application
     "nginx",
     "uwsgi",
+    "uwsgi-plugin-python3",
     "redis-server",
     "postgresql",
     "postgresql-contrib",
+    "postgresql-server-dev-11",
     # convenience
     "htop",
     "tmux",
@@ -215,10 +226,8 @@ def _append_bashrc(conn, content: str) -> None:
 DJANGO_ALLOWED_HOSTS={DOMAIN}
 DJANGO_DEBUG=False
 DJANGO_DEBUG_TOOLBAR_ENABLED=False
-DJANGO_DEFAULT_FILE_STORAGE=s3_folder_storage.s3.DefaultStorage
 DJANGO_SECRET_KEY={SECRET_KEY}
 DJANGO_SECURE_SSL_REDIRECT=False
-DJANGO_STATICFILES_STORAGE=s3_folder_storage.s3.StaticStorage
 HUEY_WORKER_TYPE=thread
 REDIS_URL=redis://127.0.0.1:6379
 """

func_sig_registry/settings.py

@@ -46,8 +46,6 @@
     'func_sig_registry.registry',
     'rest_framework',
     'django_tables2',
-    'storages',
-    's3_folder_storage',
     'huey.contrib.djhuey',
     'corsheaders',
 ]
@@ -183,31 +181,6 @@
 )
 
 
-# AWS Configuration
-DEFAULT_S3_PATH = "media"
-STATIC_S3_PATH = "static"
-
-AWS_ACCESS_KEY_ID = env.get('AWS_ACCESS_KEY_ID', type=str, default=None)
-AWS_SECRET_ACCESS_KEY = env.get('AWS_SECRET_ACCESS_KEY', type=str, default=None)
-AWS_STORAGE_BUCKET_NAME = env.get('AWS_STORAGE_BUCKET_NAME', type=str, default=None)
-AWS_DEFAULT_REGION = env.get('AWS_DEFAULT_REGION', type=str, default=None)
-
-# Boto config
-AWS_REDUCED_REDUNDANCY = True
-AWS_QUERYSTRING_AUTH = False
-AWS_S3_FILE_OVERWRITE = True
-AWS_S3_SECURE_URLS = True
-AWS_IS_GZIPPED = False
-AWS_PRELOAD_METADATA = True
-AWS_HEADERS = {
-    "Cache-Control": "public, max-age=86400",
-}
-
-if AWS_DEFAULT_REGION:
-    # Fix for https://github.com/boto/boto/issues/621
-    AWS_S3_HOST = "s3-{0}.amazonaws.com".format(AWS_DEFAULT_REGION)
-
-
 # DRF
 REST_FRAMEWORK = {
     'DEFAULT_PERMISSION_CLASSES': [

requirements.txt

@@ -3,9 +3,6 @@ django-tables2>=1.2.3,<1.3.0
 djangorestframework>=3.3.3,<3.4.0
 ipython>=6.2.1
 pysha3==1.0.2
-django-s3-folder-storage>=0.3,<0.4
-django-storages>=1.4.1,<1.5.0
-boto>=2.41.0,<3.0.0
 env-excavator>=1.5.0,<1.6.0
 python-dotenv>=0.5.1,<0.6.0
 psycopg2-binary>=2.7.4,<2.8.0