Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[waiting for upstream] [jsk_pr2_startup] add basic authentication in roswww pages on pr2 #1233

Merged
merged 4 commits into from
Jul 16, 2021
Merged

[waiting for upstream] [jsk_pr2_startup] add basic authentication in roswww pages on pr2 #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2bad45
add basic authentication in roswww
knorth55 Jul 14, 2020
f06fe8f
add basic authentication for roswww in pr2_bringup
knorth55 Jul 14, 2020
199b826
Merge branch 'master' into pr2-basic-auth
knorth55 Jan 7, 2021
cce8c0e
Merge branch 'master' into pr2-basic-auth
k-okada Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions jsk_pr2_robot/jsk_pr2_startup/pr2_bringup.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@
<arg name="use_applist" value="false"/> <!-- use plugin -->
<arg name="applist" value="$(find jsk_pr2_startup)/apps"/>
<arg name="respawn" value="false"/>
<arg name="basic" value="true" />
<arg name="basic_yaml" value="/var/lib/robot/roswww_basic_keys.yaml" />
</include>

<!-- mannequin mode -->
Expand Down
8 changes: 7 additions & 1 deletion jsk_robot_common/jsk_robot_startup/lifelog/app_manager.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
doc="launch roswww server if true"/>
<arg name="roswww_port" default="8000"
doc="port number for roswww server"/>
<arg name="basic" default="false"
doc="enable basic authentication" />
<arg name="basic_yaml" default="/var/lib/robot/roswww_basic_keys.yaml"
doc="basic yaml file path" />
<arg name="basic_flag" value="--basic $(arg basic) --basic-yaml $(arg basic_yaml)" if="$(arg basic)" />
<arg name="basic_flag" value="" unless="$(arg basic)" />

<arg name="remote" default="false"
doc="set true with valid 'machine' argument"/>
Expand Down Expand Up @@ -43,7 +49,7 @@
<node if="$(arg launch_roswww)"
name="roswww" pkg="roswww" type="webserver.py"
output="screen" machine="$(arg machine)" respawn="$(arg respawn)"
args="--name roswww --webpath www --cached true
args="--name roswww --webpath www --cached true $(arg basic_flag)
--port $(arg roswww_port) --start_port $(arg roswww_port) --end_port $(arg roswww_port)"/>

<!--
Expand Down