Skip to content

rcouch #176

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

Open
benoitc wants to merge 6 commits into
base: master
Choose a base branch
from
Open

rcouch #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
102a498
add start_front command
benoitc Jan 24, 2015
2dc6d6c
dont't hard code the rundir
benoitc Jan 24, 2015
4df1517
make sure to set default RUN_DIR
benoitc Jan 26, 2015
5c20913
handle share directory
benoitc Jan 28, 2015
a23c543
fix typo
benoitc Jan 28, 2015
2fc1168
fix debian package: correctly copy share env
benoitc Jan 28, 2015
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
5 changes: 4 additions & 1 deletion priv/base/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ APP_VERSION={{app_version}}
# Variables needed to support creation of .pid files
# PID directory and pid file name of this app
# ex: /var/run/riak & /var/run/riak/riak.pid
RUN_DIR="/var/run" # for now hard coded unless we find a platform that differs
RUN_DIR="{{platform_run_dir}}"
if [ -z "$RUN_DIR" ]; then
RUN_DIR=/var/run
fi
PID_DIR=$RUN_DIR/$RUNNER_SCRIPT
PID_FILE=$PID_DIR/$RUNNER_SCRIPT.pid

Expand Down
30 changes: 29 additions & 1 deletion priv/base/runner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ usage() {
cat <<EOF
Usage: $SCRIPT «command»
where «command» is one of the following:
{ help | start | stop | restart | ping | console | attach
{ help | start | start_front | stop | restart | ping | console | attach
attach-direct | ertspath | chkconfig | escript | version | getpid
top [-interval N] [-sort { reductions | memory | msg_q }] [-lines N] } |
config { generate | effective | describe VARIABLE } [-l debug]
Expand Down Expand Up @@ -221,6 +221,28 @@ do_start() {
create_pid_file
}

do_start_front() {
# Make sure there is not already a node running
node_down_check

# Sanity check the app.config file
check_config > /dev/null
ES=$?
if [ "$ES" -ne 0 ]; then
exit $ES
fi

# Warn the user if ulimit is too low
check_ulimit

# Make sure log directory exists
mkdir -p $RUNNER_LOG_DIR

mkdir -p $PIPE_DIR
$ERTS_PATH/run_erl $PIPE_DIR/ $RUNNER_LOG_DIR \
"exec $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT console" 2>&1
}

do_stop() {
get_pid
ES=$?
Expand Down Expand Up @@ -253,6 +275,12 @@ case "$1" in
do_start
;;

start_front)
# Bootstrap daemon command (check perms & drop to $RUNNER_USER)
bootstrapd $@
do_start_front
;;

stop)
# Bootstrap daemon command (check perms & drop to $RUNNER_USER)
bootstrapd $@
Expand Down
3 changes: 2 additions & 1 deletion priv/templates/deb/deb.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
{platform_etc_dir, "/etc/{{package_install_name}}"},
{platform_base_dir, "/usr/lib/{{package_install_name}}"},
{platform_lib_dir, "/usr/lib/{{package_install_name}}/lib"},
{platform_log_dir, "/var/log/{{package_install_name}}"}
{platform_log_dir, "/var/log/{{package_install_name}}"},
{platform_share_dir, "/usr/share/{{package_install_name}}"}
]
}.
{template, "Makefile", "Makefile"}.
Expand Down
1 change: 1 addition & 0 deletions priv/templates/deb/dirs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ etc/{{package_install_name}}
etc/logrotate.d
usr/lib/{{package_install_name}}
usr/{{bin_or_sbin}}
usr/share/{{package_install_name}}
usr/share/man/man1
var/run/{{package_install_name}}
var/lib/{{package_install_name}}
Expand Down
1 change: 1 addition & 0 deletions priv/templates/deb/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ done

chown -R {{package_install_user}}:{{package_install_group}} /usr/lib/{{package_install_name}}
chown -R {{package_install_user}}:{{package_install_group}} /etc/{{package_install_name}}
chown -R {{package_install_user}}:{{package_install_group}} /usr/share/{{package_install_name}}

chmod 0755 /var/run/{{package_install_name}} /etc/{{package_install_name}}
chmod 0644 /etc/{{package_install_name}}/*
Expand Down
3 changes: 3 additions & 0 deletions priv/templates/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ install: build
cp -R rel/{{package_install_name}}/releases \
debian/{{package_name}}/usr/lib/{{package_install_name}}

cp -R rel/{{package_install_name}}/share/* \
debian/{{package_name}}/usr/share/{{package_install_name}}

## executables
if [ -d rel/{{package_install_name}}/bin ]; then \
mkdir -p debian/{{package_name}}/usr/{{bin_or_sbin}} && \
Expand Down
1 change: 1 addition & 0 deletions priv/templates/deb/vars.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{platform_base_dir, "{{platform_base_dir}}"}.
{platform_lib_dir, "{{platform_lib_dir}}"}.
{platform_log_dir, "{{platform_log_dir}}"}.
{platform_share_dir, "{{platform_share_dir}}"}.

{runner_script_dir, "{{platform_bin_dir}}"}.
{runner_base_dir, "{{platform_base_dir}}"}.
Expand Down
8 changes: 8 additions & 0 deletions priv/templates/fbsd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ PMAN_DIR = $(BUILD_STAGE_DIR)/man
PBIN_DIR = $(BUILD_STAGE_DIR)/{{bin_or_sbin}}
PETC_DIR = $(BUILD_STAGE_DIR)/etc/{{package_install_name}}
PLIB_DIR = $(BUILD_STAGE_DIR)/lib/{{package_install_name}}
PSHARE_DIR = $(BUILD_STAGE_DIR)/share/{{package_install_name}}
# /var based dirs
PDATA_DIR = $(BUILD_STAGE_DIR)/{{platform_data_dir}}
PLOG_DIR = $(BUILD_STAGE_DIR)/log/{{package_install_name}}
Expand All @@ -28,6 +29,7 @@ build: packing_list_files templates
find {{bin_or_sbin}} -type f | tar -rf $(TARNAME) -T - && \
find lib -type f | tar -rf $(TARNAME) -T - && \
find etc -type f | tar -rf $(TARNAME) -T - && \
find share -type f | tar -rf $(TARNAME) -T && \
find var -type f | tar -rf $(TARNAME) -T - && \
find log -type f | tar -rf $(TARNAME) -T -

Expand Down Expand Up @@ -97,6 +99,10 @@ packing_list_files: $(BUILD_STAGE_DIR)
find lib -type f >> +CONTENTS && \
find lib -d -type d -mindepth 1 -exec echo "@dirrm {}" \; >> +CONTENTS && \
echo "@exec chown -R {{package_install_user}}:{{package_install_group}} {{platform_base_dir}}" >> +CONTENTS
cd $(BUILD_STAGE_DIR) && \
find share -type f >> +CONTENTS && \
find share -d -type d -mindepth 1 -exec echo "@dirrm {}" \; >> +CONTENTS && \
echo "@exec chown -R {{package_install_user}}:{{package_install_group}} {{platform_base_dir}}" >> +CONTENTS
cd $(BUILD_STAGE_DIR) && \
echo "@owner root" >> +CONTENTS && \
echo "@group wheel" >> +CONTENTS && \
Expand Down Expand Up @@ -144,6 +150,8 @@ $(BUILD_STAGE_DIR): buildrel
cp -R rel/{{package_install_name}}/lib $(PLIB_DIR)
cp -R rel/{{package_install_name}}/erts-* $(PLIB_DIR)
cp -R rel/{{package_install_name}}/releases $(PLIB_DIR)
mkdir -p $(PSHARE_DIR)
cp -R rel/{{package_install_name}}/share $(PSHARE_DIR)
mkdir -p $(PDATA_DIR)
cp -R rel/{{package_install_name}}/data/* $(PDATA_DIR)
mkdir -p $(PLOG_DIR)
Expand Down
1 change: 1 addition & 0 deletions priv/templates/fbsd/fbsd.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
{platform_etc_dir, "/usr/local/etc/{{package_install_name}}"},
{platform_base_dir, "/usr/local/lib/{{package_install_name}}"},
{platform_lib_dir, "/usr/local/lib/{{package_install_name}}/lib"},
{platform_share_dir, "/usr/local/share/{{package_install_name}}"},
{platform_log_dir, "/var/log/{{package_install_name}}"}
]
}.
Expand Down
1 change: 1 addition & 0 deletions priv/templates/fbsd/vars.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{platform_base_dir, "{{platform_base_dir}}"}.
{platform_lib_dir, "{{platform_lib_dir}}"}.
{platform_log_dir, "{{platform_log_dir}}"}.
{platform_share_dir, "{{platform_share_dir}}"}.

%% TODO can we just get rid of these?
{runner_script_dir, "{{platform_bin_dir}}"}.
Expand Down
4 changes: 4 additions & 0 deletions priv/templates/fbsdng/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ PMAN_DIR = $(BUILD_STAGE_DIR)/usr/local/man
PBIN_DIR = $(BUILD_STAGE_DIR)/{{platform_bin_dir}}
PETC_DIR = $(BUILD_STAGE_DIR)/{{platform_etc_dir}}
PLIB_DIR = $(BUILD_STAGE_DIR)/{{platform_base_dir}}
PSHARE_DIR = $(BUILD_STAGE_DIR)/{{platform_share_dir}}

# /var based dirs
PDATA_DIR = $(BUILD_STAGE_DIR)/{{platform_data_dir}}
PLOG_DIR = $(BUILD_STAGE_DIR)/var/log/{{package_install_name}}
Expand Down Expand Up @@ -79,6 +81,8 @@ $(BUILD_STAGE_DIR): buildrel
cp -R rel/{{package_install_name}}/lib $(PLIB_DIR)
cp -R rel/{{package_install_name}}/erts-* $(PLIB_DIR)
cp -R rel/{{package_install_name}}/releases $(PLIB_DIR)
mkdir -p $(PSHARE_DIR)
cp -R rel/{{package_install_name}}/share $(PSHARE_DIR)
mkdir -p $(PDATA_DIR)
cp -R rel/{{package_install_name}}/data/* $(PDATA_DIR)
mkdir -p ${BUILD_STAGE_DIR}/usr/local/etc/rc.d
Expand Down
1 change: 1 addition & 0 deletions priv/templates/fbsdng/fbsdng.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
{platform_etc_dir, "/usr/local/etc/{{package_install_name}}"},
{platform_base_dir, "/usr/local/lib/{{package_install_name}}"},
{platform_lib_dir, "/usr/local/lib/{{package_install_name}}/lib"},
{platform_share_dir, "/usr/local/share/{{package_install_name}}/share"},
{platform_log_dir, "/var/log/{{package_install_name}}"}
]
}.
Expand Down
1 change: 1 addition & 0 deletions priv/templates/fbsdng/vars.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{platform_base_dir, "{{platform_base_dir}}"}.
{platform_lib_dir, "{{platform_lib_dir}}"}.
{platform_log_dir, "{{platform_log_dir}}"}.
{platform_share_dir, "{{platform_share_dir}}"}.

%% TODO can we just get rid of these?
{runner_script_dir, "{{platform_bin_dir}}"}.
Expand Down
7 changes: 6 additions & 1 deletion priv/templates/rpm/specfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Obsoletes: {{package_name}}
%define platform_base_dir %{_libdir}/{{package_install_name}}
%define platform_lib_dir %{platform_base_dir}/lib
%define platform_log_dir %{_localstatedir}/log/{{package_install_name}}

%define platform_share_dir %{_datarootdir}/{{package_install_name}}

%prep
%setup -q -n %{_tarname_base}
Expand All @@ -58,6 +58,7 @@ cat > rpm.vars.config <<EOF
{platform_base_dir, "%{platform_base_dir}"}.
{platform_lib_dir, "%{platform_lib_dir}"}.
{platform_log_dir, "%{platform_log_dir}"}.
{platform_share_dir, "%{platform_share_dir}"}.

{runner_script_dir, "%{platform_bin_dir}"}.
{runner_base_dir, "%{platform_base_dir}"}.
Expand All @@ -80,6 +81,7 @@ OVERLAY_VARS="overlay_vars=../rpm.vars.config" make rel

mkdir -p %{buildroot_etc}
mkdir -p %{buildroot_lib}
mkdir -p %{buildroot}%{_datarootdir}/{{package_install_name}}
mkdir -p %{buildroot}%{_localstatedir}/lib/{{package_install_name}}
mkdir -p %{buildroot}%{_localstatedir}/log/{{package_install_name}}
mkdir -p %{buildroot}%{_localstatedir}/run/{{package_install_name}}
Expand All @@ -88,6 +90,8 @@ cp -R %{relpath}/lib %{buildroot_lib}
cp -R %{relpath}/erts-* %{buildroot_lib}
cp -R %{relpath}/releases %{buildroot_lib}

cp -R %{relpath}/share/* %{buildroot}%{_datarootdir}/{{package_install_name}}

mkdir -p %{buildroot}%{_{{bin_or_sbin}}dir}
if [ -d %{relpath}/bin ]; then \
find %{relpath}/bin -type f \
Expand Down Expand Up @@ -173,6 +177,7 @@ exit 0
%dir %{_sysconfdir}/{{package_install_name}}
%config(noreplace) %{_sysconfdir}/{{package_install_name}}/*
%{_{{bin_or_sbin}}dir}/*
%{_datarootdir}/{{package_install_name}}/*
%{_localstatedir}/lib/{{package_install_name}}
%{_localstatedir}/log/{{package_install_name}}
%{_localstatedir}/run/{{package_install_name}}
Expand Down
1 change: 1 addition & 0 deletions priv/templates/smartos/smartos.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{platform_etc_dir, "/opt/local/etc/{{package_install_name}}"},
{platform_base_dir, "/opt/local/lib/{{package_install_name}}"},
{platform_lib_dir, "/opt/local/lib/{{package_install_name}}/lib"},
{platform_share_dir, "/opt/local/share/{{package_install_name}}/share"},
{platform_log_dir, "/var/log/{{package_install_name}}"}
]
}.
Expand Down
1 change: 1 addition & 0 deletions priv/templates/smartos/vars.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{platform_base_dir, "{{platform_base_dir}}"}.
{platform_lib_dir, "{{platform_lib_dir}}"}.
{platform_log_dir, "{{platform_log_dir}}"}.
{{platform_share_dir, "{{platform_share_dir}}"}.

%% TODO can we just get rid of these?
{runner_script_dir, "{{platform_bin_dir}}"}.
Expand Down
1 change: 1 addition & 0 deletions priv/templates/solaris/solaris.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{platform_etc_dir, "/opt/{{package_install_name}}/etc"},
{platform_base_dir, "/opt/{{package_install_name}}"},
{platform_lib_dir, "/opt/{{package_install_name}}/lib"},
{platform_share_dir, "/opt/{{package_install_name}}/share"},
{platform_log_dir, "/opt/{{package_install_name}}/log"},
{solaris_pkgname, "MAINTapp"}
]
Expand Down
1 change: 1 addition & 0 deletions priv/templates/solaris/vars.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{platform_base_dir, "{{platform_base_dir}}"}.
{platform_lib_dir, "{{platform_lib_dir}}"}.
{platform_log_dir, "{{platform_log_dir}}"}.
{{platform_share_dir, "{{platform_share_dir}}"}.

%% TODO can we just get rid of these?
{runner_script_dir, "{{platform_bin_dir}}"}.
Expand Down