浏览代码

Install prerequisites for pleroma in social instance

Bob Mottram 7 年前
父节点
当前提交
e729be95a3
共有 3 个文件被更改,包括 15 次插入3 次删除
  1. 12
    0
      src/freedombone-app-pleroma
  2. 1
    1
      src/freedombone-image-customise
  3. 2
    2
      src/freedombone-utils-postgresql

+ 12
- 0
src/freedombone-app-pleroma 查看文件

@@ -938,6 +938,18 @@ function remove_pleroma {
938 938
     remove_ddns_domain "$PLEROMA_DOMAIN_NAME"
939 939
 }
940 940
 
941
+function image_install_pleroma {
942
+    if [[ "$SOCIALINSTANCE" != 'pleroma' ]]; then
943
+        return
944
+    fi
945
+
946
+    # shellcheck disable=SC2154
947
+    chroot "$rootdir" apt-get -yq install wget imagemagick
948
+
949
+    image_install_elixir
950
+    image_install_postgresql
951
+}
952
+
941 953
 function install_pleroma {
942 954
     if [ ! $ONION_ONLY ]; then
943 955
         ONION_ONLY='no'

+ 1
- 1
src/freedombone-image-customise 查看文件

@@ -2158,12 +2158,12 @@ create_generic_image
2158 2158
 atheros_wifi
2159 2159
 continue_installation
2160 2160
 image_install_nodejs
2161
-image_install_elixir
2162 2161
 initialise_mesh
2163 2162
 configure_wifi
2164 2163
 configure_user_interface
2165 2164
 image_setup_utils
2166 2165
 image_install_inadyn
2166
+image_install_pleroma
2167 2167
 image_preinstall_repos
2168 2168
 
2169 2169
 # remove downloaded packages

+ 2
- 2
src/freedombone-utils-postgresql 查看文件

@@ -49,7 +49,7 @@ function get_postgresql_password {
49 49
     fi
50 50
 }
51 51
 
52
-function mesh_install_postgresql {
52
+function image_install_postgresql {
53 53
     # shellcheck disable=SC2154,SC2086
54 54
     chroot "$rootdir" apt-get -yq install $POSTGRESQL_PACKAGES
55 55
 
@@ -66,7 +66,7 @@ function mesh_install_postgresql {
66 66
 
67 67
 function install_postgresql {
68 68
     if [[ $VARIANT == "mesh"* ]]; then
69
-        mesh_install_postgresql
69
+        image_install_postgresql
70 70
         return
71 71
     fi
72 72