/[smecontribs]/rpms/smeserver-unifi/contribs10/smeserver-unifi-5.6.30-sme10.patch
ViewVC logotype

Diff of /rpms/smeserver-unifi/contribs10/smeserver-unifi-5.6.30-sme10.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.2 by jpp, Thu Aug 4 02:36:31 2022 UTC Revision 1.6 by jpp, Sat Oct 22 04:23:48 2022 UTC
# Line 60  diff -Nur --no-dereference smeserver-uni Line 60  diff -Nur --no-dereference smeserver-uni
60  +++ smeserver-unifi-5.6.30/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    2022-08-03 22:06:10.159000000 -0400
61  @@ -0,0 +1 @@  @@ -0,0 +1 @@
62  +3478,10001  +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     1969-12-31 19:00:00.000000000 -0500  
 +++ smeserver-unifi-5.6.30/root/etc/e-smith/db/configuration/force/unifi/access 2022-08-03 22:05:07.504000000 -0400  
 @@ -0,0 +1 @@  
 +private  
63  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  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
64  --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/migrate/unifi  1969-12-31 19:00:00.000000000 -0500  --- smeserver-unifi-5.6.30.old/root/etc/e-smith/db/configuration/migrate/unifi  1969-12-31 19:00:00.000000000 -0500
65  +++ smeserver-unifi-5.6.30/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      2022-08-03 22:18:07.024000000 -0400
# Line 75  diff -Nur --no-dereference smeserver-uni Line 70  diff -Nur --no-dereference smeserver-uni
70  +       $unifi->delete_prop('TCPPort') if ( defined( $unifi->prop('TCPPort') ) and $unifi->prop('TCPPort') eq "8080,8443,8880,8843");  +       $unifi->delete_prop('TCPPort') if ( defined( $unifi->prop('TCPPort') ) and $unifi->prop('TCPPort') eq "8080,8443,8880,8843");
71  +  +
72  +}  +}
73    diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/etc/e-smith/events/actions/upgrade_unifi_controller.sh smeserver-unifi-5.6.30/root/etc/e-smith/events/actions/upgrade_unifi_controller.sh
74    --- smeserver-unifi-5.6.30.old/root/etc/e-smith/events/actions/upgrade_unifi_controller.sh      2021-11-01 21:56:56.066000000 -0400
75    +++ smeserver-unifi-5.6.30/root/etc/e-smith/events/actions/upgrade_unifi_controller.sh  2022-08-03 22:46:48.835000000 -0400
76    @@ -64,7 +64,7 @@
77    
78            # Stop the local UniFi Controller service
79            printf "\n"
80    -       service $UNIFI_SERVICE stop
81    +       /usr/bin/systemctl stop $UNIFI_SERVICE
82            
83            # Remove previous backup directory (if it exists)
84     #      if [ -d "$UNIFI_BACKUP_DIR" ]; then
85    @@ -101,7 +101,7 @@
86            
87            # Restart the local UniFi Controller service
88            printf "\n"
89    -       service $UNIFI_SERVICE start
90    +       /usr/bin/systemctl start $UNIFI_SERVICE
91            
92            # All done!
93            printf "\nUpgrade of UniFi Controller complete!\n"
94  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  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
95  --- smeserver-unifi-5.6.30.old/root/etc/e-smith/templates/usr/bin/hook-script.sh/30unifi        1969-12-31 19:00:00.000000000 -0500  --- smeserver-unifi-5.6.30.old/root/etc/e-smith/templates/usr/bin/hook-script.sh/30unifi        1969-12-31 19:00:00.000000000 -0500
96  +++ smeserver-unifi-5.6.30/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    2022-08-03 22:03:07.459000000 -0400
# Line 94  diff -Nur --no-dereference smeserver-uni Line 110  diff -Nur --no-dereference smeserver-uni
110  +  # Convert cert to PKCS12 format  +  # Convert cert to PKCS12 format
111  +  # Ignore warnings  +  # Ignore warnings
112  +  #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 /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
113  +  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  +  openssl pkcs12 -export -inkey `/sbin/e-smith/config getprop modSSL key` -in `/sbin/e-smith/config getprop modSSL crt` -out /opt/UniFi/data/fullchain.p12 -name unifi -password pass:unifi 2>/dev/null
114  +    +  
115  +  # Install certificate  +  # Install certificate
116  +  # Ignore warnings  +  # Ignore warnings
# Line 105  diff -Nur --no-dereference smeserver-uni Line 121  diff -Nur --no-dereference smeserver-uni
121  +  /usr/bin/systemctl restart unifi.service  +  /usr/bin/systemctl restart unifi.service
122  +fi  +fi
123  +  +
124    diff -Nur --no-dereference smeserver-unifi-5.6.30.old/root/sbin/e-smith/systemd/unifi smeserver-unifi-5.6.30/root/sbin/e-smith/systemd/unifi
125    --- smeserver-unifi-5.6.30.old/root/sbin/e-smith/systemd/unifi  1969-12-31 19:00:00.000000000 -0500
126    +++ smeserver-unifi-5.6.30/root/sbin/e-smith/systemd/unifi      2022-08-03 23:28:58.649000000 -0400
127    @@ -0,0 +1,28 @@
128    +#!/bin/bash
129    +
130    +# check if squid is using 8080, if yes, then move to 8081
131    +intercept=$(/usr/sbin/e-smith/config getprop squid InterceptPort||echo "8080")
132    +squidstatus=$(/usr/sbin/e-smith/config getprop squid status||echo "disabled")
133    +
134    +if [[ "$intercept" == "8080" && "$squidstatus" == "enabled" ]]; then
135    + echo "we set squid Intercept port to 8081.. to avoid conflict with unifi "
136    + /usr/sbin/e-smith/config setprop squid InterceptPort 8081
137    + /usr/sbin/e-smith/expand-template /etc/squid/squid.conf
138    + /usr/sbin/e-smith/expand-template /etc/rc.d/init.d/masq
139    + /usr/bin/systemctl restart squid
140    + /usr/bin/systemctl restart masq
141    +
142    +fi
143    +
144    +# now deal with dansguardian
145    +dport=$(/usr/sbin/e-smith/config getprop dansguardian port ||echo "8080")
146    +dstatus=$(/usr/sbin/e-smith/config getprop dansguardian status||echo "disabled")
147    +if [[ "$dport" == "8080" && "$dsatus" == "enabled" ]]; then
148    + echo "we set dansguardian port to 8081.. to avoid conflict with unifi "
149    +  /usr/sbin/e-smith/config setprop dansguardian port 8081
150    +  /usr/sbin/e-smith/expand-template /etc/dansguardian/dansguardian.conf
151    +  /usr/bin/systemctl restart dansguardian
152    +fi
153    +
154    +# nothing to do with with squidguard
155    +
156  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  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
157  --- smeserver-unifi-5.6.30.old/root/usr/lib/systemd/system/unifi.service        1969-12-31 19:00:00.000000000 -0500  --- smeserver-unifi-5.6.30.old/root/usr/lib/systemd/system/unifi.service        1969-12-31 19:00:00.000000000 -0500
158  +++ smeserver-unifi-5.6.30/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    2022-08-03 23:28:58.424000000 -0400
159  @@ -0,0 +1,20 @@  @@ -0,0 +1,22 @@
160  +# UniFi Controller systemd Service File  +# UniFi Controller systemd Service File
161  +# by Steve Jenkins  +# by Steve Jenkins
162  +# Last updated January 8, 2017  +# Last updated January 8, 2017
# Line 118  diff -Nur --no-dereference smeserver-uni Line 166  diff -Nur --no-dereference smeserver-uni
166  +After=syslog.target network.target  +After=syslog.target network.target
167  +  +
168  +[Service]  +[Service]
169  +ExecStartPre=-/sbin/e-smith/service-status unifi  +ExecStartPre=-/usr/sbin/e-smith/service-status unifi
170    +ExecStartPre=/usr//sbin/e-smith/systemd/unifi
171  +ExecStart=/usr/bin/java -Xmx1024M -jar /opt/UniFi/lib/ace.jar start  +ExecStart=/usr/bin/java -Xmx1024M -jar /opt/UniFi/lib/ace.jar start
172  +ExecStop=/usr/bin/java -jar /opt/UniFi/lib/ace.jar stop  +ExecStop=/usr/bin/java -jar /opt/UniFi/lib/ace.jar stop
173  +Type=simple  +Type=simple
174  +User=ubnt  +User=ubnt
175    +PermissionsStartOnly=true
176  +WorkingDirectory=/opt/UniFi  +WorkingDirectory=/opt/UniFi
177  +SuccessExitStatus=143  +SuccessExitStatus=143
178  +  +

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed