Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tracingcarbon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
liu-puppet-modules
Tracingcarbon
Commits
2258d44e
Commit
2258d44e
authored
2 years ago
by
Måns Gezelius
Browse files
Options
Downloads
Plain Diff
Merge branch 'test' into 'production'
Test See merge request
!12
parents
4eeb6150
c8b28247
No related branches found
No related tags found
1 merge request
!12
Test
Pipeline
#74197
passed
2 years ago
Stage: puppet
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
manifests/init.pp
+1
-1
1 addition, 1 deletion
manifests/init.pp
manifests/runserver.pp
+1
-1
1 addition, 1 deletion
manifests/runserver.pp
with
2 additions
and
2 deletions
manifests/init.pp
+
1
−
1
View file @
2258d44e
...
@@ -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
}
}
This diff is collapsed.
Click to expand it.
manifests/runserver.pp
+
1
−
1
View file @
2258d44e
# 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'
,
...
...
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