diff --git a/.env b/.env index 88cfb53..e9c0632 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -DATABASE_URL="postgres://postgres:password@localhost:5432/newsletter" +DATABASE_URL="postgres://postgres:Jq09NF6Y8ZXJS4jd9c8U@localhost:5432/newsletter" diff --git a/configuration/local.yaml b/configuration/local.yaml index ebaacc7..77730bb 100644 --- a/configuration/local.yaml +++ b/configuration/local.yaml @@ -7,7 +7,7 @@ database: port: 5432 database_name: "newsletter" username: "postgres" - password: "password" + password: "Jq09NF6Y8ZXJS4jd9c8U" require_ssl: false email_client: authorization_token: "secret-token" diff --git a/scripts/init_db.sh b/scripts/init_db.sh index ea5e3a2..cde266f 100755 --- a/scripts/init_db.sh +++ b/scripts/init_db.sh @@ -14,7 +14,7 @@ if ! [ -x "$(command -v sqlx)" ]; then fi DB_USER="${POSTGRES_USER:=postgres}" -DB_PASSWORD="${POSTGRES_PASSWORD:=password}" +DB_PASSWORD="${POSTGRES_PASSWORD:=Jq09NF6Y8ZXJS4jd9c8U}" DB_NAME="${POSTGRES_DB:=newsletter}" DB_PORT="${POSTGRES_PORT:=5432}" DB_HOST="${POSTGRES_HOST:=localhost}" @@ -24,7 +24,7 @@ if [[ -z "${SKIP_DOCKER}" ]]; then -e POSTGRES_USER=${DB_USER} \ -e POSTGRES_PASSWORD=${DB_PASSWORD} \ -e POSTGRES_DB=${DB_NAME} \ - -p "${DB_PORT}":5432 \ + -p "127.0.0.1:${DB_PORT}":5432 \ -d postgres \ postgres -N 1000 fi diff --git a/scripts/init_redis.sh b/scripts/init_redis.sh index 80afcda..f235de2 100755 --- a/scripts/init_redis.sh +++ b/scripts/init_redis.sh @@ -10,7 +10,7 @@ if [[ -n $RUNNING_CONTAINER ]]; then fi docker run \ - -p "6379:6379" \ + -p "127.0.0.1:6379:6379" \ -d \ --name "redis_$(date '+%s')" \ redis diff --git a/src/routes/admin/newsletters.rs b/src/routes/admin/newsletters.rs index 898361c..2eb852b 100644 --- a/src/routes/admin/newsletters.rs +++ b/src/routes/admin/newsletters.rs @@ -142,28 +142,3 @@ fn validate_form(form: &BodyData) -> Result<(), &'static str> { } Ok(()) } - -// struct ConfirmedSubscriber { -// name: String, -// email: SubscriberEmail, -// } - -// #[tracing::instrument(name = "Get confirmed subscribers", skip(connection_pool))] -// async fn get_confirmed_subscribers( -// connection_pool: &PgPool, -// ) -> Result>, anyhow::Error> { -// let rows = sqlx::query!("SELECT name, email FROM subscriptions WHERE status = 'confirmed'") -// .fetch_all(connection_pool) -// .await?; -// let confirmed_subscribers = rows -// .into_iter() -// .map(|r| match SubscriberEmail::parse(r.email) { -// Ok(email) => Ok(ConfirmedSubscriber { -// name: r.name, -// email, -// }), -// Err(e) => Err(anyhow::anyhow!(e)), -// }) -// .collect(); -// Ok(confirmed_subscribers) -// } diff --git a/src/startup.rs b/src/startup.rs index d8d99b2..bd208df 100644 --- a/src/startup.rs +++ b/src/startup.rs @@ -40,7 +40,6 @@ impl Application { "{}:{}", configuration.application.host, configuration.application.port ); - // let listener = TcpListener::bind(address).await?; let connection_pool = PgPoolOptions::new().connect_lazy_with(configuration.database.with_db()); let email_client = EmailClient::build(configuration.email_client).unwrap();