Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Tyagov
slapos
Commits
99d92cc6
Commit
99d92cc6
authored
5 years ago
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
proviewr fixup
parent
1dfca59d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
131 deletions
+42
-131
software/proviewR/files/build.sh
software/proviewR/files/build.sh
+0
-119
software/proviewR/instance-proview-r.cfg.jinja2.in
software/proviewR/instance-proview-r.cfg.jinja2.in
+30
-9
software/proviewR/instance.cfg
software/proviewR/instance.cfg
+4
-0
software/proviewR/nginx_conf.in
software/proviewR/nginx_conf.in
+1
-1
software/proviewR/software.cfg
software/proviewR/software.cfg
+7
-2
No files found.
software/proviewR/files/build.sh
deleted
100644 → 0
View file @
1dfca59d
#!/bin/bash
set
-e
exec
>
>(
tee
compilation_log.txt
)
exec
2>&1
root
=
`
eval pwd
`
if
[
-e
$root
/src/exp/inc/src/pwr_version.h
]
;
then
verl
=
`
eval cat
$root
/src/exp/inc/src/pwr_version.h |
grep
"
\b
pwrv_cPwrVersionStr
\b
"
|
awk
'{print $3}'
`
verl
=
${
verl
:1:6
}
ver
=
${
verl
:0:2
}${
verl
:3:1
}${
verl
:5:1
}
fi
# Check pwra
#aroot=/usr/local/adm
aroot
=
$PREFIX
/local/adm
if
[
!
-e
$aroot
/db
]
;
then
if
mkdir
-p
$aroot
/db 2>/dev/null
;
then
echo
"Administration directory created:
$aroot
/db"
cp
-u
$root
/src/tools/pkg/deb/adm/pwr
*
$aroot
/db/
else
echo
"Unable to create a global administration directory
$aroot
/db"
aroot
=
$root
/adm
echo
"Using local administration directory
$aroot
/db"
if
mkdir
-p
$aroot
/db
;
then
cp
-u
$root
/src/tools/pkg/deb/adm/pwr
*
$aroot
/db/
else
echo
"Unable to create local administration directory
$aroot
/db"
fi
fi
fi
# Insert base in projectlist
if
[
!
-e
$aroot
/db/pwr_projectlist.dat
]
;
then
echo
"Creating
$aroot
/db/pwr_projectlist.dat"
echo
"%base
$verl
$root
/rls"
>
$aroot
/db/pwr_projectlist.dat
else
set
+e
ptst
=
`
eval grep
"^%base"
$aroot
/db/pwr_projectlist.dat |
grep
"
\b
$verl
\b
"
`
set
-e
if
[
"
$ptst
"
=
""
]
;
then
echo
"Adding base to
$aroot
/db/pwr_projectlist.dat"
echo
"%base
$verl
$root
/rls"
>>
$aroot
/db/pwr_projectlist.dat
else
echo
"Base
$verl
already exist in
$aroot
/db/pwr_projectlist.dat"
fi
fi
# Setup pwre
export
pwre_bin
=
$root
/src/tools/pwre/src/os_linux
export
pwre_env_db
=
$root
/pwre_db
source
$pwre_bin
/pwre_function
# Add pwre environment
unamestr
=
`
eval uname
`
machine
=
`
eval uname
-m
`
if
[
$machine
==
"amd64"
]
;
then
machine
=
"x86_64"
fi
if
[
$machine
!=
"x86_64"
]
;
then
machine
=
"x86"
fi
if
[
$unamestr
==
"Darwin"
]
;
then
os
=
"macos"
hw
=
"x86_64"
elif
[
$unamestr
==
"FreeBSD"
]
;
then
os
=
"freebsd"
hw
=
$machine
else
os
=
"linux"
hw
=
$machine
fi
btype
=
"dbg"
ename
=
$ver$hw
desc
=
$verl
gui
=
"qt"
if
[
$gui
==
"qt"
]
;
then
export
pwre_conf_qt
=
1
elif
[
$gui
==
"gtk"
]
;
then
export
pwre_conf_gtk
=
1
fi
pwre add
$ename
$root
/src
\"\"
$root
/rls
$btype
$os
$hw
"
$desc
"
pwre init
$ename
# Build
mkdir
-p
$pwre_broot
pwre configure
pwre create_all_modules
pwre build_all_modules
$gui
#pwre build_kernel $gui
#pwre method_build $gui
# Create a package version html file
$root
/src/tools/pkg/deb/pwrrt/build.sh
-v
co_convert
-t
-d
$pwr_doc
$pwr_eexe
/xtt_version_help.dat
echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo
""
echo
"Add the following lines to your .bashrc-file"
echo
""
echo
"export pwra_db=
$aroot
/db"
echo
"source
\$
pwra_db/pwr_setup.sh"
echo
"pwrp set base
$verl
"
echo
"export PWR_BUS_ID=999"
echo
""
echo
"Create a project with pwra"
echo
""
echo
"> pwra"
echo
""
echo
"Read Getting Started Guide on www.proview.se about how to create"
echo
"and configure a project"
echo
""
echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
\ No newline at end of file
This diff is collapsed.
Click to expand it.
software/proviewR/instance-proview-r.cfg.jinja2.in
View file @
99d92cc6
...
...
@@ -239,16 +239,25 @@ wrapper = ${directory:services}/nginx
# Put domain name
name = example.com
[nginx-htpasswd]
recipe = plone.recipe.command
stop-on-error = true
htpasswd-path = ${directory:etc}/.htpasswd
command = if [ ! -f "${:htpasswd-path}" ]; then {{ apache_htpasswd_bin }} -cb ${:htpasswd-path} ${:user} ${monitor-htpasswd:passwd}; fi
update-command = ${:command}
user = proviewr
[nginx-parameter-conf]
local-ip = ${slap-network-information:local-ipv4}
global-ip = ${slap-network-information:global-ipv6}
global-port =
${slaprunner:runner_port}
global-port =
8899
ssl-certificate = ${ca-nginx:cert-file}
ssl-key = ${ca-nginx:key-file}
pid-file = ${directory:run}/nginx.pid
access-log = ${directory:log}/nginx.access.log
error-log = ${directory:log}/nginx.error.log
etc-dir = ${directory:etc}
htpasswd-file = ${nginx-htpasswd:htpasswd-path}
client-body-temp-path = ${directory:tmp}/client_body_temp_path
proxy-temp-path = ${directory:tmp}/proxy_temp_path
fastcgi-temp-path = ${directory:tmp}/fastcgi_temp_path
...
...
@@ -275,12 +284,8 @@ log = ${nginx-parameter-conf:access-log} ${nginx-parameter-conf:error-log}
post = kill -USR1 $(cat ${nginx-parameter-conf:pid-file})
[request-slave-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file}
cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id}
slave = true
config-https-only = True
config-type = websocket
...
...
@@ -291,11 +296,25 @@ software-type = RootSoftwareInstance
name = ProviewR VNC
sla-instance_guid =
[request-shellinabox-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
name = Proview Shellinabox Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config-url = https://[$${nginx-parameter-conf:global-ip}]:$${nginx-parameter-conf:global-port}
config-domain =
return = site_url domain
[publish-connection-information]
<= monitor-publish
recipe = slapos.cookbook:publish
backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1
url = ${request-slave-frontend:connection-secure_access}/vnc.html?host=${request-slave-frontend:connection-domain}&port=443&encrypt=1
shell-url = ${request-shellinabox-frontend:site_url}
shell-backend = ${request-shellinabox-frontend:config-ur}
{% for name, value in publish_dict.items() -%}
{{ name }} = {{ value }}
{% endfor %}
...
...
@@ -313,11 +332,13 @@ parts =
websockify-sighandler
websockify-sighandler-service
novnc-promise
shellinabox
shellinabox-service
ca-nginx
logrotate-entry-nginx
proview-environment
bash-profile
pwrrt-service
shellinabox
shellinabox-service
# Complete parts with sections
{{ part_list | join('\n ') }}
...
...
This diff is collapsed.
Click to expand it.
software/proviewR/instance.cfg
View file @
99d92cc6
...
...
@@ -23,6 +23,9 @@ context =
key slapparameter_dict slap-configuration:configuration
key computer_id slap-configuration:computer
raw openssl_executable_location ${openssl:location}/bin/openssl
raw shellinabox_bin ${shellinabox:location}/bin/shellinaboxd
raw nginx_bin ${nginx:location}/sbin/nginx
raw apache_htpasswd_bin ${apache:location}/bin/htpasswd
raw template_logrotate ${template-logrotate-base:rendered}
raw template_monitor ${monitor2-template:rendered}
$${:extra-context}
...
...
@@ -44,6 +47,7 @@ extra-context =
raw ld_library_path ${pwr:ld-library-path}
raw pwrp_profile ${template-pwrp-profile:location}/${template-pwrp-profile:filename}
raw template_pwrrt ${template-pwrrt:location}/${template-pwrrt:filename}
raw template_nginx ${template-nginx-conf:location}/${template-nginx-conf:filename}
mode = 0644
[slap-configuration]
...
...
This diff is collapsed.
Click to expand it.
software/proviewR/nginx_conf.in
View file @
99d92cc6
worker_processes
5
;
worker_processes
3
;
pid {{ parameter_dict['pid-file'] }};
error_log {{ parameter_dict['error-log'] }};
...
...
This diff is collapsed.
Click to expand it.
software/proviewR/software.cfg
View file @
99d92cc6
...
...
@@ -36,7 +36,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
#md5sum = a27a900ce349068a15a42255f81ba0f0
md5sum = 48cb44d73e1da468497af45cc37d5fa4
[download-base]
recipe = hexagonit.recipe.download
...
...
@@ -46,7 +46,7 @@ mode = 0644
[template-proview-r]
<= download-base
md5sum =
8f518b869a46025b6e687c69c5589670
md5sum =
c730c798d630eb863c5030b81cae37d4
filename = instance-proview-r.cfg.jinja2.in
[template-pwrp-profile]
...
...
@@ -59,6 +59,11 @@ filename = pwrp_profile.in
md5sum = b68d8efa0a5ae756da237d7ba5b02c41
filename = pwrrt.in
[template-nginx-conf]
<= download-base
md5sum = 781977b1fa984d2529b1e1356ef0bb72
filename = pwrrt.in
[versions]
numpy = 1.16.4
#websockify = 0.6.1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment