websub subcriptions work

2 files changed, 19 insertions, 5 deletions

diff --git a/data/config.php.dist b/data/config.php.dist
index 19a3221..5c3eba8 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -15,10 +15,6 @@ $GLOBALS['phinde'] = array(
     //list of regexes for URLs that should not be crawled
     'crawlBlacklist' => array(
     ),
-    //list of URLs that should be subscribed to with PubSubHubbub
-    'subscriptions' => array(
-        'http://www.example.org/feed',
-    ),
     //verbose output
     'debug' => true,
     //time in seconds after which URLs may be re-indexed
@@ -36,5 +32,9 @@ $GLOBALS['phinde'] = array(
     'hitTemplate' => 'hit.htm',
     //default sort order: "score" or "date"
     'defaultSort' => 'score',
+    //database for PuSH subscriptions
+    'db_dsn' => 'mysql:host=localhost;dbname=phinde',
+    'db_user' => 'FIXME',
+    'db_pass' => 'FIXME',
 );
-?>
\ No newline at end of file
+?>
diff --git a/data/schema.sql b/data/schema.sql
new file mode 100644
index 0000000..7f9312a
--- /dev/null
+++ b/data/schema.sql
@@ -0,0 +1,14 @@
+CREATE TABLE `subscriptions` (
+  `sub_id` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `sub_topic` varchar(4096) NOT NULL,
+  `sub_status` enum('subscribing','active','unsubscribing','unsubscribed','expired','denied') NOT NULL,
+  `sub_lease_seconds` int NOT NULL,
+  `sub_expires` datetime NOT NULL,
+  `sub_secret` varchar(256) NOT NULL,
+  `sub_capkey` varchar(128) NOT NULL,
+  `sub_created` datetime NOT NULL,
+  `sub_updated` datetime NOT NULL,
+  `sub_pings` int NOT NULL,
+  `sub_lastping` datetime NOT NULL,
+  `sub_statusmessage` varchar(512) NOT NULL
+) COMMENT='' COLLATE 'utf8_general_ci';