Skip to content

fix(import): Avoid errors on import module #441

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

Merged
Stell0 merged 2 commits into from
May 6, 2025
Merged

fix(import): Avoid errors on import module #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ef28a
fix(import): Make sure customer card volume has correct permission on…
Stell0 May 5, 2025
90ef2d9
fix(init): don't attempt to run initialization scripts if database is…
Stell0 May 5, 2025
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
19 changes: 12 additions & 7 deletions freepbx/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,18 @@ EOF
mkdir -p /var/spool/asterisk/outgoing /var/spool/asterisk/tmp /var/spool/asterisk/uploads
chown asterisk:asterisk /var/lib/asterisk/db /var/spool/asterisk/outgoing /var/spool/asterisk/tmp /var/spool/asterisk/uploads /var/lib/nethserver/nethcti/templates/customer_card

# Make sure config dir is writable from nethcti and freepbx containers
chown -R asterisk:asterisk /etc/nethcti

# make sure CSV upload path exists if /var/lib/nethvoice isn't a volume or already initialized
mkdir -p /var/lib/nethvoice/phonebook/uploads
chown -R asterisk:asterisk /var/lib/nethvoice/phonebook/uploads

# Don't continue with initialization if the database is not ready
if [[ -z "${AMPDBUSER}" || -z "${AMPDBPASS}" ]]; then
exit 0
fi

# Customized wizard page
cat > /etc/apache2/sites-available/wizard.conf <<EOF
AliasMatch ^/(?!freepbx)(.+)$ /var/www/html/freepbx/wizard/\$1
Expand Down Expand Up @@ -236,13 +248,6 @@ fi
# Configure users
php /configure_users.php

# Make sure config dir is writable from nethcti and freepbx containers
chown -R asterisk:asterisk /etc/nethcti

# make sure CSV uopload path exists if /var/lib/nethvoice isn't a volume or already initialized
mkdir -p /var/lib/nethvoice/phonebook/uploads
chown -R asterisk:asterisk /var/lib/nethvoice/phonebook/uploads

# Change Apache httpd port
sed -i "s/<VirtualHost \*:80>/<VirtualHost \*:${APACHE_PORT}>/" /etc/apache2/sites-enabled/000-default.conf
sed -i "s/Listen 80/Listen ${APACHE_PORT}/" /etc/apache2/ports.conf
Expand Down
2 changes: 2 additions & 0 deletions imageroot/actions/import-module/04initialize_volumes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ podman run \
--volume=asterisk:/etc/asterisk:z \
--volume=sounds:/var/lib/asterisk/sounds:z \
--volume=agi-bin:/var/lib/asterisk/agi-bin:z \
--volume=nethcti:/etc/nethcti:z \
--volume=customer_card:/var/lib/nethserver/nethcti/templates/customer_card/:z \
"${NETHVOICE_FREEPBX_IMAGE}" \
echo "volumes initialized"