[Minor fixes] settings typos and fixoauth mgt commands

GeoNode · May 10, 2019 · 9c53111 · 9c53111
1 parent 1974350
commit 9c53111
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/geonode/base/management/commands/fixoauthuri.py b/geonode/base/management/commands/fixoauthuri.py
@@ -32,13 +32,26 @@ class Command(BaseCommand):
     """
     can_import_settings = True
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--target-address',
+            dest='target_address',
+            help='Target Address (the one to be changed e.g. http://my-public.geonode.org)')
+
     def handle(self, *args, **options):
+
+        target_address = options.get('target_address')
+
         from django.conf import settings
         client_id = None
         client_secret = None
+
         if check_ogc_backend(geoserver.BACKEND_PACKAGE):
             from geonode.geoserver.helpers import ogc_server_settings
-            redirect_uris = '%s\n%s' % (ogc_server_settings.LOCATION, ogc_server_settings.public_url)
+            redirect_uris = '%s\n%s\n%s' % (
+                ogc_server_settings.LOCATION,
+                ogc_server_settings.public_url,
+                "http://{}/geoserver/".format(target_address))
             if Application.objects.filter(name='GeoServer').exists():
                 Application.objects.filter(name='GeoServer').update(redirect_uris=redirect_uris)
                 app = Application.objects.filter(name='GeoServer')[0]

diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample
@@ -525,7 +525,7 @@ if MONITORING_ENABLED:
             ('geonode.contrib.monitoring.middleware.MonitoringMiddleware',)
     MONITORING_CONFIG = None
     MONITORING_HOST_NAME = os.getenv("MONITORING_HOST_NAME", HOSTNAME)
-    MONITORING_SERVICE_NAME = 'geonode'
+    MONITORING_SERVICE_NAME = os.getenv("MONITORING_SERVICE_NAME", 'local-geonode')
 
 
 # Documents Thumbnails

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -1539,7 +1539,7 @@
 # add following lines to your local settings to enable monitoring
 MONITORING_ENABLED = ast.literal_eval(os.environ.get('MONITORING_ENABLED', 'False'))
 MONITORING_HOST_NAME = os.getenv("MONITORING_HOST_NAME", HOSTNAME)
-MONITORING_SERVICE_NAME = os.getenv("MONITORING_SERVICE_NAME", 'local-geoserver')
+MONITORING_SERVICE_NAME = os.getenv("MONITORING_SERVICE_NAME", 'local-geonode')
 
 # how long monitoring data should be stored
 MONITORING_DATA_TTL = timedelta(days=7)

diff --git a/package/support/geonode.updateip b/package/support/geonode.updateip
@@ -180,14 +180,14 @@ client_secret=`echo $oauth_keys | cut -d \, -f 2`
 oauth_config="$GEOSERVER_DATA_DIR/security/filter/geonode-oauth2/config.xml"
 sed -i "s|<cliendId>.*</cliendId>|<cliendId>$client_id</cliendId>|g" $oauth_config
 sed -i "s|<clientSecret>.*</clientSecret>|<clientSecret>$client_secret</clientSecret>|g" $oauth_config
-sed -i "s|<accessTokenUri>.*</accessTokenUri>|<accessTokenUri>$NEW_INT_IP/o/token/</accessTokenUri>|g" $oauth_config
+sed -i "s|<accessTokenUri>.*</accessTokenUri>|<accessTokenUri>$NEW_EXT_IP/o/token/</accessTokenUri>|g" $oauth_config
 sed -i "s|<userAuthorizationUri>.*</userAuthorizationUri>|<userAuthorizationUri>$NEW_EXT_IP/o/authorize/</userAuthorizationUri>|g" $oauth_config
 sed -i "s|<redirectUri>.*</redirectUri>|<redirectUri>$NEW_EXT_IP/geoserver/</redirectUri>|g" $oauth_config
-sed -i "s|<checkTokenEndpointUrl>.*</checkTokenEndpointUrl>|<checkTokenEndpointUrl>$NEW_INT_IP/api/o/v4/tokeninfo/</checkTokenEndpointUrl>|g" $oauth_config
+sed -i "s|<checkTokenEndpointUrl>.*</checkTokenEndpointUrl>|<checkTokenEndpointUrl>$NEW_EXT_IP/api/o/v4/tokeninfo/</checkTokenEndpointUrl>|g" $oauth_config
 sed -i "s|<logoutUri>.*</logoutUri>|<logoutUri>$NEW_EXT_IP/account/logout/</logoutUri>|g" $oauth_config
 
 # Updating REST Role Service Config
-sed -i "s|<baseUrl>.*</baseUrl>|<baseUrl>$NEW_INT_IP</baseUrl>|g" "$GEOSERVER_DATA_DIR/security/role/geonode REST role service/config.xml"
+sed -i "s|<baseUrl>.*</baseUrl>|<baseUrl>$NEW_EXT_IP</baseUrl>|g" "$GEOSERVER_DATA_DIR/security/role/geonode REST role service/config.xml"
 
 # Updating GeoServer Global Config
 global_config="$GEOSERVER_DATA_DIR/global.xml"