Merge pull request #2812 from zimmerman-team/develop

Develop to Main release for IATI.cloud publishing direct-indexing

.env.example.docker

@@ -0,0 +1,50 @@
+# General project
+SECRET_KEY=iati_cloud
+DEBUG=True
+FRESH=True
+THROTTLE_DATASET=False
+DJANGO_STATIC_ROOT=/static/
+DJANGO_STATIC_URL=/static/
+
+# Postgres
+POSTGRES_HOST=database
+POSTGRES_PORT=5432
+POSTGRES_DB=iati_cloud
+POSTGRES_USER=iati_cloud
+POSTGRES_PASSWORD=oipa
+
+# Celery
+CELERY_BROKER_URL=amqp://rabbitmq
+
+# FCDO Instance
+FCDO_INSTANCE=False
+
+# SOLR USERNAME AND PASSWORD
+SOLR_ADMIN_USERNAME=admin_example
+SOLR_ADMIN_PASSWORD=exampl3_123!
+# SOLR BASE URL, Use the same username and password as above
+SOLR_BASE_URL=http://admin_example:exampl3_123!@solr:8983/solr
+# BASE ENCODED USER AND PASSWORD (USE https://www.base64encode.org/ TO ENCODE)
+SOLR_AUTH_ENCODED=YWRtaW5fZXhhbXBsZTpleGFtcGwzXzEyMyE=
+# SOLR Memory (in GB), 20 and 40 are recommended for production, local you can use 1 and 2.
+MEM_SOLR_MIN=20
+MEM_SOLR_MAX=40
+
+# Flower password
+CELERYFLOWER_PASSWORD=zz
+CELERYFLOWER_USER=zz
+
+# DJANGO DEFAULT SUPERUSER WHEN FIRST RUN
+DJANGO_SUPERUSER_USERNAME=admin_example
+DJANGO_SUPERUSER_PASSWORD=exampl3_123!
+[email protected]
+
+# MONGODB DEFAULT SUPERUSER, PASSWORD AND DATABASE WHEN FIRST RUN
+MONGO_INITDB_ROOT_USERNAME=admin_example
+MONGO_INITDB_ROOT_PASSWORD=exampl3_123!
+MONGO_INITDB_DATABASE=activities  # needs to stay the same
+# MongoDB use the same username and password as above
+MONGO_CONNECTION_STRING=mongodb://admin_example:exampl3_123!@mongo:27017
+
+# NGINX HOST, localhost for local development, iati.cloud for production
+IC_DOMAIN=localhost

.env.example.local

@@ -0,0 +1,47 @@
+# General project
+SECRET_KEY=iati_cloud
+DEBUG=True
+FRESH=True
+THROTTLE_DATASET=False
+DJANGO_STATIC_ROOT=/static/
+DJANGO_STATIC_URL=/static/
+
+# Postgres
+POSTGRES_HOST=localhost
+POSTGRES_PORT=5432
+POSTGRES_DB=iati_cloud
+POSTGRES_USER=iati_cloud
+POSTGRES_PASSWORD=oipa
+
+# Celery
+CELERY_BROKER_URL=amqp://localhost
+
+# FCDO Instance
+FCDO_INSTANCE=False
+
+# SOLR USERNAME AND PASSWORD
+SOLR_ADMIN_USERNAME=admin_example
+SOLR_ADMIN_PASSWORD=exampl3_123!
+# SOLR BASE URL, Use the same username and password as above
+SOLR_BASE_URL=http://localhost:8983/solr
+# BASE ENCODED USER AND PASSWORD (USE https://www.base64encode.org/ TO ENCODE)
+SOLR_AUTH_ENCODED=YWRtaW5fZXhhbXBsZTpleGFtcGwzXzEyMyE=
+
+# Flower password
+CELERYFLOWER_PASSWORD=zz
+CELERYFLOWER_USER=zz
+
+# DJANGO DEFAULT SUPERUSER WHEN FIRST RUN
+DJANGO_SUPERUSER_USERNAME=admin_example
+DJANGO_SUPERUSER_PASSWORD=exampl3_123!
+[email protected]
+
+# MONGODB DEFAULT SUPERUSER, PASSWORD AND DATABASE WHEN FIRST RUN
+MONGO_INITDB_ROOT_USERNAME=admin_example
+MONGO_INITDB_ROOT_PASSWORD=exampl3_123!
+MONGO_INITDB_DATABASE=activities  # needs to stay the same
+# MongoDB use the same username and password as above
+MONGO_CONNECTION_STRING=mongodb://admin_example:exampl3_123!@localhost:27017
+
+# NGINX HOST, localhost for local development, iati.cloud for production
+IC_DOMAIN=localhost

.github/workflows/codeql-analysis.yml

@@ -29,15 +29,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
+      with:
+        languages: python
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -51,4 +51,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2