Commit graph

138 commits

Author SHA1 Message Date
nutomic
80aef61aed Split code into cargo workspaces (#67)
More fixes

- fixed docker builds
- fixed mentions regex test
- fixed DATABASE_URL stuff
- change schema path in diesel.toml

Address review comments

- add jsonb column back into activity table
- remove authors field from cargo.toml
- adjust LEMMY_DATABASE_URL env var usage
- rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL

Decouple utils and db

Split code into cargo workspaces

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
2020-07-10 18:15:41 +00:00
Dessalines
284f00249a
Going back from jolt to dogbin iframely. jolt one had problems. (#900) 2020-07-03 18:19:24 +00:00
cd007febef Merge branch 'master' into federation 2020-07-01 09:04:26 -04:00
a074564458
Federation async (#848)
* Asyncify more

* I guess these changed

* Clean PR a bit

* Convert more away from failure error

* config changes for testing federation

* It was DNS

So actix-web's client relies on TRust DNS Resolver to figure out
where to send data, but TRust DNS Resolver seems to not play nice
with docker, which expressed itself as not resolving the name to
an IP address _the first time_ when making a request. The fix was
literally to make the request again (which I limited to 3 times
total, and not exceeding the request timeout in total)

* Only retry for connecterror

Since TRust DNS Resolver was causing ConnectError::Timeout,
this change limits the retry to only this error, returning
immediately for any other error

* Use http sig norm 0.4.0-alpha for actix-web 3.0 support

* Blocking function, retry http requests

* cargo +nightly fmt

* Only create one pictrs dir

* Don't yarn build

* cargo +nightly fmt
2020-07-01 08:54:29 -04:00
Dessalines
c0b11d4fa3
Replacing dogbin/iframely docker image with jolt one. (#869)
* Replacing dogbin/iframely docker image with jolt one.

* Replacing dogbin/iframely docker image with jolt one.
2020-06-30 11:11:36 +00:00
0112d0d955 Fixing test deploy, adding a rate limiter to ansible nginx config. 2020-06-28 13:44:42 -04:00
dc94e58cbf Merge branch 'master' into federation_merge_from_master_2 2020-06-23 21:11:38 -04:00
983a45e178 Merge branch 'master' into iav-arm-musl-dessalines 2020-06-22 14:57:55 -04:00
186e261fc0 Fixing docker-compose to rely on pictrs 2020-06-22 12:53:39 -04:00
cb128256ed Updating nginx.conf, upgrading pict-rs 2020-06-22 08:31:15 -04:00
bda657b638 Some reorg of Dockerfiles. 2020-06-14 16:36:18 -04:00
Igor Velkov
6f58be9493 dockerfile for x64 and arm building with musl 2020-06-14 01:28:50 +03:00
5594bed6a8 Merge branch 'master' into use-pictrs-1 2020-06-12 17:51:37 -04:00
f647f2ae6c Blocking pict-rs import location 2020-06-12 17:05:19 -04:00
7cb7c1f0f9 Adding lld to docker builds. #810 2020-06-12 16:17:01 -04:00
4ea6c4ad5d Various build optimizations 2020-06-12 21:45:23 +02:00
cddc23494d Upgrading pict-rs for working gifs. 2020-06-12 09:48:51 -04:00
4cf1f080bf Adding delete picture via pict-rs delete tokens. Fixes #505 2020-06-10 22:47:06 -04:00
bd26e4e9c1 Fixing some front end pictshare to pictrs conversions. 2020-06-09 17:17:24 -04:00
0f1a8ec928 Merge branch 'master' into federation 2020-06-09 14:01:26 +02:00
e583e45d9a Use pictrs instead of pictshare 2020-06-08 19:52:32 +02:00
1e88b815da Updating pictshare docker image. 2020-06-02 19:29:29 -04:00
5753c4feaa Let community announce posts 2020-05-28 13:15:51 +02:00
4e80543edb Update test_deploy.sh, supporting different branches 2020-04-21 19:19:10 +02:00
6d5518cbd4 Merge branch 'dev' into admin_settings 2020-04-14 10:54:04 -04:00
b9aef5891f Fixing test deploy. 2020-04-14 10:07:40 -04:00
bb287cbd07 Adding an admin settings page.
- Fixes #620
- Adding a UserListing component. Fixes #627
2020-04-10 16:55:57 -04:00
6e5729c660 Fixing deploy script. 2020-04-03 14:44:10 -04:00
dc14719b08 Updating rust, rust deps, yarn deps. Fixes #605 2020-03-18 22:30:16 -04:00
62ab68d317 Adding full logging. 2020-03-13 11:08:42 -04:00
nutomic
bf1db428f6 Move volumes into subfolder (ref #474) (#23)
Change ports and container names

Move volumes into subfolder (ref #474)

Merge pull request #587 from StaticallyTypedRice/patch-2

Clarify that content violating this code of conduct will likely be removed.
Clarify that content violating this code of conduct will likely be removed.

Lemmy has a general policy of removing any content that violates the rules whenever possible, which is typically a good thing, and I felt it important to mention that in the code of conduct.

Co-authored-by: Felix <me@nutomic.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
2020-03-09 16:50:28 +00:00
9c50d5f073 Fix weblate deploy. 2020-03-01 18:21:52 -05:00
565524a80b Adding git add to deploy. 2020-02-29 15:49:09 -05:00
ee7949a0fc update deploy script to pull translations from weblate 2020-02-29 20:25:35 +01:00
55f91ac5dc First pass at adding oembeds / iframely. 2020-02-17 11:18:01 -05:00
032ebe7a9e Integrate email relay in Ansible setup 2020-02-03 14:10:24 +01:00
Dessalines
f2f9502ab6 Merge pull request #498 from iav/docs4arm
Add doc compilation to multiplatform workflow
2020-02-02 20:06:42 -05:00
Igor Velkov
c6c95204f8 Add doc compilation to multiplatform workflow
Change rust builder version to current
2020-02-03 01:39:41 +02:00
025d6dcd80 Fixing ansible deploy. 2020-02-02 17:13:59 -05:00
cc6c173828 Formatting translation file, changing deploy script to const. 2020-01-26 16:38:08 -05:00
222374583b Adding to deploy. 2020-01-20 14:39:41 -05:00
5c5650d123 Fix aarch64 dockerfile. 2020-01-17 13:28:29 -05:00
a93ab4bcd1 Adding an env deploy. Fixes #410 2020-01-14 17:14:02 -05:00
f3dbedb5c5 Merge branch 'actix-2.0' into dev 2020-01-11 19:19:38 -05:00
bc804521e8 Upping rust-musl to 1.40.0 2020-01-11 19:07:44 -05:00
6f2f9995f2 Adding ssh docker commands to dev deploy. 2020-01-07 12:53:32 -05:00
dc331d5293 Fixing deploy and version for clippy. 2020-01-02 10:34:40 -05:00
3d4412a704 Merge branch 'mdbook' of https://yerbamate.dev/Nutomic/lemmy into Nutomic-mdbook 2020-01-01 16:42:38 -05:00
62ba018b19 Include docs in docker image 2020-01-01 18:14:09 +01:00
4faa46ac29 Only do arm build on major deploy. Fixes #393 2020-01-01 11:39:23 -05:00
786be3fa66 Config fixes.
- Adding front_end_dir to settings.
- Adding unit test for PasswordResetRequest encryption.
- Readme points to lemmy.hjson
- Fixing docker prod, dev, and ansible builds.
- Removing redundant env files, as all config is now in a single file.
- Some formatting fixes.
2019-12-28 16:11:03 -05:00
b7c24a372b Fix review comments 2019-12-27 17:30:46 +01:00
1f7546789a update documentation, docker and ansible files 2019-12-27 17:28:46 +01:00
ab53840324 Upping rate limit for register and community creation to 3/hour.
- Fixes #353
2019-12-06 20:57:48 -08:00
e5f17f7bc7 Removing git checkout master from dev deploy. 2019-12-01 22:24:43 -08:00
52ea7a32db Some RSS work.
- Display rss buttons on front end for user, /c/all, and community
pages. Fixes #348.
- Some clean up and additions to RSS feeds.
2019-12-01 17:23:52 -08:00
942f6a05af basic, working rss feeds 2019-11-23 23:24:50 +01:00
de313fc977 Implement RSS feeds (fixes #118) 2019-11-23 23:24:10 +01:00
0651ae5ec0 Increasing post creation rate limit default. 2019-11-22 16:26:08 -08:00
b29f578e31 Fixing deploy script. 2019-11-22 16:17:20 -08:00
08f3342bc7 Adding vaporwave dark theme.
- Fixes #345
2019-11-21 17:45:21 -08:00
2bab0370fa Adding restart=always to other docker services. 2019-11-21 11:29:59 -08:00
7b5884b664 change version numbering command 2019-11-16 01:32:21 +01:00
4f116dc758 got it working 2019-11-16 01:31:41 +01:00
iav
f8252521a7 Add platform-agnostic dockerfile (#327) 2019-11-02 18:05:55 -07:00
222cd8325f Changing back to shtripok pictshare. 2019-11-01 23:45:43 -07:00
edbb5612a2 Merge branch 'master' into email 2019-11-01 23:43:35 -07:00
68e4b61808 Password reset mostly working. 2019-11-01 23:41:57 -07:00
9e21902a5f Changing aarch64 to use cargo --release 2019-11-01 11:19:59 -07:00
a47b9c3ab8 Changing back pictshare. 2019-10-31 21:06:13 -07:00
845f17f7af Changing pictshare to use multi-arch from @iav
- Fixes #324
2019-10-31 20:07:26 -07:00
e4666cd95c Fixing rest of deploy. 2019-10-31 20:03:43 -07:00
Igor Velkov
6ad39f1853 add cross-building for arm 2019-10-25 02:59:08 +00:00
7ea4eca599 Only bind to local ports in docker-compose.yml 2019-10-16 11:01:47 +02:00
0e55ef7d9e Adding tag to deploy. 2019-10-15 16:50:00 -07:00
35dfe31a39 Externalizing rate limits. Upgrading to Rust 1.38
- Fixes #290
2019-10-13 12:06:18 -07:00
d21e020f18 Adding restart always to docker. 2019-09-19 18:01:43 -07:00
a279cfad95 Removing unecessary script. 2019-09-08 09:21:52 -07:00
c39ae06bd4 Allow Image uploads through docker pictshare.
- Fixes #210
2019-09-07 20:42:01 -07:00
05fa6837c4 Adding become to ansible from command line instead. 2019-09-04 12:54:23 -07:00
951a3d0616 Some fixes for ansible.
- Also updating the nginx template
- Updating deploy.sh
2019-09-02 10:37:30 -07:00
de8c2198af Removing latest from dockerfile. 2019-08-28 19:26:42 -07:00
171d9472ca Adding a deploy script. 2019-08-25 10:59:12 -07:00
d5606d7726 Upping version. 2019-08-25 10:57:05 -07:00
512cde82ef Some README updates. 2019-08-21 21:09:46 -07:00
bdb1c72153 Updating docker-compose to version 3
- Removing health checks.
- #227
2019-08-21 15:29:35 -07:00
431210025d Some fixes for the docker build.
- Messed with readme.
- They needed to be `.env`, not `env`.
- Leaving the nginx file there, but extracting it out of the main setup. Ppl might use apache, or none at all.
- Docker 3.3 doesn't work with the DB health check unfortunately, so I changed that back to 2.4.
- Changed the env in the docker folder so it doesn't need to be edited, someone could just pull this and start it up if they just wanna test it.
2019-08-20 16:20:46 -07:00
b3e363828c Reorganizing docker compose files.
- Fixes #197
2019-08-15 18:05:49 -07:00