diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-backup smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-backup --- smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-backup 2022-03-27 23:45:44.000000000 -0400 +++ smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-backup 2022-12-07 12:14:47.321000000 -0500 @@ -1,3 +1,3 @@ #!/bin/bash -su asterisk -s /bin/bash -c 'php /var/lib/asterisk/bin/backup.php --id=1' +su asterisk -s /bin/bash -c '/usr/sbin/php /var/lib/asterisk/bin/backup.php --id=1' diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall-backup smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall-backup --- smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall-backup 2022-03-27 23:45:44.000000000 -0400 +++ smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall-backup 2022-12-07 12:04:43.592000000 -0500 @@ -3,25 +3,16 @@ DBNAME=$(/sbin/e-smith/db configuration getprop freepbx DbName) backuppath='/home/e-smith/files/freepbx' -# check if backup module is enabled and running +# check if backup module is local, enabled and running # if not solve this... -if [[ ! `/usr/sbin/fwconsole ma list|/bin/grep backup|/bin/grep Enabled` ]] ; then - - if [[ ! `/usr/sbin/fwconsole ma list|/bin/grep backup` ]] ;then - /usr/sbin/fwconsole ma download backup -R standard -R extended 2>&1 >/dev/null - /usr/sbin/fwconsole ma install backup -R standard -R extended 2>&1 >/dev/null - fi - - if [[ `/usr/sbin/fwconsole ma list|/bin/grep backup| grep 'Not Installed'` ]] ;then - /usr/sbin/fwconsole ma install backup -R standard -R extended 2>&1 >/dev/null - fi - - if [[ `/usr/sbin/fwconsole ma list|/bin/grep backup|/bin/grep Disabled` ]] ; then - /usr/sbin/fwconsole ma enable backup 2>&1 >/dev/null - fi - - /usr/sbin/fwconsole r +if [[ ! `/usr/sbin/fwconsole ma list|/bin/grep backup` ]] ;then + /usr/sbin/fwconsole ma download backup -R standard -R extended >/dev/null 2>&1 fi +#force install +/usr/sbin/fwconsole ma install backup -R standard -R extended >/dev/null 2>&1 +# force enable +/usr/sbin/fwconsole ma enable backup >/dev/null 2>&1 +/usr/sbin/fwconsole r >/dev/null # check our freepbx backup folder is there and accessible if [[ ! -d $backuppath ]] ; then @@ -33,7 +24,7 @@ mysql -e "use $DBNAME;UPDATE backup_server_details set value = '/home/e-smith/files/freepbx' WHERE server_id = 1;" # set info for backup 1 #data = a:1:{s:10:"created_by";s:11:"install.php";} -mysql -e "use $DBNAME;INSERT INTO backup (\`id\`, \`name\`, \`description\` , \`immortal\` ,\`data\`, \`email\` ) VALUES (1, 'Default backup', 'Default SME PBX backup; automatically installed', 'true','', 'admin' ) ON DUPLICATE KEY UPDATE \`description\` = 'Default SME PBX backup; automatically installed', \`immortal\` = 'true', \`email\` = 'admin' , \`name\`= 'Default backup' ;" +mysql -e "use $DBNAME;INSERT INTO backup (\`id\`, \`name\`, \`description\` , \`immortal\` ,\`data\`, \`email\` ) VALUES (1, 'Default backup', 'Default SME PBX backup; automatically installed', 'true','', 'admin' ) ON DUPLICATE KEY UPDATE \`description\` = 'Default SME PBX backup; automatically installed', \`immortal\` = 'true', \`email\` = 'admin' , \`name\`= 'Default backup' ;" 2>/dev/null || mysql -e "use $DBNAME;INSERT INTO backup (\`id\`, \`name\`, \`emailaddr\` ) VALUES (1, 'SMEbackup', 'admin' ) ON DUPLICATE KEY UPDATE \`name\` = 'SMEbackup', \`emailaddr\` = 'admin' ;" mysql -e "use $DBNAME;ALTER TABLE backup_details ADD UNIQUE uniq ( \`backup_id\` , \`key\` , \`index\` ) ;" mysql -e "use $DBNAME;INSERT INTO backup_details (\`backup_id\`, \`key\`, \`index\`, \`value\`) VALUES @@ -68,5 +59,5 @@ mysql -e "use $DBNAME;ALTER TABLE backup_items DROP INDEX \`uniq\` ;" # make sure all perms are ok for backup -/usr/sbin/fwconsole chown 2>&1 >/dev/null +/usr/sbin/fwconsole chown > /dev/null 2>&1