Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
ansible
Manage
Activity
Members
Labels
Plan
Issues
13
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
funkwhale
ansible
Commits
653ce996
Commit
653ce996
authored
1 year ago
by
Georg Krause
Committed by
Georg Krause
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
feat: Replace manage.py with funkwhale-manage entrypoint
parent
e383e5d1
Branches
test-develop
No related tags found
1 merge request
!42
ci: Run tests for latest develop
Pipeline
#34088
passed with stage
in 16 minutes and 53 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+3
-1
3 additions, 1 deletion
.gitlab-ci.yml
README.md
+1
-1
1 addition, 1 deletion
README.md
install.sh
+7
-6
7 additions, 6 deletions
install.sh
tasks/funkwhale.yml
+2
-2
2 additions, 2 deletions
tasks/funkwhale.yml
with
13 additions
and
10 deletions
.gitlab-ci.yml
+
3
−
1
View file @
653ce996
...
...
@@ -28,6 +28,8 @@ test-install-script:
matrix
:
-
TEST_IMAGE
:
[
"
ubuntu:focal"
,
"
ubuntu:jammy"
,
"
debian:11"
,
"
debian:12"
]
interruptible
:
true
variables
:
FUNKWHALE_CLI_USER_PASSWORD
:
supersecurepassword
before_script
:
-
apt-get update && apt-get install -y curl
-
|
...
...
@@ -43,7 +45,7 @@ test-install-script:
-
|
set -x
export ANSIBLE_FUNKWHALE_ROLE_PATH=$(pwd)
printf 'test.deployment\ntest\ncontact@test.deployment\nY\nN\n\n\n\N\n\n\n' | bash install.sh
printf 'test.deployment\ntest
1234
\ncontact@test.deployment\nY\nN\n\n\n\N\n\n\n' | bash install.sh
tags
:
-
docker
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
653ce996
...
...
@@ -95,7 +95,7 @@ _On some hosts, you may need to install the `python-apt` package for check mode
This command will show you the changes that would be applied to your system. If you are comfortable with them,
rerun the same command without the
`--check`
flag.
Once installation is complete, run
`/srv/funkwhale/virtualenv/bin/
python /srv/
funkwhale
/api/
manage
.py
createsuperuser`
to create your admin account.
Once installation is complete, run
`/srv/funkwhale/virtualenv/bin/funkwhale
-
manage createsuperuser`
to create your admin account.
## Role Variables
...
...
This diff is collapsed.
Click to expand it.
install.sh
+
7
−
6
View file @
653ce996
...
...
@@ -334,19 +334,20 @@ configure_server() {
cat
<<
EOF
>
$base_path
/manage
#!/bin/sh
set -eu
sudo -u funkwhale -E
$base_path
/virtualenv/bin/
python
$base_path
/api/
manage
.py
\$
@
sudo -u funkwhale -E
$base_path
/virtualenv/bin/
funkwhale-
manage
\$
@
EOF
chmod
+x
$base_path
/manage
if
[
-z
"
$funkwhale_admin_username
"
]
;
then
echo
"[4/
$total_steps
] Skipping superuser account creation"
else
echo
"[4/
$total_steps
] Creating superuser account…"
echo
" Please input the password for the admin account password"
LOGLEVEL
=
error
sudo
-u
funkwhale
-E
$base_path
/virtualenv/bin/python
\
$base_path
/api/manage.py createsuperuser
\
if
[
-z
"
$FUNKWHALE_CLI_USER_PASSWORD
"
]
;
then
echo
" Please input the password for the admin account password"
fi
LOGLEVEL
=
error
sudo
-u
funkwhale
-E
\
$base_path
/virtualenv/bin/funkwhale-manage fw
users
create
--superuser
\
--email
$funkwhale_admin_email
\
--username
$funkwhale_admin_username
\
-v
0
--username
$funkwhale_admin_username
fi
}
...
...
This diff is collapsed.
Click to expand it.
tasks/funkwhale.yml
+
2
−
2
View file @
653ce996
...
...
@@ -279,7 +279,7 @@
block
:
"
{{
funkwhale_custom_settings
}}"
-
name
:
"
Collect
static
files"
command
:
"
{{
funkwhale_install_path
}}/virtualenv/bin/
python
api/
manage
.py
collectstatic
--no-input"
command
:
"
{{
funkwhale_install_path
}}/virtualenv/bin/
funkwhale-
manage
collectstatic
--no-input"
become
:
true
become_user
:
"
{{
funkwhale_username
}}"
args
:
...
...
@@ -288,6 +288,6 @@
-
name
:
"
Apply
database
migrations"
become
:
true
become_user
:
"
{{
funkwhale_username
}}"
command
:
"
{{
funkwhale_install_path
}}/virtualenv/bin/
python
api/
manage
.py
migrate
--no-input"
command
:
"
{{
funkwhale_install_path
}}/virtualenv/bin/
funkwhale-
manage
migrate
--no-input"
args
:
chdir
:
"
{{
funkwhale_install_path
}}"
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