Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Arthur Brugière
funkwhale
Commits
6e506ce6
Commit
6e506ce6
authored
5 years ago
by
Johannes H
Committed by
Eliot Berriot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Improvement of Apache config consistency and ease of configuration
parent
02265339
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
deploy/apache.conf
+10
-8
10 additions, 8 deletions
deploy/apache.conf
with
10 additions
and
8 deletions
deploy/apache.conf
+
10
−
8
View file @
6e506ce6
...
...
@@ -5,7 +5,9 @@ Define funkwhale-sn funkwhale.yourdomain.com
# use different configuration than what is described in our installation guide.
Define
funkwhale
-
api
http
://
localhost
:
5000
Define
funkwhale
-
api
-
ws
ws
://
localhost
:
5000
Define
MUSIC_DIRECTORY_PATH
/
srv
/
funkwhale
/
data
/
music
Define
FUNKWHALE_ROOT_PATH
/
srv
/
funkwhale
Define
MUSIC_DIRECTORY_PATH
${
FUNKWHALE_ROOT_PATH
}/
data
/
music
Define
MEDIA_DIRECTORY_PATH
${
FUNKWHALE_ROOT_PATH
}/
data
/
media
# HTTP requests redirected to HTTPS
<
VirtualHost
*:
80
>
...
...
@@ -90,17 +92,17 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
<
Location
"/front"
>
ProxyPass
"!"
</
Location
>
Alias
/
front
/
srv
/
funkwhale
/
front
/
dist
Alias
/
front
${
FUNKWHALE_ROOT_PATH
}
/
front
/
dist
<
Location
"/media"
>
ProxyPass
"!"
</
Location
>
Alias
/
media
/
srv
/
funkwhale
/
data
/
media
Alias
/
media
${
MEDIA_DIRECTORY_PATH
}
<
Location
"/staticfiles"
>
ProxyPass
"!"
</
Location
>
Alias
/
staticfiles
/
srv
/
funkwhale
/
data
/
static
Alias
/
staticfiles
${
FUNKWHALE_ROOT_PATH
}
/
data
/
static
# Activating WebSockets
<
Location
"/api/v1/activity"
>
...
...
@@ -108,19 +110,19 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
</
Location
>
# Setting appropriate access levels to serve frontend
<
Directory
"
/srv/funkwhale
/data/static"
>
<
Directory
"
${FUNKWHALE_ROOT_PATH}
/data/static"
>
Options
FollowSymLinks
AllowOverride
None
Require
all
granted
</
Directory
>
<
Directory
/
srv
/
funkwhale
/
front
/
dist
>
<
Directory
"${FUNKWHALE_ROOT_PATH}
/front/dist
"
>
Options
FollowSymLinks
AllowOverride
None
Require
all
granted
</
Directory
>
<
Directory
/
srv
/
funkwhale
/
data
/
media
>
<
Directory
"${MEDIA_DIRECTORY_PATH}"
>
Options
FollowSymLinks
AllowOverride
None
Require
all
granted
...
...
@@ -133,7 +135,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
#LoadModule xsendfile_module modules/mod_xsendfile.so
<
IfModule
mod_xsendfile
.
c
>
XSendFile
On
XSendFilePath
/
srv
/
funkwhale
/
data
/
media
XSendFilePath
${
MEDIA_DIRECTORY_PATH
}
XSendFilePath
${
MUSIC_DIRECTORY_PATH
}
SetEnv
MOD_X_SENDFILE_ENABLED
1
</
IfModule
>
...
...
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