Skip to content

Commit

Permalink
build: /lib vs /usr/lib closes bigbluebutton#15553
Browse files Browse the repository at this point in the history
  • Loading branch information
antobinary committed Sep 1, 2022
1 parent 4e46284 commit 3530c5f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build/packages-template/bbb-config/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ TARGET=`basename $(pwd)`

# inject dependency to bigbluebutton.target
for unit in freeswitch nginx redis-server; do
mkdir -p "staging/lib/systemd/system/${unit}.service.d"
cp bigbluebutton.conf "staging/lib/systemd/system/${unit}.service.d/"
mkdir -p "staging/usr/lib/systemd/system/${unit}.service.d"
cp bigbluebutton.conf "staging/usr/lib/systemd/system/${unit}.service.d/"
done


Expand All @@ -20,7 +20,7 @@ rm -rf staging
#
# Create build directories for markign by fpm
DIRS="/etc/bigbluebutton \
/lib/systemd/system \
/usr/lib/systemd/system \
/var/bigbluebutton/blank \
/usr/share/bigbluebutton/blank \
/var/www/bigbluebutton-default/assets"
Expand Down Expand Up @@ -55,7 +55,7 @@ mkdir -p staging/usr/share/bigbluebutton/nginx

cp include_default.nginx staging/usr/share/bigbluebutton/

cp bigbluebutton.target staging/lib/systemd/system/
cp bigbluebutton.target staging/usr/lib/systemd/system/

. ./opts-$DISTRO.sh

Expand Down
6 changes: 3 additions & 3 deletions build/packages-template/bbb-html5/after-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ if [ -f /opt/freeswitch/etc/freeswitch/sip_profiles/external.xml ]; then
sed -i 's/<!--<param name="enable-3pcc" value="true"\/>-->/<param name="enable-3pcc" value="proxy"\/>/g' /opt/freeswitch/etc/freeswitch/sip_profiles/external.xml
fi

chown root:root /lib/systemd/system
chown root:root /lib/systemd/system/bbb-html5.service
chown root:root /lib/systemd/system/disable-transparent-huge-pages.service
chown root:root /usr/lib/systemd/system
chown root:root /usr/lib/systemd/system/bbb-html5.service
chown root:root /usr/lib/systemd/system/disable-transparent-huge-pages.service

# Ensure settings is readable
chmod go+r /usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml
Expand Down

0 comments on commit 3530c5f

Please sign in to comment.