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
ba4db71e
Commit
ba4db71e
authored
8 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Ensure correct prosody binaries after upgrade
parent
2475813a
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-xmpp
+12
-6
12 additions, 6 deletions
src/freedombone-app-xmpp
with
12 additions
and
6 deletions
src/freedombone-app-xmpp
+
12
−
6
View file @
ba4db71e
...
...
@@ -40,6 +40,11 @@ XMPP_PASSWORD=
XMPP_CIPHERS
=
'"EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA"'
XMPP_ECC_CURVE
=
'"secp384r1"'
prosody_latest_version
=
'0.10'
prosody_nightly
=
319
prosody_nightly_hash
=
'f1fdc8ce5b6f8bfa451d458616a0bbe5ed7c15881415e561586bab39bd705fa4'
prosody_filename
=
prosody-
${
prosody_latest_version
}
-1nightly
${
prosody_nightly
}
xmpp_variables
=(
ONION_ONLY
INSTALLED_WITHIN_DOCKER
XMPP_CIPHERS
...
...
@@ -142,6 +147,13 @@ function update_prosody_modules {
function
upgrade_xmpp
{
function_check update_prosody_modules
update_prosody_modules
if
[
-d
${
INSTALL_DIR
}
/
${
prosody_filename
}
]
;
then
# ensure that the binaries have not been overwritten
# by an operating system upgrade
cd
${
INSTALL_DIR
}
/
${
prosody_filename
}
make
prefix
=
/usr
install
fi
}
function
backup_local_xmpp
{
...
...
@@ -407,16 +419,10 @@ function xmpp_create_config {
}
function
install_xmpp_nightly
{
prosody_latest_version
=
'0.10'
prosody_nightly
=
319
prosody_nightly_hash
=
'f1fdc8ce5b6f8bfa451d458616a0bbe5ed7c15881415e561586bab39bd705fa4'
if
[
!
-d
$INSTALL_DIR
]
;
then
mkdir
-p
$INSTALL_DIR
fi
prosody_filename
=
prosody-
${
prosody_latest_version
}
-1nightly
${
prosody_nightly
}
cd
$INSTALL_DIR
wget https://prosody.im/nightly/
${
prosody_latest_version
}
/latest/
${
prosody_filename
}
.tar.gz
if
[
!
-f
${
prosody_filename
}
.tar.gz
]
;
then
...
...
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