Skip to content
Snippets Groups Projects
Commit 2258d44e authored by Måns Gezelius's avatar Måns Gezelius
Browse files

Merge branch 'test' into 'production'

Test

See merge request !12
parents 4eeb6150 c8b28247
No related branches found
No related tags found
1 merge request!12Test
Pipeline #74197 passed
...@@ -41,5 +41,5 @@ class tracingcarbon { ...@@ -41,5 +41,5 @@ class tracingcarbon {
include tracingcarbon::python include tracingcarbon::python
include tracingcarbon::yarn include tracingcarbon::yarn
# include tracingcarbon::runserver include tracingcarbon::runserver
} }
# Starts the django server in a pipenv, if not already running # Starts the django server in a pipenv, if not already running
class tracingcarbon::runserver () { class tracingcarbon::runserver () {
exec { 'Run django' : exec { 'Run django' :
command => 'pipenv run python3 manage.py runserver &', command => 'yarn build && pipenv run python3 manage.py runserver &',
path => [ '/home/mange61/.local/bin', '/usr/bin', '/bin' ], path => [ '/home/mange61/.local/bin', '/usr/bin', '/bin' ],
cwd => '/home/mange61/tracing-carbon', cwd => '/home/mange61/tracing-carbon',
user => 'mange61', user => 'mange61',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment