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

Next release #2298

Merged
merged 40 commits into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
208eb28
Bump flask from 2.0.2 to 2.0.3 (#2136)
dependabot[bot] Feb 15, 2022
a6bcb75
Bump @alephdata/followthemoney from 2.8.2 to 2.8.3 in /ui (#2142)
dependabot[bot] Feb 24, 2022
d0101a6
Bump followthemoney from 2.8.2 to 2.8.3 (#2141)
dependabot[bot] Feb 24, 2022
55f5163
Bump servicelayer[amazon,google] from 1.18.2 to 1.19.0 (#2143)
dependabot[bot] Feb 24, 2022
e2581e9
Set the node-sass version to 6.0.1 until we can start using dart inst…
Rosencrantz Mar 1, 2022
8068693
Bump normality from 2.2.5 to 2.3.1 (#2153)
dependabot[bot] Mar 14, 2022
78e7532
Bump sqlalchemy from 1.4.31 to 1.4.32 (#2148)
dependabot[bot] Mar 14, 2022
0471ff2
Merge branch 'main' of github.com:alephdata/aleph into develop
sunu Mar 15, 2022
22bdf4c
Fix search handler on home screen
tillprochaska Mar 9, 2022
2882e81
Bump followthemoney from 2.8.3 to 2.8.5 (#2166)
dependabot[bot] Mar 17, 2022
81cfe94
Bump urllib3 from 1.26.8 to 1.26.9 (#2165)
dependabot[bot] Mar 17, 2022
ba89bbc
Bump alembic from 1.7.6 to 1.7.7 (#2161)
dependabot[bot] Mar 17, 2022
1217bc8
Bump @alephdata/followthemoney from 2.8.3 to 2.8.4 in /ui (#2151)
dependabot[bot] Mar 17, 2022
0b04846
Add French translations into Aleph
Rosencrantz Mar 24, 2022
d9cc638
Fix helm build
Rosencrantz Mar 24, 2022
7420532
Fix up merge conflict
Rosencrantz Mar 28, 2022
d121c19
Bump @blueprintjs/core from 3.52.0 to 3.54.0 in /ui (#2172)
dependabot[bot] Apr 4, 2022
9900424
Bump @formatjs/intl-relativetimeformat from 9.5.2 to 10.0.1 in /ui (#…
dependabot[bot] Apr 4, 2022
bea6cb3
Bump @blueprintjs/select from 3.18.11 to 3.19.1 in /ui (#2181)
dependabot[bot] Apr 4, 2022
4deea2d
Bump flask-talisman from 0.8.1 to 1.0.0 (#2167)
dependabot[bot] Apr 4, 2022
bdc897e
Bump @alephdata/followthemoney from 2.8.4 to 2.9.0 in /ui (#2197)
dependabot[bot] Apr 4, 2022
1c358e6
Bump normality from 2.3.1 to 2.3.2 (#2177)
dependabot[bot] Apr 4, 2022
52ccc85
Bump followthemoney from 2.8.5 to 2.9.0 (#2186)
dependabot[bot] Apr 4, 2022
a1e3f6a
Fixed Gunicorn worker timout issue (#2226)
PitaHat Apr 23, 2022
5b3ee51
Remove ALEPH_SAMPLE_SEARCHES from aleph.env.tmpl (#2242)
msmych May 3, 2022
6003afd
Bump followthemoney from 2.9.0 to 2.9.1 (#2221)
dependabot[bot] May 6, 2022
9fa9b20
Bump normality from 2.3.2 to 2.3.3 (#2212)
dependabot[bot] May 6, 2022
76d4051
Bump @alephdata/followthemoney from 2.9.0 to 2.9.1 in /ui (#2230)
dependabot[bot] May 6, 2022
07907d0
Bump jsonschema from 4.4.0 to 4.5.1 (#2258)
dependabot[bot] May 6, 2022
5703f8a
Bump file-selector from 0.2.4 to 0.6.0 in /ui (#2253)
dependabot[bot] May 6, 2022
4b99381
Bump sqlalchemy from 1.4.32 to 1.4.36 (#2240)
dependabot[bot] May 6, 2022
e6bdfd2
Update cryptography requirement (#2241)
dependabot[bot] May 6, 2022
7100ab1
Bump apispec from 5.1.1 to 5.2.1 (#2247)
dependabot[bot] May 9, 2022
faeffe9
Add config file examples for traefik/keycloak/minio setup (#2260)
catskillmarina May 10, 2022
b63b06e
Pass is_admin to Role#load_or_create() based on ALEPH_ADMINS (#2246)
msmych May 10, 2022
46d85ad
Bump followthemoney from 2.9.1 to 2.9.2 (#2267)
dependabot[bot] May 11, 2022
ddd61f1
Bump the FtM version, should fix trips (#2279)
Rosencrantz May 18, 2022
41af2ef
Bump apispec from 5.2.1 to 5.2.2 (#2272)
dependabot[bot] May 23, 2022
cbe5cf2
Bump babel from 2.9.1 to 2.10.1 (#2224)
dependabot[bot] May 23, 2022
3259e0c
Concatenate error messages for the same path (#2273)
msmych May 27, 2022
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
Prev Previous commit
Next Next commit
Add config file examples for traefik/keycloak/minio setup (#2260)
  • Loading branch information
catskillmarina authored May 10, 2022
commit faeffe9eb97203d4a23da4a199f3c4e9317dde46
14 changes: 14 additions & 0 deletions contrib/aleph-traefik-minio-keycloak/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
build
ui
helm
aleph.env
aleph.egg-info
docker-compose.*
celerybeat-schedul*
contrib/allCountries.zip
.git
.vscode
.github
.travis.yml
.env
.tx
107 changes: 107 additions & 0 deletions contrib/aleph-traefik-minio-keycloak/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
*.pyc
*.DS_Store
.DS_Store
*.sqlite3
__pycache__
balkhashdb

TODO.md

build*

ui/node_modules
ui/build
ui/package-lock.json
ui/i18n/messages.json
ui/i18n/messages.pot
ui/**/*.css

services/elasticsearch/secrets

celerybeat-schedule*
aleph.env
test_settings.py
.coverage

npm-debug.log*
.idea/
ui/.idea/
node_modules/*
.eslintcache

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
.vscode/

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# dotenv
.env

# virtualenv
.venv
venv/
ENV/

# Spyder project settings
.spyderproject

# Rope project settings
.ropeproject
22 changes: 22 additions & 0 deletions contrib/aleph-traefik-minio-keycloak/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MIT License

Copyright (c) 2014-2015 Friedrich Lindenberg
Copyright (c) 2016-2020 Journalism Development Network, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
28 changes: 28 additions & 0 deletions contrib/aleph-traefik-minio-keycloak/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Setting up Aleph with Traefik, Minio and keycloak.
--------------------------------------------------

Some Tips
---------

* Be sure to follow the instructions for a normal install as well as using
these config files.

* shell into aleph and run 'aleph upgrade' to create the needed database
structures.

* In the keycloak configuration set HTML Display nameand Frontend URL to
your keycloak dns domain with /auth/ after it.

* Keycloak account-console under clients needs to be
https://your-auth-domain/auth/realms/aleph-users/account/

* Keycloak aleph-ui under clients needs to be https://your-aleph-domain/

* Keycloak security-admin-console under clients needs to be https://your-auth-domain/auth/admin/aleph-users/console/

* Use minio client on exposed minio port on localhost to create the aleph bucket
if you have trouble with S3. Otherwise leave it alone.

Misc
----
There is a start and stop script included.
Loading