diff -Nur --no-dereference smeserver-unifi-5.6.30.old/createlinks smeserver-unifi-5.6.30/createlinks --- smeserver-unifi-5.6.30.old/createlinks 2022-08-03 21:49:45.091000000 -0400 +++ smeserver-unifi-5.6.30/createlinks 2018-03-09 02:15:53.000000000 -0500 @@ -3,7 +3,7 @@ use esmith::Build::CreateLinks qw(:all); -#service_link_enhanced("unifi", "S85", "7"); +service_link_enhanced("unifi", "S85", "7"); foreach $event (qw(remoteaccess-update)) @@ -17,28 +17,13 @@ } -my $pkg= "smeserver-unifi"; -my $event = "${pkg}-update"; +# add link to -event_actions($event, qw( - upgrade_unifi_controller.sh 20 - systemd-default 88 - systemd-reload 89 -)); - -#event_templates($event, qw( -#/etc/httpd/conf/httpd.conf -#)); - -event_services($event, qw( - unifi restart -)); - -use esmith::Build::Backup qw(:all); -backup_includes($pkg, qw( -/opt/Unifi -/opt/UniFi_bak -)); +#foreach $file ( +# qw(/var/lib/denyhosts/allowed-hosts /etc/hosts.allow /etc/denyhosts.conf)) +#{ +# templates2events($file, qw(bootstrap-console-save conf-denyhosts)); +#} exit 0; diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/defaults/unifi/TCPPort smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/defaults/unifi/TCPPort --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/defaults/unifi/TCPPort 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/defaults/unifi/TCPPort 2018-03-09 00:22:01.000000000 -0500 @@ -0,0 +1 @@ +8080,8443,8880,8843 diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/defaults/unifi/TCPPorts smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/defaults/unifi/TCPPorts --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/defaults/unifi/TCPPorts 2022-08-03 22:13:26.349000000 -0400 +++ smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/defaults/unifi/TCPPorts 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -8080,8443,8880,8843 diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/defaults/unifi/UDPPorts smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/defaults/unifi/UDPPorts --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/defaults/unifi/UDPPorts 2022-08-03 22:06:10.159000000 -0400 +++ smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/defaults/unifi/UDPPorts 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -3478,10001 diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/force/unifi/access smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/force/unifi/access --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/force/unifi/access 2022-08-03 22:05:07.504000000 -0400 +++ smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/force/unifi/access 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -private diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/migrate/unifi smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/migrate/unifi --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/migrate/unifi 2022-08-03 22:18:07.024000000 -0400 +++ smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/migrate/unifi 1969-12-31 19:00:00.000000000 -0500 @@ -1,6 +0,0 @@ -{ - - my $unifi = $DB->get('unifi') || $DB->new_record("unifi",{type=>'service'}); - $unifi->delete_prop('TCPPort') if ( defined( $unifi->prop('TCPPort') ) and $unifi->prop('TCPPort') eq "8080,8443,8880,8843"); - -} diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/templates/usr/bin/hook-script.sh/30unifi smeserver-unifi-5.6.30/root/etc/e-smith/templates/usr/bin/hook-script.sh/30unifi --- smeserver-unifi-5.6.30.old/root/etc/e-smith/templates/usr/bin/hook-script.sh/30unifi 2022-08-03 22:03:07.459000000 -0400 +++ smeserver-unifi-5.6.30/root/etc/e-smith/templates/usr/bin/hook-script.sh/30unifi 1969-12-31 19:00:00.000000000 -0500 @@ -1,26 +0,0 @@ -if [ $1 = "deploy_cert" ]; then - # and now deploy our LE cert to Unifi controller ! -{ # in case we rely on scl again - #. /opt/rh/rh-mongodb34/service-environment - #. scl_source enable \$RH_MONGODB34_SCLS_ENABLED -} - # To automatically detect DOMAIN (thanks to @SprockTech): - DOMAIN=$(mongo --quiet --port 27117 --eval 'db.getSiblingDB("ace").setting.find(\{"key": "super_identity"\}).forEach(function(document)\{ print(document.hostname) \})') - - # Backup previous keystore - cp /opt/UniFi/data/keystore /opt/UniFi/data/keystore.backup.$(date +%F_%R) - - # Convert cert to PKCS12 format - # Ignore warnings - #openssl pkcs12 -export -inkey /etc/letsencrypt/live/${DOMAIN}/privkey.pem -in /etc/letsencrypt/live/${DOMAIN}/fullchain.pem -out /etc/letsencrypt/live/${DOMAIN}/fullchain.p12 -name unifi -password pass:unifi - openssl pkcs12 -export -inkey `config getprop modSSL key` -in `config getprop modSSL crt` -out /opt/UniFi/data/fullchain.p12 -name unifi -password pass:unifi 2>/dev/null - - # Install certificate - # Ignore warnings - #keytool -importkeystore -deststorepass aircontrolenterprise -destkeypass aircontrolenterprise -destkeystore /var/lib/unifi/keystore -srckeystore /etc/letsencrypt/live/${DOMAIN}/fullchain.p12 -srcstoretype PKCS12 -srcstorepass unifi -alias unifi -noprompt - keytool -importkeystore -deststorepass aircontrolenterprise -destkeypass aircontrolenterprise -destkeystore /opt/UniFi/data/keystore -srckeystore /opt/UniFi/data/fullchain.p12 -srcstoretype PKCS12 -srcstorepass unifi -alias unifi -noprompt - - #Restart UniFi controller - /usr/bin/systemctl restart unifi.service -fi - diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/usr/lib/systemd/system/unifi.service smeserver-unifi-5.6.30/root/usr/lib/systemd/system/unifi.service --- smeserver-unifi-5.6.30.old/root/usr/lib/systemd/system/unifi.service 2022-08-03 21:55:45.138000000 -0400 +++ smeserver-unifi-5.6.30/root/usr/lib/systemd/system/unifi.service 1969-12-31 19:00:00.000000000 -0500 @@ -1,20 +0,0 @@ -# UniFi Controller systemd Service File -# by Steve Jenkins -# Last updated January 8, 2017 -# adapted for Koozali SME Server 10 -[Unit] -Description=Ubiquiti UniFi Controller -After=syslog.target network.target - -[Service] -ExecStartPre=-/sbin/e-smith/service-status unifi -ExecStart=/usr/bin/java -Xmx1024M -jar /opt/UniFi/lib/ace.jar start -ExecStop=/usr/bin/java -jar /opt/UniFi/lib/ace.jar stop -Type=simple -User=ubnt -WorkingDirectory=/opt/UniFi -SuccessExitStatus=143 - -[Install] -WantedBy=multi-user.target -WantedBy=sme-server.target