Skip to content

Commit

Permalink
Merge pull request #2 from Xpirix/some_fixes
Browse files Browse the repository at this point in the history
Change repo to QGIS-Hub-Website
  • Loading branch information
Xpirix authored Aug 13, 2024
2 parents 4ce2d49 + 5ee5384 commit aa9b3b9
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## Development Environment

- Clone git repo `git clone https://github.com/qgis/QGIS-Django.git`
- Clone git repo `git clone https://github.com/qgis/QGIS-Hub-Website.git`
- Run `$ pwd` in order to get your current directory
- Path to your repo should be `<your current directory>/QGIS-Django `
- Go to dockerize directory `cd QGIS-Django/dockerize`
- Path to your repo should be `<your current directory>/QGIS-Hub-Website `
- Go to dockerize directory `cd QGIS-Hub-Website/dockerize`

- Build and spin container
```bash
Expand Down Expand Up @@ -59,7 +59,7 @@ pre-commit install --config .pre-commit-config.yaml

### Setting up a remote interpreter in PyCharm

- PyCharm -> Preferences -> Project: QGIS-Django
- PyCharm -> Preferences -> Project: QGIS-Hub-Website
- Click on the gear icon next to project interpreter -> add
- SSH Interpreter -> New server configuration
- Host : `localhost`
Expand Down Expand Up @@ -110,7 +110,7 @@ Now set these options:
filesystem and the filesystem in the remote (docker) host. Click the ellipsis
and add a run that points to your git checkout on your local host and the
/home/web directory in the docker host. e.g.
* **Local path:** <path to your git repo>/QGIS-Django/qgis-app
* **Local path:** <path to your git repo>/QGIS-Hub-Website/qgis-app
* **Remote path:** /home/web/django_project
* click OK to save your run configuration

Expand Down
2 changes: 1 addition & 1 deletion doc/APPS.t2t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
QGIS Django Project
This document describes the applications that we plan to eventually be part of the QGIS-DJANGO project.
This document describes the applications that we plan to eventually be part of the QGIS-Hub-Website project.
Tim Sutton 2010
%! target : html
%! style : style.css
Expand Down
4 changes: 2 additions & 2 deletions dockerize/scripts/renew-ssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 2021-11-12 11:10:00 UTC
# ...etc

#25 11 * * * /bin/bash /home/web/QGIS-Django/dockerize/scripts/renew_ssl.sh > /tmp/ssl-renewal-logs.txt
#25 11 * * * /bin/bash /home/web/QGIS-Hub-Website/dockerize/scripts/renew_ssl.sh > /tmp/ssl-renewal-logs.txt


docker compose -f /home/web/QGIS-Django/dockerize/docker-compose.yml -p qgis-hub run certbot renew
docker compose -f /home/web/QGIS-Hub-Website/dockerize/docker-compose.yml -p qgis-hub run certbot renew
2 changes: 1 addition & 1 deletion qgis-app/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import sentry_sdk

"""
QGIS-DJANGO - MIDDLEWARE
QGIS-Hub-Website - MIDDLEWARE
Middlewares to fix behind proxy IP problems
Expand Down
2 changes: 1 addition & 1 deletion qgis-app/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
{% block content %}
<h2>Error 404: page not found.</h2>
<p>The page you requested could not be found.</p>
<p>If you followed a link within this site, please file a ticket on <a href="https://github.com/qgis/QGIS-Django/issues">QGIS-Django project</a> and let us know about this problem.</p>
<p>If you followed a link within this site, please file a ticket on <a href="https://github.com/qgis/QGIS-Hub-Website/issues">QGIS-Hub-Website project</a> and let us know about this problem.</p>
{% endblock %}
2 changes: 1 addition & 1 deletion qgis-app/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ <h5>Silver Sponsors</h5>
<ul class="unstyled inline" id="social">
<li id="twitter"><a href="https://twitter.com/qgis" class="external"><div></div></a></li>
<li id="facebook"><a href="https://www.facebook.com/QGIS-298112000235096" class="external"><div></div></a></li>
<li id="github"><a href="https://github.com/qgis/QGIS-Django" class="external"><div></div></a></li>
<li id="github"><a href="https://github.com/qgis/QGIS-Hub-Website" class="external"><div></div></a></li>
</ul>
</div>

Expand Down
2 changes: 1 addition & 1 deletion qgis-app/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<h2>Welcome the the new QGIS Web Application</h2>
<p>This application in currently under testing and will become soon the official QGIS web portal.</p>
<p>You are strongly encouraged to use this application and report any issue on the <a href="http://hub.qgis.org/projects/qgis-django">QGIS Web Applications Bug Tracking System.</a></p>
<p>You are strongly encouraged to use this application and report any issue on the <a href="http://hub.qgis.org/projects/QGIS-Hub-Website">QGIS Web Applications Bug Tracking System.</a></p>
<p>In order to access to some functionalities of this website you will need to login with a valid OSGEO id. You can create a new one on <a href="http://www.osgeo.org/osgeo_userid">OSGEO web portal.</a></p>
<p>Thank you for your cooperation.</p>

Expand Down

0 comments on commit aa9b3b9

Please sign in to comment.