diff --git a/inc/database-setup.sh b/inc/database-setup.sh index 969a738..6da54f9 100644 --- a/inc/database-setup.sh +++ b/inc/database-setup.sh @@ -8,9 +8,11 @@ # TODO how to auto-detect correct conf include dir? let Mem_1_3=$MemTotal/3 let Mem_2_3=2*$MemTotal/3 -sed -e"s/#Mem_1_3#/$Mem_1_3/g" -e"s/#Mem_2_3#/$Mem_2_3/g" < $FILEDIR/config-files/postgresql-extra.conf >/etc/postgresql/12/main/conf.d/postgresql-extra.conf +sed -e"s/#Mem_1_3#/$Mem_1_3/g" -e"s/#Mem_2_3#/$Mem_2_3/g" < $FILEDIR/config-files/postgresql-extra.conf >/etc/postgresql/14/main/conf.d/postgresql-extra.conf systemctl restart postgresql +cd /home/maposmatic + # add "gis" database users sudo --user=postgres createuser --superuser --no-createdb --no-createrole maposmatic sudo -u postgres createuser -g maposmatic root diff --git a/inc/install-packages.sh b/inc/install-packages.sh index 8d1f003..4811bf7 100644 --- a/inc/install-packages.sh +++ b/inc/install-packages.sh @@ -52,6 +52,7 @@ apt-get install --quiet=2 --assume-yes \ fonts-sil-padauk \ fonts-sipa-arundina \ fonts-taml-tscu \ + fonts-unifont \ g++ \ ghostscript \ gir1.2-pango-1.0 \ @@ -76,7 +77,7 @@ apt-get install --quiet=2 --assume-yes \ libgirepository1.0-dev \ libkakasi2-dev \ liblua5.3-dev \ - libmapnik3.0 \ + libmapnik3.1 \ libmapnik-dev \ libosmium2-dev \ libpython3-dev \ @@ -90,12 +91,13 @@ apt-get install --quiet=2 --assume-yes \ munin \ munin-node \ munin-plugins-extra \ + npm \ osmctools \ osmium-tool \ pandoc \ php-cli \ php-http-request2 \ - php7.4-xml \ + php8.1-xml \ pngquant \ poedit \ postgis \ @@ -134,7 +136,6 @@ apt-get install --quiet=2 --assume-yes \ transifex-client \ tree \ ttf-mscorefonts-installer \ - ttf-unifont \ unifont \ unifont-bin \ unzip \ @@ -150,6 +151,7 @@ pip3 install \ colour \ django-cookie-law \ django-maintenance-mode \ + django-multiupload \ fastnumbers \ geoalchemy2 \ geopy \ @@ -166,9 +168,6 @@ pip3 install \ utm \ > /dev/null || exit 3 -# pip repository version of django-multiupload not compatible with Django 2.1+ yet -pip3 install -e git+https://github.com/Chive/django-multiupload.git#egg=multiupload > /dev/null || exit 3 - # we can't uninstall the Ubuntu python3-pycairo package # due to too many dependencies, but we need to make sure # that we actually use the current pip pacakge to get @@ -183,11 +182,7 @@ gem install --pre asciidoctor-pdf > /dev/null || exit 3 # install extra npm packages banner "npm packages" -curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - -sudo apt-get install -y nodejs - npm config set loglevel warn - npm install -g carto > /dev/null || exit 3 # download / install extra fonts diff --git a/provision.sh b/provision.sh index 26d0bd2..3d99c53 100644 --- a/provision.sh +++ b/provision.sh @@ -97,6 +97,7 @@ fi # add "maposmatic" system user that will own the database and all locally installed stuff useradd --create-home maposmatic +chmod a+rx /home/maposmatic # installing apt, pip and npm packages