-
Notifications
You must be signed in to change notification settings - Fork 4
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
Translations #102
Merged
Merged
Translations #102
Changes from 71 commits
Commits
Show all changes
218 commits
Select commit
Hold shift + click to select a range
54c841d
added postgresql functions for graph ql api
twallnerWaretec 32af093
Merge branch 'main' into translations
twallnerWaretec 0b19372
added transcript changes
twallnerWaretec d034e58
Merge branch 'translations' of https://github.com/twallnerWaretec/rep…
twallnerWaretec eeabfc3
+ add elasticsearch & pgsync
mariotebest e959ea2
Merge pull request #1 from twallnerWaretec/elasticsearch
twallnerWaretec 5fae955
Merge pull request #2 from twallnerWaretec/main
twallnerWaretec 58b57f6
fixes
twallnerWaretec 9f3f334
frontend fixes
twallnerWaretec 9699dd9
fix lineending
twallnerWaretec 2fd5d4f
fixed param
twallnerWaretec 482d28d
fixed contentgrouping and revision in transcript
twallnerWaretec 9f00bd3
removed verbose logging
twallnerWaretec b4424ee
do transactions
Frando 38178ad
added json plugin
twallnerWaretec 6e286e7
Merge branch 'translations' into translations
twallnerWaretec 1c5a3c3
Merge pull request #97 from twallnerWaretec/translations
twallnerWaretec d19ead3
fixes for search plugin
twallnerWaretec 679b6e7
Merge branch 'prisma-transactions' into translations
twallnerWaretec 1219a78
recompiled types
twallnerWaretec 729ea1b
fixed build docker file
twallnerWaretec 834f588
add cba key to docker file
twallnerWaretec bdc10c5
frontend fixes
twallnerWaretec 651df62
removed console.log
twallnerWaretec e6a1224
switched ingest order
twallnerWaretec f3fe465
more logging
twallnerWaretec aa09d30
changed direction
twallnerWaretec 8601715
fixed translations mapping
twallnerWaretec 8834de5
fixed frontend communication with graphql on prod
twallnerWaretec 6ca66be
elastic search changes
twallnerWaretec f2e2bce
fixed docker compose
twallnerWaretec 705fb1c
updated schema.json
twallnerWaretec 8f9ed79
fixed elastic search ordering
twallnerWaretec 2fa67d7
fixed docker build yml
twallnerWaretec 10762be
fixed rss feed
twallnerWaretec 7a60e89
changed elastic port
twallnerWaretec df1419b
fixed docker yml files
twallnerWaretec d506247
changed host settings es
twallnerWaretec c1abb74
fixes
twallnerWaretec fd5ea56
no container names
twallnerWaretec 3f69d69
changed volume path
twallnerWaretec c28c955
fixed port mappings pgsync
twallnerWaretec 2af79e1
save contenturl in content item
twallnerWaretec 29bab5b
fixed ipv4 resolution
twallnerWaretec 8f7e4f7
docker to docker communication
twallnerWaretec b5d6c4c
host fixed
twallnerWaretec 5430b5b
changed pgsync log_level
twallnerWaretec 7a4ef80
set logging to info
twallnerWaretec 8253e2a
log_level warning
twallnerWaretec 87ba6b2
fixed docker-compose
twallnerWaretec dd86408
fixes
twallnerWaretec 4821acb
datasource fixes
twallnerWaretec d3ef34e
readme changed
twallnerWaretec aa6af06
Merge branch 'main' into translations
twallnerWaretec f06e253
fixed activitypub ds for multilingual
twallnerWaretec 74a98d9
fixed undici
twallnerWaretec 5d82bcf
undici fix 2
twallnerWaretec d3f7893
fixed contentgrouping schema.json
twallnerWaretec b289e5c
transaction timeout increased
twallnerWaretec 5020eb4
added concept filter + optimized schema.json a little
twallnerWaretec 90f8fb9
fixed rss paging
twallnerWaretec 62c3809
added delete repo + docker compose fix
twallnerWaretec 04e0951
log level debug
twallnerWaretec c41496a
fixed readme
twallnerWaretec e698299
added migration
twallnerWaretec 47d10fd
fixed tests
twallnerWaretec 98eee4d
fixed docker compose
twallnerWaretec ba38ab9
Merge branch 'main' into translations
twallnerWaretec 8c0c872
added delete repo cli command
twallnerWaretec 65bda97
Merge branch 'translations' of https://github.com/repco-org/repco int…
twallnerWaretec cf05436
adjusted pgsync schema.json
twallnerWaretec 456894f
fix: parse pubDate as UTC
Frando d82c11a
fix: recreate cba test fixtures
Frando f6d548c
fix: recreate cba fixtures
Frando 71410cc
added originalLanguages + misc
twallnerWaretec 786021b
Merge branch 'translations' of https://github.com/repco-org/repco int…
twallnerWaretec 5065e76
added postgresql functions for graph ql api
twallnerWaretec 6862e03
added transcript changes
twallnerWaretec 785e4bf
+ add elasticsearch & pgsync
mariotebest 0d83b44
fixes
twallnerWaretec 1c5fc9e
frontend fixes
twallnerWaretec e05c626
fix lineending
twallnerWaretec c78bca4
fixed param
twallnerWaretec 32c3e65
fixed contentgrouping and revision in transcript
twallnerWaretec 5af2241
removed verbose logging
twallnerWaretec 04b3f05
added json plugin
twallnerWaretec cbbb8ca
fixes for search plugin
twallnerWaretec 6e7fd99
do transactions
Frando 5d8ad20
recompiled types
twallnerWaretec adf528f
fixed build docker file
twallnerWaretec a965485
add cba key to docker file
twallnerWaretec 33ea3a9
frontend fixes
twallnerWaretec 8da9346
removed console.log
twallnerWaretec 453fd2d
switched ingest order
twallnerWaretec c89d048
more logging
twallnerWaretec 8fbd57e
changed direction
twallnerWaretec fc03b2a
fixed translations mapping
twallnerWaretec f498708
fixed frontend communication with graphql on prod
twallnerWaretec 95411c2
elastic search changes
twallnerWaretec 93e5b9e
fixed docker compose
twallnerWaretec b396108
updated schema.json
twallnerWaretec 9e78676
fixed elastic search ordering
twallnerWaretec 9e90cfa
fixed docker build yml
twallnerWaretec a2767fd
fixed rss feed
twallnerWaretec b1f4a2a
changed elastic port
twallnerWaretec 46568f3
fixed docker yml files
twallnerWaretec f51ab10
changed host settings es
twallnerWaretec 8391042
fixes
twallnerWaretec 390068f
no container names
twallnerWaretec 1386df9
changed volume path
twallnerWaretec 3a7297b
fixed port mappings pgsync
twallnerWaretec 43d7c88
save contenturl in content item
twallnerWaretec 41bce7b
fixed ipv4 resolution
twallnerWaretec 609961e
docker to docker communication
twallnerWaretec f67e199
host fixed
twallnerWaretec 1684a85
changed pgsync log_level
twallnerWaretec 7f9d261
set logging to info
twallnerWaretec 0520d4a
log_level warning
twallnerWaretec dbbe2d9
fixed docker-compose
twallnerWaretec b2f91e2
fixes
twallnerWaretec d783a9e
datasource fixes
twallnerWaretec c67b30d
readme changed
twallnerWaretec bf12598
fixed activitypub ds for multilingual
twallnerWaretec d523af2
fixed undici
twallnerWaretec e88a042
undici fix 2
twallnerWaretec 8f59d58
fixed contentgrouping schema.json
twallnerWaretec 10ac4e7
transaction timeout increased
twallnerWaretec cc389b0
added concept filter + optimized schema.json a little
twallnerWaretec c078e8e
fixed rss paging
twallnerWaretec 00a27d0
added delete repo + docker compose fix
twallnerWaretec d6cc803
log level debug
twallnerWaretec 487e46d
fixed readme
twallnerWaretec 7373827
added migration
twallnerWaretec fb44fbf
fixed tests
twallnerWaretec db0bab2
fixed docker compose
twallnerWaretec 7cf04e6
added delete repo cli command
twallnerWaretec 0613c1c
adjusted pgsync schema.json
twallnerWaretec 5ced57f
added originalLanguages + misc
twallnerWaretec 09d5c3e
fix: parse pubDate as UTC
Frando 01232a4
fix: recreate cba test fixtures
Frando c23d432
fix: recreate cba fixtures
Frando 2c745ba
regenerated graphql schema and zod client
twallnerWaretec 38846f6
Merge branch 'translations' of https://github.com/repco-org/repco int…
twallnerWaretec 1462711
changed naming for plugin
twallnerWaretec baec679
Merge remote-tracking branch 'origin/main' into translations
Frando f06950f
tests: fix basic tests
Frando f82eb75
more elastic search query logging
twallnerWaretec 4947fe9
logger settings
twallnerWaretec 32ab331
logger.
twallnerWaretec eff99c3
more logging
twallnerWaretec 5794e0c
limit es query size
twallnerWaretec 3af50f8
fixed rss ds for okto endpoint
twallnerWaretec e1b0645
adjusted logging
twallnerWaretec 8b9d58b
join fixes
twallnerWaretec 706068a
logging ist still necessary
twallnerWaretec e5a6dfb
limit elastic results based on score
twallnerWaretec 8df8546
filter in statement as well
twallnerWaretec 8fb3e15
pg logging
twallnerWaretec 0e901de
line ending fix
twallnerWaretec 7c06bac
new docker compose file
twallnerWaretec b009baa
temp
twallnerWaretec db370de
fixed elastic search not finding results
twallnerWaretec 99f51f7
fixed elastic url
twallnerWaretec b503ee6
new ingester + showcase
twallnerWaretec e9809c2
port changes
twallnerWaretec ed27e68
fixed circular reference
twallnerWaretec e3072bf
docs updated
twallnerWaretec 7b45dd1
fixed showcase docker compose
twallnerWaretec 633d829
removed listener for new ingester
twallnerWaretec dcc966c
circular dependency fix
twallnerWaretec f6e861e
removed old reference
twallnerWaretec ab230f5
fixed circular ref
twallnerWaretec a64b0dd
fixed rss:link element undefined sometimes
twallnerWaretec f7c6190
fixed db port showcase
twallnerWaretec 114b658
frontend changes temp
twallnerWaretec b79f9f4
Merge branch 'arso/translations' into translations
twallnerWaretec 11bbe29
test fixes
twallnerWaretec aaa9454
fix application error
twallnerWaretec f784d80
misc fixes
twallnerWaretec 5db7307
fixed subtitle typing
twallnerWaretec 45cdfac
fixed repo count
twallnerWaretec 9e5b0b0
fixes + frontend changes
twallnerWaretec 4e376bb
fixed repo counts
twallnerWaretec bc19969
frontend fixes
twallnerWaretec ce30c31
added shellscript to init ds config
twallnerWaretec d9b823b
allow duplicate ds registers
twallnerWaretec 846c25a
fixes
twallnerWaretec 8fb1dec
added reset script
twallnerWaretec 7f3324d
added more config
twallnerWaretec 4c8832e
fix: activitypub ingest for large feeds
Frando 4a03197
multiple fixes
twallnerWaretec 06dc5de
Merge remote-tracking branch 'origin/fix-ap-ingest' into translations
twallnerWaretec 304db6f
fixed env variables
twallnerWaretec 149c236
added ds
twallnerWaretec c4eb899
profile picture fix
twallnerWaretec cf0ac19
fixed db schema problem
twallnerWaretec 584a83b
fixes
twallnerWaretec 71f1997
removed empty code
twallnerWaretec d7e34b8
profile picture nullable
twallnerWaretec a5534b6
fix contribution links
twallnerWaretec bd7c38a
reduced page size transposer
twallnerWaretec d68e47d
fixed multiple stations in repo
twallnerWaretec 1b0bace
increased prisma timeout
twallnerWaretec 5913386
test stations
twallnerWaretec 21b2880
fixed graphiql plugin not showing
twallnerWaretec bad4a3d
script clean up
twallnerWaretec f3f7d06
prod scripts
twallnerWaretec 15a4f54
fixed env var
twallnerWaretec 541139d
timeout increase
twallnerWaretec 6f9c4e8
increased shared memory size
twallnerWaretec bc234c6
lang code fix
twallnerWaretec 412fd43
fixed unlimited logging problem
twallnerWaretec c7b3746
fixed empty item bug in rss feed
twallnerWaretec 22fc845
arbeit showcase config updated
twallnerWaretec f69d980
fix: activitypub ingest
Frando db90e69
fixed tests
twallnerWaretec 49cb263
fixed lint errors
twallnerWaretec a7609b3
fixed lint
twallnerWaretec File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,114 @@ | ||
|
||
version: '3.1' | ||
|
||
services: | ||
|
||
db: | ||
image: postgres | ||
container_name: repco-db | ||
# restart: always | ||
volumes: | ||
- "./data/postgres:/var/lib/postgresql/data" | ||
- './data/postgres:/var/lib/postgresql/data' | ||
ports: | ||
- 5432:5432 | ||
command: | ||
['postgres', '-c', 'wal_level=logical', '-c', 'max_replication_slots=4'] | ||
environment: | ||
POSTGRES_PASSWORD: repco | ||
POSTGRES_USER: repco | ||
POSTGRES_DB: repco | ||
|
||
meilisearch: | ||
image: getmeili/meilisearch:v1.0 | ||
ports: | ||
ports: | ||
- 7700:7700 | ||
environment: | ||
- MEILI_MASTER_KEY=${MEILISEARCH_API_KEY} | ||
volumes: | ||
- ./data/meilisearch:/meili_data | ||
|
||
es01: | ||
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} | ||
container_name: repco-es | ||
labels: | ||
co.elastic.logs/module: elasticsearch | ||
volumes: | ||
- ./data/elastic/es01:/var/lib/elasticsearch/data | ||
ports: | ||
- ${ELASTIC_PORT}:9200 | ||
environment: | ||
- node.name=es01 | ||
- cluster.name=${ELASTIC_CLUSTER_NAME} | ||
- discovery.type=single-node | ||
- ELASTIC_PASSWORD=${ELASTIC_PASSWORD} | ||
- bootstrap.memory_lock=true | ||
- xpack.security.enabled=false | ||
- xpack.license.self_generated.type=${ELASTIC_LICENSE} | ||
- ES_JAVA_OPTS=-Xms750m -Xmx750m | ||
- http.host=0.0.0.0 | ||
- transport.host=127.0.0.1 | ||
#mem_limit: 1073741824 | ||
ulimits: | ||
memlock: | ||
soft: -1 | ||
hard: -1 | ||
healthcheck: | ||
test: | ||
[ | ||
'CMD-SHELL', | ||
"curl -s --user elastic:${ELASTIC_PASSWORD} -X GET http://localhost:9200/_cluster/health?pretty | grep status | grep -q '\\(green\\|yellow\\)'", | ||
] | ||
interval: 10s | ||
timeout: 10s | ||
retries: 120 | ||
|
||
redis: | ||
image: 'redis:alpine' | ||
container_name: repco-redis | ||
command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}'] | ||
volumes: | ||
- ./data/redis:/data | ||
ports: | ||
- '6379:6379' | ||
|
||
pgsync: | ||
build: | ||
context: ./pgsync | ||
container_name: repco-pgsync | ||
volumes: | ||
- ./data/pgsync:/data | ||
sysctls: | ||
- net.ipv4.tcp_keepalive_time=200 | ||
- net.ipv4.tcp_keepalive_intvl=200 | ||
- net.ipv4.tcp_keepalive_probes=5 | ||
labels: | ||
org.label-schema.name: 'pgsync' | ||
org.label-schema.description: 'Postgres to Elasticsearch sync' | ||
com.label-schema.service-type: 'daemon' | ||
depends_on: | ||
- db | ||
- es01 | ||
- redis | ||
environment: | ||
- PG_USER=repco | ||
- PG_HOST=db | ||
- PG_PORT=5432 | ||
- PG_PASSWORD=repco | ||
- PG_DATABASE=repco | ||
- LOG_LEVEL=DEBUG | ||
- ELASTICSEARCH_PORT=9200 | ||
- ELASTICSEARCH_SCHEME=http | ||
- ELASTICSEARCH_HOST=es01 | ||
- ELASTICSEARCH_CHUNK_SIZE=100 | ||
- ELASTICSEARCH_MAX_CHUNK_BYTES=3242880 | ||
- ELASTICSEARCH_MAX_RETRIES=14 | ||
- ELASTICSEARCH_QUEUE_SIZE=1 | ||
- ELASTICSEARCH_STREAMING_BULK=True | ||
- ELASTICSEARCH_THREAD_COUNT=1 | ||
- ELASTICSEARCH_TIMEOUT=320 | ||
- REDIS_HOST=redis | ||
- REDIS_PORT=6379 | ||
- REDIS_AUTH=${REDIS_PASSWORD} | ||
- REDIS_READ_CHUNK_SIZE=100 | ||
- ELASTICSEARCH=true | ||
- OPENSEARCH=false | ||
- SCHEMA=/data | ||
- CHECKPOINT_PATH=/data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,134 @@ | ||
|
||
version: '3.1' | ||
|
||
services: | ||
app: | ||
build: | ||
context: '..' | ||
dockerfile: './docker/Dockerfile' | ||
container_name: repco-app | ||
restart: unless-stopped | ||
ports: | ||
- 8766:8765 | ||
# links: | ||
# - 'es01:repco-es' | ||
environment: | ||
- DATABASE_URL=postgresql://repco:repco@db:5432/repco | ||
- REPCO_ADMIN_TOKEN=kUBY0zsPHC9ubj3T6DZJKUACi3M= | ||
- REPCO_URL=http://localhost:8765 | ||
- CBA_API_KEY=k8WHfNbal0rjIs2f | ||
- AP_BASE_URL=http://localhost:8765/ap | ||
depends_on: | ||
db: | ||
condition: service_healthy | ||
|
||
db: | ||
image: postgres | ||
# volumes: | ||
# - "/tmp/repco/postgres:/var/lib/postgresql/data" | ||
container_name: repco-db | ||
restart: unless-stopped | ||
volumes: | ||
- './data/postgres:/var/lib/postgresql/data' | ||
expose: | ||
- 5432 | ||
command: | ||
['postgres', '-c', 'wal_level=logical', '-c', 'max_replication_slots=4'] | ||
environment: | ||
POSTGRES_PASSWORD: repco | ||
POSTGRES_USER: repco | ||
POSTGRES_DB: repco | ||
healthcheck: | ||
test: ["CMD-SHELL", "pg_isready -U repco"] | ||
test: ['CMD-SHELL', 'pg_isready -U repco'] | ||
interval: 5s | ||
timeout: 5s | ||
retries: 5 | ||
|
||
es01: | ||
image: docker.elastic.co/elasticsearch/elasticsearch:8.10.4 | ||
container_name: repco-es | ||
restart: unless-stopped | ||
labels: | ||
co.elastic.logs/module: elasticsearch | ||
volumes: | ||
- ./data/elastic/es01:/var/lib/elasticsearch/data | ||
ports: | ||
- 9201:9200 | ||
environment: | ||
- node.name=es01 | ||
- cluster.name=repco-es | ||
- discovery.type=single-node | ||
- ELASTIC_PASSWORD=repco | ||
- bootstrap.memory_lock=true | ||
- xpack.security.enabled=false | ||
- xpack.license.self_generated.type=basic | ||
- ES_JAVA_OPTS=-Xms750m -Xmx4g | ||
- http.host=0.0.0.0 | ||
- transport.host=127.0.0.1 | ||
#mem_limit: 1073741824 | ||
ulimits: | ||
memlock: | ||
soft: -1 | ||
hard: -1 | ||
healthcheck: | ||
test: | ||
[ | ||
'CMD-SHELL', | ||
"curl -s --user elastic:repco -X GET http://localhost:9200/_cluster/health?pretty | grep status | grep -q '\\(green\\|yellow\\)'", | ||
] | ||
interval: 10s | ||
timeout: 10s | ||
retries: 120 | ||
|
||
redis: | ||
image: 'redis:alpine' | ||
container_name: repco-redis | ||
restart: unless-stopped | ||
command: ['redis-server', '--requirepass', 'repco'] | ||
volumes: | ||
- ./data/redis:/data | ||
ports: | ||
- '6379:6379' | ||
|
||
pgsync: | ||
build: | ||
context: ../pgsync | ||
container_name: repco-pgsync | ||
restart: unless-stopped | ||
volumes: | ||
- /var/www/repco.cba.media/repco/docker/data/pgsync:/data | ||
sysctls: | ||
- net.ipv4.tcp_keepalive_time=200 | ||
- net.ipv4.tcp_keepalive_intvl=200 | ||
- net.ipv4.tcp_keepalive_probes=5 | ||
labels: | ||
org.label-schema.name: 'pgsync' | ||
org.label-schema.description: 'Postgres to Elasticsearch sync' | ||
com.label-schema.service-type: 'daemon' | ||
depends_on: | ||
- db | ||
- es01 | ||
- redis | ||
environment: | ||
- PG_USER=repco | ||
- PG_HOST=db | ||
- PG_PORT=5432 | ||
- PG_PASSWORD=repco | ||
- PG_DATABASE=repco | ||
- LOG_LEVEL=DEBUG | ||
- CONSOLE_LOGGING_HANDLER_MIN_LEVEL=DEBUG | ||
- ELASTICSEARCH_PORT=9200 | ||
- ELASTICSEARCH_SCHEME=http | ||
- ELASTICSEARCH_HOST=es01 | ||
- ELASTICSEARCH_CHUNK_SIZE=2000 | ||
- ELASTICSEARCH_MAX_CHUNK_BYTES=104857600 | ||
- ELASTICSEARCH_MAX_RETRIES=14 | ||
- ELASTICSEARCH_QUEUE_SIZE=4 | ||
- ELASTICSEARCH_STREAMING_BULK=False | ||
- ELASTICSEARCH_THREAD_COUNT=4 | ||
- ELASTICSEARCH_TIMEOUT=10 | ||
- REDIS_HOST=redis | ||
- REDIS_PORT=6379 | ||
- REDIS_AUTH=repco | ||
- REDIS_READ_CHUNK_SIZE=1000 | ||
- ELASTICSEARCH=true | ||
- OPENSEARCH=false | ||
- SCHEMA=/data | ||
- CHECKPOINT_PATH=/data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
AP_BASE_URL
can be removed now that #101 is merged