Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hub website only #1

Merged
merged 9 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
exclude = */docs/*,*/.tox/*,*/.venv/*,*/.pycharm_helpers/*,*/migrations/*,docs/*,*/__init__.py,
*/manage.py,*/wsgi.py,*/django.wsgi,
# we don't check this for now, until it's been fixed. otherwise it will throw lot of errors
qgis-app/plugins/*,
qgis-app/userexport/*,
qgis-app/lib/templatetags/*,
vagrant_assets/*,
qgis-app/users/*,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_push_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
file: dockerize/docker/Dockerfile
push: true
tags: |
qgis/qgis-plugins-uwsgi:${{ github.ref_name }}
qgis/qgis-plugins-uwsgi:latest
qgis/qgis-hub-uwsgi:${{ github.ref_name }}
qgis/qgis-hub-uwsgi:latest

- name: Log out from Docker Hub
run: docker logout
44 changes: 19 additions & 25 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ $ make devweb-runserver
```
and now, you can see your site at `http://0.0.0.0:62202` (skip this step if you are using PyCharm interpreter)

- If 'None' appears in the search results, it indicates a misalignment between the search index and the database. This discrepancy often arises when a plugin is deleted from the model but persists in the search index. To rectify this issue, it is essential to synchronize the search index with the database by rebuilding it. Execute the following command to initiate the rebuilding process:

```bash
$ make rebuild_index
```
This command ensures that the search index accurately reflects the current state of the database, resolving the presence of 'None' in the search results. Automatic synchronization is currently managed in settings.py: `HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor"`.

For more information about make commands, please see the full docs [here](./dockerize/README.md).

Expand Down Expand Up @@ -108,7 +102,7 @@ Now set these options:
* **Run browser** If checked, it will open the url after you click run. You should be able to access the running on 0.0.0.0:62202 (the port that mapped to 8080)

* **Environment vars** , you can add the variables value one-by-one by clicking on browse icon at right corner in the input field, or just copy-paste this value:
`PYTHONUNBUFFERED=1;DJANGO_SETTINGS_MODULE=settings_docker;RABBITMQ_HOST=rabbitmq;DATABASE_NAME=gis;DATABASE_USERNAME=docker;DATABASE_PASSWORD=docker;DATABASE_HOST=db`
`PYTHONUNBUFFERED=1;DJANGO_SETTINGS_MODULE=settings_docker;DATABASE_NAME=gis;DATABASE_USERNAME=docker;DATABASE_PASSWORD=docker;DATABASE_HOST=db`
* **Python interpreter:** Ensure it is set you your remote interpreter (should be
set to that by default)

Expand Down Expand Up @@ -165,31 +159,31 @@ backups
├── 2019
├── 2020
│   ├── April
│   │   └── PG_QGIS_PLUGINS_gis.07-April-2020.dmp
│   │   └── PG_QGIS_HUB_gis.07-April-2020.dmp
│   ├── August
│   ├── December
│   │   ├── PG_QGIS_PLUGINS_gis.01-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.02-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.03-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.04-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.05-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.06-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.07-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.08-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.09-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.10-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.11-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.12-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.13-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.14-December-2020.dmp
│   │   ├── PG_QGIS_PLUGINS_gis.15-December-2020.dmp
│   │   └── PG_QGIS_PLUGINS_gis.16-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.01-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.02-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.03-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.04-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.05-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.06-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.07-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.08-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.09-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.10-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.11-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.12-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.13-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.14-December-2020.dmp
│   │   ├── PG_QGIS_HUB_gis.15-December-2020.dmp
│   │   └── PG_QGIS_HUB_gis.16-December-2020.dmp
│`
```

- Copy the dump file you wish to restore to dockerize/backups/latest.dmp file
```bash
$ cp backups/2020/December/PG_QGIS_PLUGINS_gis.16-December-2020.dmp dockerize/backups/latest.dmp
$ cp backups/2020/December/PG_QGIS_HUB_gis.16-December-2020.dmp dockerize/backups/latest.dmp
```

- Restore the dump file
Expand Down
58 changes: 0 additions & 58 deletions Makefile

This file was deleted.

34 changes: 0 additions & 34 deletions Vagrantfile

This file was deleted.

34 changes: 0 additions & 34 deletions apache/apache.virtenv.conf.example

This file was deleted.

15 changes: 0 additions & 15 deletions apache/django.wsgi

This file was deleted.

98 changes: 0 additions & 98 deletions backup.sh

This file was deleted.

5 changes: 0 additions & 5 deletions createdb.sh

This file was deleted.

1 change: 0 additions & 1 deletion doc/APPS.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Tim Sutton 2010

= Planned applications=

+ plugins - a django app for managing the QGIS python plugin repository
+ users - a django app for creating a community map and some demographics
+ snippets - a django app for users to share python and c++ snippets showing how to program QGIS
+ styles - a django app for users to publish the QGIS styles they have created
Expand Down
17 changes: 7 additions & 10 deletions dockerize/.env.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# RabbitMQ host
RABBITMQ_HOST=rabbitmq

# Database variables
DATABASE_NAME=gis
DATABASE_USERNAME=docker
Expand All @@ -12,9 +9,9 @@ DJANGO_SETTINGS_MODULE=settings_docker
DEBUG=False

# Docker volumes
QGISPLUGINS_STATIC_VOLUME=static-data
QGISPLUGINS_MEDIA_VOLUME=media-data
QGISPLUGINS_BACKUP_VOLUME=backups-data
QGISHUB_STATIC_VOLUME=static-data
QGISHUB_MEDIA_VOLUME=media-data
QGISHUB_BACKUP_VOLUME=backups-data

# Email variables
EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
Expand All @@ -25,10 +22,10 @@ EMAIL_HOST_USER=''
EMAIL_HOST_PASSWORD=''

# URL
DEFAULT_PLUGINS_SITE='https://plugins.qgis.org/'
DEFAULT_HUB_SITE='https://hub.qgis.org/'

# ENV: debug or prod
QGISPLUGINS_ENV=debug
QGISHUB_ENV=debug

# Ldap
ENABLE_LDAP=False
Expand All @@ -41,7 +38,7 @@ SENTRY_DSN=''
SENTRY_RATE=1.0

# Download stats URL
METABASE_DOWNLOAD_STATS_URL='https://plugins.qgis.org/metabase/public/dashboard/<dashboard_id>'
METABASE_DOWNLOAD_STATS_URL='https://hub.qgis.org/metabase/public/dashboard/<dashboard_id>'

# Uwsgi Docker image
UWSGI_DOCKER_IMAGE='qgis/qgis-plugins-uwsgi:latest'
UWSGI_DOCKER_IMAGE='qgis/qgis-hub-uwsgi:latest'
Loading