Skip to content

Commit 2850ed9

Browse files
brocaarbrocaar
committed
rpi: Migrate ChirpStack to SQLite.
1 parent 6ad10b9 commit 2850ed9

23 files changed

+55
-151
lines changed

‎conf/base_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/99_config_chirpstack_ap‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,3 @@ set firewall.@zone[0].masq='1'
4444
commit firewall
4545

4646
EOI
47-
48-
service network restart

‎conf/base_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/99_set_chirpstack_udp_forwarder_global_config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
uci get chirpstack-udp-forwarder.@global[0]
32
if [ $? -eq 1 ]; then
43
uci add chirpstack-udp-forwarder global

‎conf/base_raspberrypi_bcm27xx_bcm2709/files/etc/uci-defaults/99_config_chirpstack_ap‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,3 @@ set firewall.@zone[0].masq='1'
4444
commit firewall
4545

4646
EOI
47-
48-
service network restart

‎conf/base_raspberrypi_bcm27xx_bcm2709/files/etc/uci-defaults/99_set_chirpstack_udp_forwarder_global_config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
uci get chirpstack-udp-forwarder.@global[0]
32
if [ $? -eq 1 ]; then
43
uci add chirpstack-udp-forwarder global

‎conf/full_raspberrypi_bcm27xx_bcm2708/.config‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3297,9 +3297,23 @@ CONFIG_PACKAGE_ucode-mod-uloop=y
32973297
# Database
32983298
#
32993299
# CONFIG_PACKAGE_libmariadb is not set
3300-
CONFIG_PACKAGE_libpq=y
3300+
# CONFIG_PACKAGE_libpq is not set
33013301
# CONFIG_PACKAGE_libpqxx is not set
3302-
# CONFIG_PACKAGE_libsqlite3 is not set
3302+
CONFIG_PACKAGE_libsqlite3=y
3303+
3304+
#
3305+
# Configuration
3306+
#
3307+
# CONFIG_SQLITE3_BATCH_ATOMIC_WRITE is not set
3308+
CONFIG_SQLITE3_COLUMN_METADATA=y
3309+
CONFIG_SQLITE3_DYNAMIC_EXTENSIONS=y
3310+
CONFIG_SQLITE3_FTS3=y
3311+
CONFIG_SQLITE3_FTS4=y
3312+
CONFIG_SQLITE3_FTS5=y
3313+
CONFIG_SQLITE3_RTREE=y
3314+
# CONFIG_SQLITE3_SESSION is not set
3315+
# end of Configuration
3316+
33033317
# CONFIG_PACKAGE_pgsqlodbc is not set
33043318
# CONFIG_PACKAGE_psqlodbca is not set
33053319
# CONFIG_PACKAGE_psqlodbcw is not set
@@ -6060,9 +6074,9 @@ CONFIG_PACKAGE_uclient-fetch=y
60606074
#
60616075
# CONFIG_PACKAGE_mariadb-client is not set
60626076
# CONFIG_PACKAGE_mariadb-server-base is not set
6063-
CONFIG_PACKAGE_pgsql-cli=y
6077+
# CONFIG_PACKAGE_pgsql-cli is not set
60646078
# CONFIG_PACKAGE_pgsql-cli-extra is not set
6065-
CONFIG_PACKAGE_pgsql-server=y
6079+
# CONFIG_PACKAGE_pgsql-server is not set
60666080
# CONFIG_PACKAGE_rrdcgi1 is not set
60676081
# CONFIG_PACKAGE_rrdtool1 is not set
60686082
# CONFIG_PACKAGE_sqlite3-cli is not set

‎conf/full_raspberrypi_bcm27xx_bcm2708/files/etc/rc.local‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,3 @@
1-
PG_VERSION=$(postgres -V | awk '{print $NF}')
2-
3-
# Fixup after upgrade
4-
chown -R postgres:postgres /srv/postgresql/${PG_VERSION}
5-
if [ -d "/srv/postgresql/${PG_VERSION}/data" ]; then
6-
chmod 750 /srv/postgresql/${PG_VERSION}/data
7-
8-
# Create missing dirs
9-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_notify
10-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_tblspc
11-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_replslot
12-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_twophase
13-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_snapshots
14-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_logical/snapshots
15-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_logical/mappings
16-
sudo -u postgres mkdir -p /srv/postgresql/${PG_VERSION}/data/pg_commit_ts
17-
fi
18-
19-
# Wait for PostgreSQL to be available
20-
while ! sudo -u postgres /usr/bin/pg_isready -h localhost; do
21-
echo "Waiting for PostgreSQL"
22-
sleep 1
23-
done
24-
25-
# Setup ChirpStack database
26-
while ! sudo -u postgres /usr/bin/psql -h localhost -c '' chirpstack; do
27-
echo "Init database"
28-
sudo -u postgres /usr/bin/psql -h localhost -c "create role chirpstack with login password 'chirpstack';"
29-
sudo -u postgres /usr/bin/psql -h localhost -c "create database chirpstack with owner chirpstack";
30-
sudo -u postgres /usr/bin/psql -h localhost -c "create extension pg_trgm;" chirpstack
31-
sudo -u postgres /usr/bin/psql -h localhost -c "create extension hstore;" chirpstack
32-
sleep 1
33-
done
34-
351
# Import device repository
362
while :
373
do

‎conf/full_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/01_update_rc_local‎ renamed to ‎conf/full_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/01_update_rc_local_20241031‎

File renamed without changes.

‎conf/full_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/99_config_chirpstack_ap‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,3 @@ set firewall.@zone[0].masq='1'
4444
commit firewall
4545

4646
EOI
47-
48-
service network restart

‎conf/full_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/99_set_chirpstack_udp_forwarder_global_config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
uci get chirpstack-udp-forwarder.@global[0]
32
if [ $? -eq 1 ]; then
43
uci add chirpstack-udp-forwarder global

‎conf/full_raspberrypi_bcm27xx_bcm2708/files/etc/uci-defaults/99_set_postgresql_data_path‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)