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
9eca2e1e
Commit
9eca2e1e
authored
8 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Fix mediagoblin verification emails
parent
6593eaf8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/freedombone-app-mediagoblin
+22
-1
22 additions, 1 deletion
src/freedombone-app-mediagoblin
with
22 additions
and
1 deletion
src/freedombone-app-mediagoblin
+
22
−
1
View file @
9eca2e1e
...
...
@@ -48,6 +48,21 @@ mediagoblin_variables=(ONION_ONLY
DEFAULT_DOMAIN_NAME
DDNS_PROVIDER
)
function
mediagoblin_fix_email
{
# This is a crude hack and there may be a better solution
# The cause of verification problems might be that the mediagoblin user
# does not have mail access
read_config_param
'MEDIAGOBLIN_DOMAIN_NAME'
MEDIAGOBLIN_BASE_DIR
=
/var/www/
$MEDIAGOBLIN_DOMAIN_NAME
/htdocs
mgfile
=
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/tools/mail.py
if
!
grep
'import os'
$mgfile
;
then
sed
-i
'/import sys/a import os'
$mgfile
fi
replacestr
=
'return mhost.sendmail(from_addr, to_addrs, message.as_string())'
newstr
=
"return os.system(
\"
echo '
\"
+ message_body +
\"
' | mail -s '
\"
+ message['Subject'] +
\"
'
\"
+ message['To'])"
sed
-i
"s|
${
replacestr
}
|
${
newstr
}
|g"
$mgfile
}
function
install_interactive_mediagoblin
{
if
[[
$ONION_ONLY
!=
"no"
]]
;
then
MEDIAGOBLIN_DOMAIN_NAME
=
'mediagoblin.local'
...
...
@@ -113,6 +128,7 @@ function reconfigure_mediagoblin {
function
upgrade_mediagoblin
{
MEDIAGOBLIN_BASE_DIR
=
/var/www/
$MEDIAGOBLIN_DOMAIN_NAME
/htdocs
su
-c
"cd
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/ && ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate"
- mediagoblin
mediagoblin_fix_email
echo
"0"
}
...
...
@@ -411,6 +427,9 @@ function install_mediagoblin {
sed
-i
"s|email_sender_address.*|email_sender_address =
\"
noreply@
${
DEFAULT_DOMAIN_NAME
}
\"
|g"
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin.ini
sed
-i
"s|email_sender_address.*|email_sender_address =
\"
noreply@
${
DEFAULT_DOMAIN_NAME
}
\"
|g"
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin_local.ini
sed
-i
's|allow_reporting.*|allow_reporting = false|g'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin.ini
sed
-i
's|allow_reporting.*|allow_reporting = false|g'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin_local.ini
if
!
grep
'email_smtp_host'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin.ini
;
then
sed
-i
'/email_sender_address/a email_smtp_host = localhost'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin.ini
else
...
...
@@ -418,7 +437,7 @@ function install_mediagoblin {
fi
if
!
grep
'email_smtp_host'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin_local.ini
;
then
sed
-i
'/email_sender_address/a email_smtp_host = localhost'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin
_local
.ini
sed
-i
'/email_sender_address/a email_smtp_host = localhost'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin.ini
else
sed
-i
's|email_smtp_host.*|email_smtp_host = localhost|g'
$MEDIAGOBLIN_BASE_DIR
/mediagoblin/mediagoblin_local.ini
fi
...
...
@@ -427,6 +446,8 @@ function install_mediagoblin {
systemctl daemon-reload
systemctl start mediagoblin
mediagoblin_fix_email
function_check create_site_certificate
create_site_certificate
$MEDIAGOBLIN_DOMAIN_NAME
...
...
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