Merge branch 'master' into master

This commit is contained in:
celestora 2021-05-14 19:06:03 +03:00 committed by GitHub
commit a14192d0a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions

View file

@ -25,20 +25,16 @@ h3. Installation procedure
"samukhin":https://github.com/samukhin is working on a Docker container that contains a microblog version of OpenVK, see "#76":https://github.com/openvk/openvk/pull/76 for details. (Experimental) "samukhin":https://github.com/samukhin is working on a Docker container that contains a microblog version of OpenVK, see "#76":https://github.com/openvk/openvk/pull/76 for details. (Experimental)
1. Install Composer, Node.js, Yarn and "Chandler":https://github.com/openvk/chandler # Install Composer, Node.js, Yarn and "Chandler":https://github.com/openvk/chandler
2. Install "commitcaptcha":https://github.com/openvk/commitcaptcha and OpenVK as Chandler extensions and enable them like this: # Install "commitcaptcha":https://github.com/openvk/commitcaptcha and OpenVK as Chandler extensions and enable them like this:
@ln -s /path/to/chandler/extensions/available/commitcaptcha /path/to/chandler/extensions/enabled/@
@ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions/enabled/@
ln -s /path/to/chandler/extensions/available/commitcaptcha /path/to/chandler/extensions/enabled/ # Import install/init-static-db.sql to *same database* you installed Chandler to
ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions/enabled/ # Import install/init-event-db.sql to *separate database*
# Rename openvk-example.yml to openvk.yml and change options
# Run @composer install@ in OpenVK directory
3. Import install/init-static-db.sql to *same database* you installed Chandler to # Move to Web/static/js and execute @yarn install@
4. Import install/init-event-db.sql to *separate database* # Set openvk as your root app in chandler.yml
5. Rename openvk-example.yml to openvk.yml and change options
6. Run @composer install@ in OpenVK directory
7. Move to Web/static/js and execute @yarn install@
8. Set openvk as your root app in chandler.yml
Once you are done, you can login as a system administrator on the network itself (no registration required): Once you are done, you can login as a system administrator on the network itself (no registration required):
* *Login*: admin@localhost.localdomain6 * *Login*: admin@localhost.localdomain6

View file

@ -301,6 +301,19 @@ CREATE TABLE subscriptions_new (
`updated` bigint(20) UNSIGNED NOT NULL `updated` bigint(20) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
CREATE TABLE subscriptions_new (
`handle` bigint(20) UNSIGNED NOT NULL,
`initiator` bigint(20) UNSIGNED NOT NULL,
`targetModel` varchar(128) COLLATE utf8mb4_unicode_nopad_ci NOT NULL,
`targetId` bigint(20) NOT NULL,
`targetWallHandle` bigint(20) NOT NULL,
`shortStatus` tinyint(3) UNSIGNED NOT NULL DEFAULT 1,
`detailedStatus` tinyint(3) UNSIGNED NOT NULL DEFAULT 1,
`listName` varchar(64) COLLATE utf8mb4_unicode_nopad_ci DEFAULT NULL,
`created` bigint(20) UNSIGNED NOT NULL,
`updated` bigint(20) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_nopad_ci;
CREATE TABLE `tickets` ( CREATE TABLE `tickets` (
`id` bigint(20) UNSIGNED NOT NULL, `id` bigint(20) UNSIGNED NOT NULL,
`type` bigint(20) UNSIGNED NOT NULL, `type` bigint(20) UNSIGNED NOT NULL,