Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • POD POD
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 57
    • Issues 57
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 10
    • Merge requests 10
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • MemriMemri
  • PODPOD
  • Merge requests
  • !414

added sender address as env variable

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Szymon Zimnowoda requested to merge sz/extend_smtp_conf into dev 2 years ago
  • Overview 0
  • Commits 1
  • Pipelines 1
  • Changes 3
Compare
  • dev (base)

and
  • latest version
    7fc33b9f
    1 commit, 2 years ago

3 files
+ 9
- 2

    Preferences

    File browser
    Compare changes
libpo‎d/src‎
command_line‎_interface.rs‎ +5 -0
emai‎l.rs‎ +3 -2
test_he‎lpers.rs‎ +1 -0
libpod/src/command_line_interface.rs
+ 5
- 0
  • View file @ 7fc33b9f

  • Edit in single-file editor

  • Open in Web IDE


@@ -165,6 +165,10 @@ pub struct CliOptions {
#[arg(long, default_value = "465", env)]
pub email_smtp_port: u16,
/// SMTP relay server email sender address.
#[arg(long, env)]
pub email_smtp_sender_address: Option<String>,
/// SMTP relay server user (advanced option).
#[arg(long, env)]
pub email_smtp_user: Option<String>,
@@ -258,6 +262,7 @@ pub mod tests {
email_smtp_port: 465,
email_smtp_user: None,
email_smtp_password: None,
email_smtp_sender_address: None,
owner_key_for_pod: Default::default(),
db_key_for_pod: Secret::new(String::default()),
shared_plugins: Vec::new(),
libpod/src/email.rs
+ 3
- 2
  • View file @ 7fc33b9f

  • Edit in single-file editor

  • Open in Web IDE


@@ -14,10 +14,11 @@ pub async fn send_email(email: SendEmail, cli: &CliOptions) -> Result<()> {
&cli.email_smtp_relay,
&cli.email_smtp_user,
&cli.email_smtp_password,
&cli.email_smtp_sender_address,
) {
(Some(relay), Some(user), Some(password)) => {
(Some(relay), Some(user), Some(password), Some(sender_address)) => {
let email = Message::builder()
.from(format!("Memri <{user}>").parse()?)
.from(format!("Memri <{sender_address}>").parse()?)
.to(email.to.parse()?)
.subject(email.subject.to_string())
.body(format!("{}\n{}", email.body, PLUGIN_EMAIL_FOOTER))?;
libpod/src/test_helpers.rs
+ 1
- 0
  • View file @ 7fc33b9f

  • Edit in single-file editor

  • Open in Web IDE


@@ -46,6 +46,7 @@ pub fn default_cli() -> CliOptions {
email_smtp_port: 465,
email_smtp_user: None,
email_smtp_password: None,
email_smtp_sender_address: None,
owner_key_for_pod: Default::default(),
db_key_for_pod: Secret::new(String::default()),
shared_plugins: Vec::new(),
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
1
1 participant
Szymon Zimnowoda
Reference: memri/pod!414
Source branch: sz/extend_smtp_conf

Menu

Explore Projects Groups Snippets