Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
0de09f2b
Commit
0de09f2b
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Don't set smtp proxy in muttrc
parent
3bf40649
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/freedombone-base-email
+1
-4
1 addition, 4 deletions
src/freedombone-base-email
src/freedombone-controlpanel
+0
-9
0 additions, 9 deletions
src/freedombone-controlpanel
with
1 addition
and
13 deletions
src/freedombone-base-email
+
1
−
4
View file @
0de09f2b
...
...
@@ -642,10 +642,7 @@ function email_client {
echo
'set alias_file=~/.mutt-alias'
;
echo
'source ~/.mutt-alias'
;
echo
'set query_command= "abook --mutt-query \"%s\""'
;
echo
'macro index,pager A "<pipe-message>abook --add-email-quiet<return>" "add the sender address to abook"'
;
echo
''
;
echo
'# Optional relay of SMTP via ISP'
;
echo
'#set smtp_url="smtps://username:password@isp_mail_domain:465/"'
;
}
>
/etc/Muttrc
echo
'macro index,pager A "<pipe-message>abook --add-email-quiet<return>" "add the sender address to abook"'
;
}
>
/etc/Muttrc
if
[[
"
$ONION_ONLY
"
!=
'no'
]]
;
then
# On onion only systems email is onion router anyway, with its
...
...
This diff is collapsed.
Click to expand it.
src/freedombone-controlpanel
+
0
−
9
View file @
0de09f2b
...
...
@@ -1575,15 +1575,6 @@ function email_smtp_proxy {
rm
-f
"
$data
"
email_smtp_proxy_through_isp
"
$isp_smtp_domain
"
"
$isp_smtp_port
"
"
$isp_smtp_username
"
"
$isp_smtp_password
"
# change muttrc
if
[
-f
$MUTTRC_FILE
]
;
then
if
grep
-q
"set smtp_url"
"
$MUTTRC_FILE
"
;
then
if
!
grep
-q
"#set smtp_url"
"
$MUTTRC_FILE
"
;
then
sed
-i
's|set smtp_url|#set smtp_url|g'
"
$MUTTRC_FILE
"
fi
fi
fi
}
function
menu_backup_restore
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment