Browse Source

Install dokuwiki from repo

Since it isn't packaged for debian stretch
Bob Mottram 8 years ago
parent
commit
30cab4d59f
2 changed files with 166 additions and 127 deletions
  1. 165
    126
      src/freedombone-app-dokuwiki
  2. 1
    1
      src/freedombone-app-hubzilla

+ 165
- 126
src/freedombone-app-dokuwiki View File

34
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
35
 
35
 
36
 DOKUWIKI_DOMAIN_NAME=
36
 DOKUWIKI_DOMAIN_NAME=
37
-DOKUWIKI_ADMIN_PASSWORD=
38
-DOKUWIKI_TITLE="${PROJECT_NAME} Dokuwiki"
39
 DOKUWIKI_CODE=
37
 DOKUWIKI_CODE=
40
 DOKUWIKI_ONION_PORT=8089
38
 DOKUWIKI_ONION_PORT=8089
39
+DOKUWIKI_ADMIN_PASSWORD=
40
+DOKUWIKI_TITLE="${PROJECT_NAME} Dokuwiki"
41
+
42
+DOKUWIKI_REPO="https://github.com/splitbrain/dokuwiki"
43
+DOKUWIKI_COMMIT='be15c01c0b982cf1a75b5af031bf077143c63f39'
41
 
44
 
42
 dokuwiki_variables=(ONION_ONLY
45
 dokuwiki_variables=(ONION_ONLY
43
                     MY_USERNAME
46
                     MY_USERNAME
63
     curr_username="$1"
66
     curr_username="$1"
64
     new_user_password="$2"
67
     new_user_password="$2"
65
 
68
 
66
-    if grep "$curr_username:" /var/lib/dokuwiki/acl/users.auth.php; then
69
+    DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
70
+    if grep "$curr_username:" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php; then
67
         HASHED_DOKUWIKI_PASSWORD=$(echo -n "$new_user_password" | md5sum | awk -F ' ' '{print $1}')
71
         HASHED_DOKUWIKI_PASSWORD=$(echo -n "$new_user_password" | md5sum | awk -F ' ' '{print $1}')
68
-        existing_user=$(cat /var/lib/dokuwiki/acl/users.auth.php | grep "$curr_username:" | hean -n 1)
72
+        existing_user=$(cat /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php | grep "$curr_username:" | hean -n 1)
69
         if [[ "$existing_user" == *":admin,"* ]]; then
73
         if [[ "$existing_user" == *":admin,"* ]]; then
70
-            sed -i "s|$curr_username:.*|$curr_username:$HASHED_DOKUWIKI_PASSWORD:$curr_username:$curr_username@$HOSTNAME:admin,user,upload|g" /var/lib/dokuwiki/acl/users.auth.php
74
+            sed -i "s|$curr_username:.*|$curr_username:$HASHED_DOKUWIKI_PASSWORD:$curr_username:$curr_username@$HOSTNAME:admin,user,upload|g" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
71
         else
75
         else
72
-            sed -i "s|$curr_username:.*|$curr_username:$HASHED_DOKUWIKI_PASSWORD:$curr_username:$curr_username@$HOSTNAME:user,upload|g" /var/lib/dokuwiki/acl/users.auth.php
76
+            sed -i "s|$curr_username:.*|$curr_username:$HASHED_DOKUWIKI_PASSWORD:$curr_username:$curr_username@$HOSTNAME:user,upload|g" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
73
         fi
77
         fi
74
-        chmod 640 /var/lib/dokuwiki/acl/users.auth.php
78
+        chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
75
         ${PROJECT_NAME}-pass -u $curr_username -a dokuwiki -p "$new_user_password"
79
         ${PROJECT_NAME}-pass -u $curr_username -a dokuwiki -p "$new_user_password"
76
     fi
80
     fi
77
 }
81
 }
80
     new_username="$1"
84
     new_username="$1"
81
     new_user_password="$2"
85
     new_user_password="$2"
82
 
86
 
87
+    DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
83
     HASHED_DOKUWIKI_PASSWORD=$(echo -n "$new_user_password" | md5sum | awk -F ' ' '{print $1}')
88
     HASHED_DOKUWIKI_PASSWORD=$(echo -n "$new_user_password" | md5sum | awk -F ' ' '{print $1}')
84
-    echo "$new_username:$HASHED_DOKUWIKI_PASSWORD:$new_username:$new_username@$HOSTNAME:user,upload" >> /var/lib/dokuwiki/acl/users.auth.php
85
-    chmod 640 /var/lib/dokuwiki/acl/users.auth.php
89
+    echo "$new_username:$HASHED_DOKUWIKI_PASSWORD:$new_username:$new_username@$HOSTNAME:user,upload" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
90
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
86
     ${PROJECT_NAME}-pass -u "$new_username" -a dokuwiki -p "$new_user_password"
91
     ${PROJECT_NAME}-pass -u "$new_username" -a dokuwiki -p "$new_user_password"
87
 }
92
 }
88
 
93
 
89
 function remove_user_dokuwiki {
94
 function remove_user_dokuwiki {
90
     remove_username="$1"
95
     remove_username="$1"
91
 
96
 
92
-    if grep "$remove_username:" /var/lib/dokuwiki/acl/users.auth.php; then
93
-        sed -i "/$remove_username:/d" /var/lib/dokuwiki/acl/users.auth.php
97
+    read_config_param "DOKUWIKI_DOMAIN_NAME"
98
+    if grep "$remove_username:" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php; then
99
+        sed -i "/$remove_username:/d" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
94
         ${PROJECT_NAME}-pass -u "$remove_username" --rmapp dokuwiki
100
         ${PROJECT_NAME}-pass -u "$remove_username" --rmapp dokuwiki
95
     fi
101
     fi
96
 }
102
 }
100
 }
106
 }
101
 
107
 
102
 function upgrade_dokuwiki {
108
 function upgrade_dokuwiki {
103
-    echo -n ''
109
+    function_check set_repo_commit
110
+    set_repo_commit /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs "dokuwiki commit" "$DOKUWIKI_COMMIT" $DOKUWIKI_REPO
104
 }
111
 }
105
 
112
 
106
 function backup_local_dokuwiki {
113
 function backup_local_dokuwiki {
107
-    source_directory=/var/lib/dokuwiki
114
+    DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
115
+
116
+    function_check backup_directory_to_usb
117
+
118
+    # backup the data
119
+    source_directory=/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
108
     if [ -d $source_directory ]; then
120
     if [ -d $source_directory ]; then
109
-        dest_directory=dokuwiki
110
-        function_check backup_directory_to_usb
121
+        dest_directory=dokuwikidat
122
+        backup_directory_to_usb $source_directory $dest_directory
123
+    fi
124
+
125
+    # backup the users
126
+    source_directory=/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl
127
+    if [ -d $source_directory ]; then
128
+        dest_directory=dokuwikiacl
111
         backup_directory_to_usb $source_directory $dest_directory
129
         backup_directory_to_usb $source_directory $dest_directory
112
-        backup_directory_to_usb /etc/dokuwiki dokuwiki2
113
     fi
130
     fi
114
 }
131
 }
115
 
132
 
116
-function restore_local_dokuwiki {
133
+function restore_local_dokuwiki_legacy {
117
     if [ -d /var/lib/dokuwiki ]; then
134
     if [ -d /var/lib/dokuwiki ]; then
118
-        echo $"Restoring Dokuwiki installation"
135
+        echo $"Restoring Legacy Dokuwiki installation"
119
         function_check get_completion_param
136
         function_check get_completion_param
120
         DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
137
         DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
138
+
121
         temp_restore_dir=/root/tempdokuwiki
139
         temp_restore_dir=/root/tempdokuwiki
122
         function_check restore_directory_from_usb
140
         function_check restore_directory_from_usb
123
         if [ -d ${USB_MOUNT}/backup/dokuwiki ]; then
141
         if [ -d ${USB_MOUNT}/backup/dokuwiki ]; then
125
         else
143
         else
126
             restore_directory_from_usb ${temp_restore_dir} wiki
144
             restore_directory_from_usb ${temp_restore_dir} wiki
127
         fi
145
         fi
128
-        cp -r ${temp_restore_dir}/var/lib/dokuwiki/* /var/lib/dokuwiki/
146
+
147
+        # restore the data
148
+        cp -r ${temp_restore_dir}/var/lib/dokuwiki/data/* /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
129
         if [ ! "$?" = "0" ]; then
149
         if [ ! "$?" = "0" ]; then
130
             function_check restore_directory_from_usb
150
             function_check restore_directory_from_usb
131
             set_user_permissions
151
             set_user_permissions
132
             function_check backup_unmount_drive
152
             function_check backup_unmount_drive
133
             backup_unmount_drive
153
             backup_unmount_drive
134
-            exit 868
135
-        fi
136
-        if [ -d ${USB_MOUNT}/backup/wiki2 ]; then
137
-            restore_directory_from_usb ${temp_restore_dir}2 wiki2
138
-        else
139
-            restore_directory_from_usb ${temp_restore_dir}2 dokuwiki2
154
+            rm -rf ${temp_restore_dir}
155
+            exit 73562
140
         fi
156
         fi
141
-        cp -r ${temp_restore_dir}2/etc/dokuwiki/* /etc/dokuwiki/
157
+
158
+        # restore the users
159
+        cp -r ${temp_restore_dir}/var/lib/dokuwiki/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl
142
         if [ ! "$?" = "0" ]; then
160
         if [ ! "$?" = "0" ]; then
143
-            function_check set_user_permissions
161
+            function_check restore_directory_from_usb
144
             set_user_permissions
162
             set_user_permissions
145
             function_check backup_unmount_drive
163
             function_check backup_unmount_drive
146
             backup_unmount_drive
164
             backup_unmount_drive
147
-            exit 869
165
+            rm -rf ${temp_restore_dir}
166
+            exit 23985
148
         fi
167
         fi
149
         rm -rf ${temp_restore_dir}
168
         rm -rf ${temp_restore_dir}
150
-        rm -rf ${temp_restore_dir}2
151
-        #rm -rf /var/lib/dokuwiki/data/cache/*
152
-        #rm -rf /var/lib/dokuwiki/data/meta/*
153
-        chmod -R 755 /var/lib/dokuwiki/data
154
-        chown -R www-data:www-data /var/lib/dokuwiki/data
155
-        chown -R www-data:www-data /var/lib/dokuwiki/*
156
-        # Ensure that the bundled SSL cert is being used
157
-        if [ -f /etc/ssl/certs/${DOKUWIKI_DOMAIN_NAME}.bundle.crt ]; then
158
-            sed -i "s|${DOKUWIKI_DOMAIN_NAME}.crt|${DOKUWIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${DOKUWIKI_DOMAIN_NAME}
159
-        fi
160
-        if [ -d /etc/letsencrypt/live/${DOKUWIKI_DOMAIN_NAME} ]; then
161
-            ln -s /etc/letsencrypt/live/${DOKUWIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${DOKUWIKI_DOMAIN_NAME}.key
162
-            ln -s /etc/letsencrypt/live/${DOKUWIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${DOKUWIKI_DOMAIN_NAME}.pem
163
-        fi
164
-        echo $"Restore of Dokuwiki complete"
169
+
170
+        chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
171
+        chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
172
+        chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
173
+        echo $"Restore of Legacy Dokuwiki complete"
165
     fi
174
     fi
166
 }
175
 }
167
 
176
 
177
+function restore_local_dokuwiki {
178
+    if [ -d ${USB_MOUNT}/backup/dokuwiki ]; then
179
+        restore_local_dokuwiki_legacy
180
+        return
181
+    fi
182
+
183
+    echo $"Restoring Dokuwiki installation"
184
+    function_check get_completion_param
185
+    DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
186
+
187
+    # restore the data
188
+    temp_restore_dir=/root/tempdokuwikidat
189
+    function_check restore_directory_from_usb
190
+    restore_directory_from_usb ${temp_restore_dir} dokuwikidat
191
+    cp -r ${temp_restore_dir}/var/www/${DOKUWIKI_DOMAIN_NAME}/htdocs/data/* /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
192
+    if [ ! "$?" = "0" ]; then
193
+        function_check restore_directory_from_usb
194
+        set_user_permissions
195
+        function_check backup_unmount_drive
196
+        backup_unmount_drive
197
+        rm -rf ${temp_restore_dir}
198
+        exit 683352
199
+    fi
200
+    rm -rf ${temp_restore_dir}
201
+
202
+    # restore the users
203
+    temp_restore_dir=/root/tempdokuwikiacl
204
+    function_check restore_directory_from_usb
205
+    restore_directory_from_usb ${temp_restore_dir} dokuwikiacl
206
+    cp -r ${temp_restore_dir}/var/www/${DOKUWIKI_DOMAIN_NAME}/htdocs/lib/plugins/acl/users.auth.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl
207
+    if [ ! "$?" = "0" ]; then
208
+        function_check restore_directory_from_usb
209
+        set_user_permissions
210
+        function_check backup_unmount_drive
211
+        backup_unmount_drive
212
+        rm -rf ${temp_restore_dir}
213
+        exit 456495
214
+    fi
215
+    rm -rf ${temp_restore_dir}
216
+
217
+    chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
218
+    chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
219
+    chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
220
+    echo $"Restore of Dokuwiki complete"
221
+}
222
+
168
 function backup_remote_dokuwiki {
223
 function backup_remote_dokuwiki {
169
-    if [ -d /etc/dokuwiki ]; then
224
+    DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
225
+    if [ -d /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs ]; then
170
         echo $"Backing up dokuwiki"
226
         echo $"Backing up dokuwiki"
171
-        backup_directory_to_friend /var/lib/dokuwiki dokuwiki
172
-        backup_directory_to_friend /etc/dokuwiki dokuwiki2
227
+        backup_directory_to_friend /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data dokuwikidat
228
+        backup_directory_to_friend /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl dokuwikiacl
173
     fi
229
     fi
174
 }
230
 }
175
 
231
 
176
 function restore_remote_dokuwiki {
232
 function restore_remote_dokuwiki {
177
-    if [ -d $SERVER_DIRECTORY/backup/dokuwiki ]; then
178
-        function_check get_completion_param
179
-        DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
180
-        echo $"Restoring Dokuwiki installation $DOKUWIKI_DOMAIN_NAME"
181
-        function_check restore_directory_from_friend
182
-        restore_directory_from_friend /root/tempdokuwiki dokuwiki
183
-        cp -r /root/tempdokuwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/
233
+    DOKUWIKI_DOMAIN_NAME=$(get_completion_param "dokuwiki domain")
234
+    function_check get_completion_param
235
+    function_check restore_directory_from_friend
236
+
237
+    if [ -d $SERVER_DIRECTORY/backup/dokuwikidat ]; then
238
+        echo $"Restoring Dokuwiki data for $DOKUWIKI_DOMAIN_NAME"
239
+        restore_directory_from_friend /root/tempdokuwikidat dokuwikidat
240
+        cp -r /root/tempdokuwikidat/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/* /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/
184
         if [ ! "$?" = "0" ]; then
241
         if [ ! "$?" = "0" ]; then
185
-            exit 868
242
+            exit 92634
186
         fi
243
         fi
187
-        restore_directory_from_friend /root/tempdokuwiki2 dokuwiki2
188
-        cp -r /root/tempdokuwiki2/etc/dokuwiki/* /etc/dokuwiki/
244
+        rm -rf /root/tempdokuwikidat
245
+
246
+        echo $"Restore of Dokuwiki data complete"
247
+    fi
248
+
249
+    if [ -d $SERVER_DIRECTORY/backup/dokuwikiacl ]; then
250
+        echo $"Restoring Dokuwiki users for $DOKUWIKI_DOMAIN_NAME"
251
+        restore_directory_from_friend /root/tempdokuwikiacl dokuwikiacl
252
+        cp -r /root/tempdokuwikidat/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/* /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/
189
         if [ ! "$?" = "0" ]; then
253
         if [ ! "$?" = "0" ]; then
190
-            exit 869
254
+            exit 735287
191
         fi
255
         fi
192
-        rm -rf /root/tempdokuwiki
193
-        rm -rf /root/tempdokuwiki2
194
-        #rm -rf /var/lib/dokuwiki/data/cache/*
195
-        #rm -rf /var/lib/dokuwiki/data/meta/*
196
-        chmod -R 755 /var/lib/dokuwiki/data
197
-        chown -R www-data:www-data /var/lib/dokuwiki/data
198
-        chown -R www-data:www-data /var/lib/dokuwiki/*
199
-        # Ensure that the bundled SSL cert is being used
200
-        if [ -f /etc/ssl/certs/${DOKUWIKI_DOMAIN_NAME}.bundle.crt ]; then
201
-            sed -i "s|${DOKUWIKI_DOMAIN_NAME}.crt|${DOKUWIKI_DOMAIN_NAME}.bundle.crt|g" /etc/nginx/sites-available/${DOKUWIKI_DOMAIN_NAME}
202
-        fi
203
-        if [ -d /etc/letsencrypt/live/${DOKUWIKI_DOMAIN_NAME} ]; then
204
-            ln -s /etc/letsencrypt/live/${DOKUWIKI_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${DOKUWIKI_DOMAIN_NAME}.key
205
-            ln -s /etc/letsencrypt/live/${DOKUWIKI_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${DOKUWIKI_DOMAIN_NAME}.pem
206
-        fi
207
-        echo $"Restore of Dokuwiki complete"
256
+        rm -rf /root/tempdokuwikiacl
257
+
258
+        echo $"Restore of Dokuwiki users complete"
208
     fi
259
     fi
260
+
261
+    chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/data
262
+    chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/lib
263
+    chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
209
 }
264
 }
210
 
265
 
211
 function remove_dokuwiki {
266
 function remove_dokuwiki {
219
     if [ -f /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME ]; then
274
     if [ -f /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME ]; then
220
         rm /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
275
         rm /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
221
     fi
276
     fi
222
-    apt-get -yq remove --purge dokuwiki
223
     if [ ! -d /var/www/$DOKUWIKI_DOMAIN_NAME ]; then
277
     if [ ! -d /var/www/$DOKUWIKI_DOMAIN_NAME ]; then
224
         rm -rf /var/www/$DOKUWIKI_DOMAIN_NAME
278
         rm -rf /var/www/$DOKUWIKI_DOMAIN_NAME
225
     fi
279
     fi
244
     if [ ! $DOKUWIKI_DOMAIN_NAME ]; then
298
     if [ ! $DOKUWIKI_DOMAIN_NAME ]; then
245
         return
299
         return
246
     fi
300
     fi
247
-    apt-get -yq install dokuwiki
248
-    apt-get -yq remove --purge apache*
249
-    if [ -d /etc/apache2 ]; then
250
-        rm -rf /etc/apache2
251
-        echo $'Removed Apache installation after Dokuwiki install'
252
-    fi
301
+
302
+    apt-get -yq install php-common php-cli php-curl php-gd php-mcrypt git
303
+    apt-get -yq install php-dev imagemagick php-imagick libfcgi0ldbl
304
+    apt-get -yq install php-memcached memcached
253
 
305
 
254
     if [ ! -d /var/www/$DOKUWIKI_DOMAIN_NAME ]; then
306
     if [ ! -d /var/www/$DOKUWIKI_DOMAIN_NAME ]; then
255
         mkdir /var/www/$DOKUWIKI_DOMAIN_NAME
307
         mkdir /var/www/$DOKUWIKI_DOMAIN_NAME
256
     fi
308
     fi
257
-    if [ -d /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs ]; then
258
-        rm -rf /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
259
-    fi
260
 
309
 
261
-    ln -s /usr/share/dokuwiki /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
310
+    if [ ! -f /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/install.php ]; then
311
+        cd /var/www/$DOKUWIKI_DOMAIN_NAME
312
+        function_check git_clone
313
+        git_clone $DOKUWIKI_REPO /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
314
+        cd /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
315
+        git checkout $DOKUWIKI_COMMIT -b $DOKUWIKI_COMMIT
316
+        set_completion_param "dokuwiki commit" "$DOKUWIKI_COMMIT"
262
 
317
 
263
-    if [ ! -d /var/lib/dokuwiki/custom ]; then
264
-        mkdir /var/lib/dokuwiki/custom
265
     fi
318
     fi
266
-    cp /etc/dokuwiki/local.php.dist /var/lib/dokuwiki/custom/local.php
267
-    if [ ! -f /etc/dokuwiki/local.php ]; then
268
-        ln -s /var/lib/dokuwiki/custom/local.php /etc/dokuwiki/local.php
269
-    fi
270
-
271
-    chown www-data /var/lib/dokuwiki/custom
272
-    chown www-data /var/lib/dokuwiki/custom/local.php
273
-    chown -R www-data /etc/dokuwiki
274
-    chown -R www-data /usr/share/dokuwiki/lib/
275
-    chmod 600 /var/lib/dokuwiki/custom/local.php
276
-    chmod -R 755 /usr/share/dokuwiki/lib
277
-
278
-    sed -i 's|//$conf|$conf|g' /var/lib/dokuwiki/custom/local.php
279
-    sed -i "s|joe|$MY_USERNAME|g" /var/lib/dokuwiki/custom/local.php
280
-
281
-    sed -i "s|Debian Dokuwiki|$DOKUWIKI_TITLE|g" /etc/dokuwiki/local.php
282
-    sed -i "s|Debian DokuWiki|$DOKUWIKI_TITLE|g" /etc/dokuwiki/local.php
283
 
319
 
284
-    # set the admin user
285
-    sed -i "s/@admin/$MY_USERNAME/g" /etc/dokuwiki/local.php
286
-
287
-    # disallow registration of new users
288
-    if ! grep -q "disableactions" /etc/dokuwiki/local.php; then
289
-        echo "\$conf['disableactions'] = 'register';" >> /etc/dokuwiki/local.php
290
-    fi
291
-    if ! grep -q "disableactions" /var/lib/dokuwiki/custom/local.php; then
292
-        echo "\$conf['disableactions'] = 'register';" >> /var/lib/dokuwiki/custom/local.php
320
+    apt-get -yq remove --purge apache*
321
+    if [ -d /etc/apache2 ]; then
322
+        rm -rf /etc/apache2
323
+        echo $'Removed Apache installation after Dokuwiki install'
293
     fi
324
     fi
294
 
325
 
295
-    if ! grep -q "authtype" /var/lib/dokuwiki/custom/local.php; then
296
-        echo "\$conf['authtype'] = 'authplain';" >> /var/lib/dokuwiki/custom/local.php
297
-    fi
298
-    if ! grep -q "authtype" /etc/dokuwiki/local.php; then
299
-        echo "\$conf['authtype'] = 'authplain';" >> /etc/dokuwiki/local.php
300
-    fi
326
+    echo '<?php' > /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
327
+    echo "\$conf['title'] = '${DOKUWIKI_TITLE}';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
328
+    echo "\$conf['license'] = 'cc-by-sa';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
329
+    echo "\$conf['useacl'] = 1;" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
330
+    echo "\$conf['superuser'] = '${MY_USERNAME}';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
331
+    echo "\$conf['disableactions'] = 'register';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
332
+    echo "\$conf['plugin']['authmysql']['TablesToLock'] = array();" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
333
+    echo "\$conf['authtype'] = 'authplain';" >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
334
+    ln -s /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/local.php
335
+
336
+    chmod 600 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/local.php
337
+    chown -R www-data:www-data /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs
338
+    chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib
339
+    chmod -R 755 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data
301
 
340
 
302
     if [ -f $IMAGE_PASSWORD_FILE ]; then
341
     if [ -f $IMAGE_PASSWORD_FILE ]; then
303
         DOKUWIKI_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
342
         DOKUWIKI_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
307
         fi
346
         fi
308
     fi
347
     fi
309
     HASHED_DOKUWIKI_PASSWORD=$(echo -n "$DOKUWIKI_ADMIN_PASSWORD" | md5sum | awk -F ' ' '{print $1}')
348
     HASHED_DOKUWIKI_PASSWORD=$(echo -n "$DOKUWIKI_ADMIN_PASSWORD" | md5sum | awk -F ' ' '{print $1}')
310
-    echo -n "$MY_USERNAME:$HASHED_DOKUWIKI_PASSWORD:$MY_NAME:$MY_EMAIL:admin,user,upload" > /var/lib/dokuwiki/acl/users.auth.php
311
-    chmod 640 /var/lib/dokuwiki/acl/users.auth.php
349
+    echo -n "$MY_USERNAME:$HASHED_DOKUWIKI_PASSWORD:$MY_NAME:$MY_EMAIL:admin,user,upload" > /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
350
+    chmod 640 /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/users.auth.php
312
 
351
 
313
-    if ! grep -q "video/ogg" /etc/dokuwiki/mime.conf; then
314
-        echo 'ogv     video/ogg' >> /etc/dokuwiki/mime.conf
352
+    if ! grep -q "video/ogg" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf; then
353
+        echo 'ogv     video/ogg' >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf
315
     fi
354
     fi
316
-    if ! grep -q "video/mp4" /etc/dokuwiki/mime.conf; then
317
-        echo 'mp4     video/mp4' >> /etc/dokuwiki/mime.conf
355
+    if ! grep -q "video/mp4" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf; then
356
+        echo 'mp4     video/mp4' >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf
318
     fi
357
     fi
319
-    if ! grep -q "video/webm" /etc/dokuwiki/mime.conf; then
320
-        echo 'webm    video/webm' >> /etc/dokuwiki/mime.conf
358
+    if ! grep -q "video/webm" /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf; then
359
+        echo 'webm    video/webm' >> /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/conf/mime.conf
321
     fi
360
     fi
322
 
361
 
323
     DOKUWIKI_ONION_HOSTNAME=$(add_onion_service dokuwiki 80 ${DOKUWIKI_ONION_PORT})
362
     DOKUWIKI_ONION_HOSTNAME=$(add_onion_service dokuwiki 80 ${DOKUWIKI_ONION_PORT})

+ 1
- 1
src/freedombone-app-hubzilla View File

321
 
321
 
322
     apt-get -yq install php-common php-cli php-curl php-gd php-mysql php-mcrypt git
322
     apt-get -yq install php-common php-cli php-curl php-gd php-mysql php-mcrypt git
323
     apt-get -yq install php-dev imagemagick php-imagick libfcgi0ldbl
323
     apt-get -yq install php-dev imagemagick php-imagick libfcgi0ldbl
324
-    apt-get -yq install php-memcached
324
+    apt-get -yq install php-memcached memcached
325
 
325
 
326
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
326
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
327
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME
327
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME