diff --git a/src/entrypoint.sh b/src/entrypoint.sh index aad29db4..9369abdb 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -79,7 +79,6 @@ else if [ ${FORCE_REINIT} = "true" ] || [ ${FORCE_REINIT} = "True" ] || [ ! -e "/mnt/volumes/statics/geonode_init.lock" ]; then echo "LOG INIT" > /usr/src/{{project_name}}/invoke.log - invoke updategeoip invoke fixtures invoke monitoringfixture invoke initialized diff --git a/src/pavement.py b/src/pavement.py index 91190e10..511d72bc 100644 --- a/src/pavement.py +++ b/src/pavement.py @@ -298,21 +298,6 @@ def static(options): sh('grunt production') -@task -@needs([ - 'setup_geoserver', -]) -def setup(options): - """Get dependencies and prepare a GeoNode development environment.""" - - if MONITORING_ENABLED: - updategeoip(options) - - info('GeoNode development environment successfully set up.' - 'If you have not set up an administrative account,' - ' please do so now. Use "paver start" to start up the server.') - - def grab_winfiles(url, dest, packagename): # Add headers headers = {'User-Agent': 'Mozilla 5.10'} @@ -377,22 +362,6 @@ def upgradedb(options): print(f"Upgrades from version {version} are not yet supported.") -@task -@cmdopts([ - ('settings=', 's', 'Specify custom DJANGO_SETTINGS_MODULE') -]) -def updategeoip(options): - """ - Update geoip db - """ - if MONITORING_ENABLED: - settings = options.get('settings', '') - if settings and 'DJANGO_SETTINGS_MODULE' not in settings: - settings = f'DJANGO_SETTINGS_MODULE={settings}' - - sh(f"{settings} python -W ignore manage.py updategeoip -o") - - @task @cmdopts([ ('settings=', 's', 'Specify custom DJANGO_SETTINGS_MODULE') diff --git a/src/requirements.txt b/src/requirements.txt index 3c75a8c7..65006923 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1 +1 @@ -GeoNode==4.1.0 +GeoNode==4.1.1 \ No newline at end of file diff --git a/src/tasks.py b/src/tasks.py index 0f09a7f0..fde10e73 100644 --- a/src/tasks.py +++ b/src/tasks.py @@ -275,13 +275,6 @@ def monitoringfixture(ctx): logger.error(f"ERROR installing monitoring fixture: {str(e)}") -@task -def updategeoip(ctx): - print("**************************update geoip*******************************") - if ast.literal_eval(os.environ.get('MONITORING_ENABLED', 'False')): - ctx.run(f"django-admin.py updategeoip --settings={_localsettings()}", pty=True) - - @task def updateadmin(ctx): print("***********************update admin details**************************")