mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-23 01:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Rename federation-test to federation, puller.rs to fetcher.rs

Browse source
This commit is contained in:
Felix 2020-04-10 13:37:35 +02:00
parent 492625f6d6
commit 509005fa0c
10 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -6,7 +6,7 @@ ansible/passwords/
# docker build files # docker build files
docker/lemmy_mine.hjson docker/lemmy_mine.hjson
docker/dev/env_deploy.sh docker/dev/env_deploy.sh
docker/federation-test/volumes docker/federation/volumes
docker/dev/volumes docker/dev/volumes
# local build files # local build files

0
docker/federation-test/Dockerfile → docker/federation/Dockerfile vendored
View file

4
docker/federation-test/docker-compose.yml → docker/federation/docker-compose.yml vendored
View file

@ -17,7 +17,7 @@ services:
restart: "always" restart: "always"
lemmy_alpha: lemmy_alpha:
image: lemmy-federation-test:latest image: lemmy-federation:latest
environment: environment:
- LEMMY_HOSTNAME=lemmy_alpha:8540 - LEMMY_HOSTNAME=lemmy_alpha:8540
- LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
@ -47,7 +47,7 @@ services:
restart: always restart: always
lemmy_beta: lemmy_beta:
image: lemmy-federation-test:latest image: lemmy-federation:latest
environment: environment:
- LEMMY_HOSTNAME=lemmy_beta:8550 - LEMMY_HOSTNAME=lemmy_beta:8550
- LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy

0
docker/federation-test/nginx.conf → docker/federation/nginx.conf vendored
View file

2
docker/federation-test/run-federation-test.bash → docker/federation/run-federation-test.bash vendored
View file

@ -9,6 +9,6 @@ pushd ../../server/ || exit
cargo build cargo build
popd || exit 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 sudo docker-compose up

2
server/src/apub/community.rs
View file

@ -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::apub::*;
use crate::db::community::{Community, CommunityForm}; use crate::db::community::{Community, CommunityForm};
use crate::db::community_view::CommunityFollowerView; use crate::db::community_view::CommunityFollowerView;

0
server/src/apub/puller.rs → server/src/apub/fetcher.rs
View file

2
server/src/apub/mod.rs
View file

@ -1,8 +1,8 @@
pub mod activities; pub mod activities;
pub mod community; pub mod community;
pub mod fetcher;
pub mod inbox; pub mod inbox;
pub mod post; pub mod post;
pub mod puller;
pub mod user; pub mod user;
use crate::Settings; use crate::Settings;
use openssl::{pkey::PKey, rsa::Rsa}; use openssl::{pkey::PKey, rsa::Rsa};

2
server/src/apub/post.rs
View file

@ -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::apub::{create_apub_response, make_apub_endpoint, EndpointType};
use crate::convert_datetime; use crate::convert_datetime;
use crate::db::community::Community; use crate::db::community::Community;

2
server/src/main.rs
View file

@ -7,7 +7,7 @@ use actix_web::*;
use diesel::r2d2::{ConnectionManager, Pool}; use diesel::r2d2::{ConnectionManager, Pool};
use diesel::PgConnection; use diesel::PgConnection;
use failure::Error; 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::db::code_migrations::run_advanced_migrations;
use lemmy_server::routes::{api, federation, feeds, index, nodeinfo, webfinger, websocket}; use lemmy_server::routes::{api, federation, feeds, index, nodeinfo, webfinger, websocket};
use lemmy_server::settings::Settings; use lemmy_server::settings::Settings;