diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | docker/federation/Dockerfile (renamed from docker/federation-test/Dockerfile) | 0 | ||||
| -rw-r--r-- | docker/federation/docker-compose.yml (renamed from docker/federation-test/docker-compose.yml) | 4 | ||||
| -rw-r--r-- | docker/federation/nginx.conf (renamed from docker/federation-test/nginx.conf) | 0 | ||||
| -rwxr-xr-x | docker/federation/run-federation-test.bash (renamed from docker/federation-test/run-federation-test.bash) | 2 | ||||
| -rw-r--r-- | server/src/apub/community.rs | 2 | ||||
| -rw-r--r-- | server/src/apub/fetcher.rs (renamed from server/src/apub/puller.rs) | 0 | ||||
| -rw-r--r-- | server/src/apub/mod.rs | 2 | ||||
| -rw-r--r-- | server/src/apub/post.rs | 2 | ||||
| -rw-r--r-- | server/src/main.rs | 2 |
10 files changed, 8 insertions, 8 deletions
@@ -6,7 +6,7 @@ ansible/passwords/ # docker build files docker/lemmy_mine.hjson docker/dev/env_deploy.sh -docker/federation-test/volumes +docker/federation/volumes docker/dev/volumes # local build files diff --git a/docker/federation-test/Dockerfile b/docker/federation/Dockerfile index d8302ea7..d8302ea7 100644 --- a/docker/federation-test/Dockerfile +++ b/docker/federation/Dockerfile diff --git a/docker/federation-test/docker-compose.yml b/docker/federation/docker-compose.yml index 91f167c4..f251a4f9 100644 --- a/docker/federation-test/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -17,7 +17,7 @@ services: restart: "always" lemmy_alpha: - image: lemmy-federation-test:latest + image: lemmy-federation:latest environment: - LEMMY_HOSTNAME=lemmy_alpha:8540 - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy @@ -47,7 +47,7 @@ services: restart: always lemmy_beta: - image: lemmy-federation-test:latest + image: lemmy-federation:latest environment: - LEMMY_HOSTNAME=lemmy_beta:8550 - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy diff --git a/docker/federation-test/nginx.conf b/docker/federation/nginx.conf index 6dbe13b4..6dbe13b4 100644 --- a/docker/federation-test/nginx.conf +++ b/docker/federation/nginx.conf diff --git a/docker/federation-test/run-federation-test.bash b/docker/federation/run-federation-test.bash index b9f150a0..7cf26206 100755 --- a/docker/federation-test/run-federation-test.bash +++ b/docker/federation/run-federation-test.bash @@ -9,6 +9,6 @@ pushd ../../server/ || exit cargo build popd || exit -sudo docker build ../../ -f Dockerfile -t lemmy-federation-test:latest +sudo docker build ../../ -f Dockerfile -t lemmy-federation:latest sudo docker-compose up
\ No newline at end of file diff --git a/server/src/apub/community.rs b/server/src/apub/community.rs index 444ee440..59c9329b 100644 --- a/server/src/apub/community.rs +++ b/server/src/apub/community.rs @@ -1,4 +1,4 @@ -use crate::apub::puller::{fetch_remote_object, fetch_remote_user}; +use crate::apub::fetcher::{fetch_remote_object, fetch_remote_user}; use crate::apub::*; use crate::db::community::{Community, CommunityForm}; use crate::db::community_view::CommunityFollowerView; diff --git a/server/src/apub/puller.rs b/server/src/apub/fetcher.rs index 3e9b6a9d..3e9b6a9d 100644 --- a/server/src/apub/puller.rs +++ b/server/src/apub/fetcher.rs diff --git a/server/src/apub/mod.rs b/server/src/apub/mod.rs index eb3097c7..37183507 100644 --- a/server/src/apub/mod.rs +++ b/server/src/apub/mod.rs @@ -1,8 +1,8 @@ pub mod activities; pub mod community; +pub mod fetcher; pub mod inbox; pub mod post; -pub mod puller; pub mod user; use crate::Settings; use openssl::{pkey::PKey, rsa::Rsa}; diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs index 8458e8c9..48c8b2db 100644 --- a/server/src/apub/post.rs +++ b/server/src/apub/post.rs @@ -1,4 +1,4 @@ -use crate::apub::puller::{fetch_remote_community, fetch_remote_user}; +use crate::apub::fetcher::{fetch_remote_community, fetch_remote_user}; use crate::apub::{create_apub_response, make_apub_endpoint, EndpointType}; use crate::convert_datetime; use crate::db::community::Community; diff --git a/server/src/main.rs b/server/src/main.rs index c1bec7e0..9f78d43e 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -7,7 +7,7 @@ use actix_web::*; use diesel::r2d2::{ConnectionManager, Pool}; use diesel::PgConnection; use failure::Error; -use lemmy_server::apub::puller::fetch_all; +use lemmy_server::apub::fetcher::fetch_all; use lemmy_server::db::code_migrations::run_advanced_migrations; use lemmy_server::routes::{api, federation, feeds, index, nodeinfo, webfinger, websocket}; use lemmy_server::settings::Settings; |