Fix for package paths

Author: cjgrady

apache/syftorium.conf.in

@@ -2,27 +2,27 @@
     ServerName @FQDN@
     # ServerName notyeti-195.lifemapper.org
     # Redirect HTTP traffic to HTTPS
-    Redirect permanent / https://@FQDN@
+    # Redirect permanent / https://@FQDN@/
     # Redirect permanent / https://notyeti-195.lifemapper.org/
-</VirtualHost>
+# </VirtualHost>
 
-<VirtualHost *:443>
-    #ServerName @FQDN@
+# <VirtualHost *:443>
+    # ServerName @FQDN@
     # ServerName notyeti-195.lifemapper.org
-    #SSLEngine on
-    #SSLCertificateFile @CERTFILE@
+    # SSLEngine on
+    # SSLCertificateFile @CERTFILE@
     # SSLCertificateFile /etc/letsencrypt/live/notyeti-195.lifemapper.org/fullchain.pem
-    #SSLCertificateKeyFile @CERTKEYFILE@
+    # SSLCertificateKeyFile @CERTKEYFILE@
     # SSLCertificateKeyFile /etc/letsencrypt/live/notyeti-195.lifemapper.org/privkey.pem
     # Include /etc/letsencrypt/options-ssl-apache.conf
-    #Include @SSL_OPTIONS_FILE@
+    # Include @SSL_OPTIONS_FILE@
     # SSLCertificateChainFile /etc/letsencrypt/live/notyeti-195.lifemapper.org/chain.pem
-    #SSLCertificateChainFile @CHAIN_FILE@
+    # SSLCertificateChainFile @CHAIN_FILE@
 
     WSGIDaemonProcess syftorium threads=5
     WSGIScriptAlias /api/v1 /var/www/lmsyft/syftorium.wsgi
 
-    <Directory /var/www/syftorium>
+    <Directory /var/www/lmsyft>
         WSGIProcessGroup syftorium
         WSGIApplicationGroup %{GLOBAL}
         Order deny,allow

flask_app/resolver/routes.py

@@ -4,8 +4,8 @@
 import io
 from werkzeug.exceptions import NotFound, UnsupportedMediaType
 
-import flask_app.resolver.solr_controller as controller
-from flask_app.resolver.models import Ark
+import lmsyft.flask_app.resolver.solr_controller as controller
+from lmsyft.flask_app.resolver.models import Ark
 
 bp = Blueprint('resolve', __name__, url_prefix='/resolve')
 

flask_app/resolver/solr_controller.py

@@ -1,7 +1,7 @@
 """Solr backend controller module for Resolver."""
 import pysolr
 
-from flask_app.resolver.config import RESOLVER_URL
+from lmsyft.flask_app.resolver.config import RESOLVER_URL
 
 
 # Note: A possible evolution of this would be to integrate the Ark class with PySolr

flask_app/sp_cache/process_dwca.py

@@ -9,7 +9,7 @@
 import xml.etree.ElementTree as ET
 import zipfile
 
-import solr_controller as controller
+import lmsyft.flask_app.sp_cache.solr_controller as controller
 
 
 DEFAULT_META_FILENAME = 'meta.xml'

flask_app/sp_cache/routes.py

@@ -6,9 +6,9 @@
 from flask import Blueprint, request
 from werkzeug.exceptions import NotFound
 
-import flask_app.sp_cache.config as config
-import flask_app.sp_cache.models as models
-import flask_app.sp_cache.solr_controller as controller
+import lmsyft.flask_app.sp_cache.config as config
+import lmsyft.flask_app.sp_cache.models as models
+import lmsyft.flask_app.sp_cache.solr_controller as controller
 
 
 bp = Blueprint('sp_cache', __name__, url_prefix='/sp_cache')

flask_app/sp_cache/solr_controller.py

@@ -1,8 +1,8 @@
 """Solr backend controller module for Specify Cache."""
 import pysolr
 
-from flask_app.sp_cache.config import COLLECTIONS_URL, SPECIMENS_URL
-from flask_app.sp_cache.models import SpecimenRecord
+from lmsyft.flask_app.sp_cache.config import COLLECTIONS_URL, SPECIMENS_URL
+from lmsyft.flask_app.sp_cache.models import SpecimenRecord
 
 
 # Need an easy way to get solr classes

flask_app/test/test_sp_cache/test_config.py

@@ -1,7 +1,7 @@
 """Test our Solr config for sp_cache."""
 import pysolr
 
-from sp_cache.config import COLLECTIONS_URL, SPECIMENS_URL
+from lmsyft.flask_app.sp_cache.config import COLLECTIONS_URL, SPECIMENS_URL
 
 
 # .....................................................................................

flask_app/test/test_sp_cache/test_solr_controller.py

@@ -1,5 +1,5 @@
 """Test Solr functions."""
-import sp_cache.solr_controller as app_solr
+import lmsyft.flask_app.sp_cache.solr_controller as app_solr
 
 
 # .....................................................................................