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
e0021a05
Commit
e0021a05
authored
8 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Fix warnings
parent
170be593
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/freedombone-app-turtl
+20
-2
20 additions, 2 deletions
src/freedombone-app-turtl
src/freedombone-utils-nodejs
+1
-1
1 addition, 1 deletion
src/freedombone-utils-nodejs
with
21 additions
and
3 deletions
src/freedombone-app-turtl
+
20
−
2
View file @
e0021a05
...
...
@@ -84,6 +84,8 @@ function install_interactive_turtl {
else
function_check interactive_site_details
interactive_site_details
"turtl"
"TURTL_DOMAIN_NAME"
"TURTL_CODE"
write_config_param
"API_TURTL_DOMAIN_NAME"
"api.
${
TURTL_DOMAIN_NAME
}
"
write_config_param
"API_TURTL_CODE"
"
${
TURTL_CODE
}
"
fi
APP_INSTALLED
=
1
}
...
...
@@ -124,7 +126,12 @@ function upgrade_turtl {
set_repo_commit
$TURTL_BASE_DIR
/api
"turtl api commit"
"
$TURTL_API_COMMIT
"
$TURTL_API_REPO
nginx_dissite
$TURTL_DOMAIN_NAME
cd
/var/www/
$TURTL_DOMAIN_NAME
/htdocs
npm
install
rm
-rf
node_modules npm-shrinkwrap.json
npm
install
uglify@0.1.5
--no-optional
npm
install
minimatch@3.0.2
--no-optional
npm
install
--no-optional
sed
-i
's|{config,controllers,handlers,locales,library,models,turtl}|.|g'
Makefile
sed
-i
's|tests/{data,tests}|tests|g'
Makefile
make clean
make
chown
-R
turtl:turtl
$TURTL_BASE_DIR
...
...
@@ -694,8 +701,19 @@ function install_turtl_app {
set_completion_param
"turtl domain"
"
$TURTL_DOMAIN_NAME
"
cd
/var/www/
$TURTL_DOMAIN_NAME
/htdocs
npm
install
sed
-i
's|GPLv3|GPL-3.0|g'
package.json
sed
-i
"/license/a
\"
repository
\"
:
\"
$TURTL_REPO
\"
,"
package.json
rm
-rf
node_modules npm-shrinkwrap.json
npm
install
uglify@0.1.5
--no-optional
npm
install
minimatch@3.0.2
--no-optional
npm
install
--no-optional
sed
-i
's|{config,controllers,handlers,locales,library,models,turtl}|.|g'
Makefile
sed
-i
's|tests/{data,tests}|tests|g'
Makefile
make clean
make
chown
-R
turtl:turtl /var/www/
$TURTL_DOMAIN_NAME
/htdocs
function_check create_site_certificate
...
...
This diff is collapsed.
Click to expand it.
src/freedombone-utils-nodejs
+
1
−
1
View file @
e0021a05
...
...
@@ -37,7 +37,7 @@ VARIANTS='mesh'
# have specifically the correct versions
NODEJS_VERSION
=
'6.9.0'
NODEJS_N_VERSION
=
'2.1.4'
NPM_VERSION
=
'4.0.
2
'
NPM_VERSION
=
'4.0.
5
'
# This file keeps track of the apps needing nodejs
# so that it can be removed if tere are no apps which need it
...
...
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