summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Eefting <edwin@datux.nl>2012-12-24 01:32:02 (GMT)
committer Edwin Eefting <edwin@datux.nl>2012-12-24 01:32:02 (GMT)
commit5fce51e874c06f6ae72e8588e4e9606a415c78d2 (patch)
treee3ea2d8c1fdbc9a1cc14c2bf6815fefc07baf6a5
parent651796be75a2023283225440eb60c3d45bbb86e2 (diff)
fixes for asterisk
-rw-r--r--etc/synapse/asterisk.conf6
-rw-r--r--etc/synapse/twitter.conf7
-rw-r--r--modules/play_vlc.module/CMakeLists.txt39
-rw-r--r--wwwdir/asterisk.html3
-rw-r--r--wwwdir/asterisk_admin.html2
5 files changed, 10 insertions, 47 deletions
diff --git a/etc/synapse/asterisk.conf b/etc/synapse/asterisk.conf
index d2b1bbe..e854271 100644
--- a/etc/synapse/asterisk.conf
+++ b/etc/synapse/asterisk.conf
@@ -6,9 +6,9 @@
"password" :"f39tgvp095vcnek3"
},
"datux":{
- "host" :"192.168.13.2",
+ "host" :"10.73.57.2",
"port" :"5038",
- "username" :"synapse",
- "password" :"f39tgvp095vcnek3"
+ "username" :"admin",
+ "password" :"syn3"
}
}
diff --git a/etc/synapse/twitter.conf b/etc/synapse/twitter.conf
index 6f25a18..27a8f7b 100644
--- a/etc/synapse/twitter.conf
+++ b/etc/synapse/twitter.conf
@@ -1,7 +1,8 @@
{
+ "follow" : "",
"oauth_consumer_key" : "YIyB365DDbAoTxharudPDw",
"oauth_consumer_key_secret" : "CpPpwAnXfEbVkdwG2RU49JrIu9Ay5AgjdiD5E5jE",
- "oauth_token" : "67362552-IhR99sPZAhLt5hql75aJQdLlVkXz4YEdaQ3Vs4FPf",
- "oauth_token_secret" : "J35BSkWo1nXPjMYgn3BXW2mnGTnYCQR8WLrpDWzp3u0",
- "reconnect_time":10
+ "oauth_token" : "216519907-fkW94CDLs14Qq0ehwwQMi3HAkCn5NhuKSbiLkNEP",
+ "oauth_token_secret" : "5neBjA1fSIXlCQoWrZd2WHKZ0LPmwbKOTzQkEdgW2MI",
+ "reconnect_time" : 10
} \ No newline at end of file
diff --git a/modules/play_vlc.module/CMakeLists.txt b/modules/play_vlc.module/CMakeLists.txt
deleted file mode 100644
index 141205d..0000000
--- a/modules/play_vlc.module/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-#this is just a basic CMakeLists.txt, for more information see the cmake manpage
-
-cmake_minimum_required(VERSION 2.6)
-
-#Determine name of the .so module:
-#A module should always be in a modulename.module directory!.
-string(REGEX REPLACE ".*/([^/]*).module$" "\\1" module_name "${CMAKE_CURRENT_BINARY_DIR}")
-MESSAGE(STATUS "Module name of ${CMAKE_CURRENT_BINARY_DIR} is: '${module_name}'")
-
-
-#we really at least need 1.1.x, since the API has changed
-INCLUDE(FindPkgConfig)
-pkg_check_modules (VLC libvlc>=1.1.0)
-IF(VLC_FOUND)
-
-
- #add definitions, compiler switches, etc.
- ADD_DEFINITIONS()
-
-
- #automaticly add all sourcefiles to current module
- file(GLOB sources *.cpp)
- ADD_LIBRARY(${module_name} MODULE ${sources})
-
- #need to link to some other libraries ? just add them here
- TARGET_LINK_LIBRARIES(${module_name} vlc)
-
- INCLUDE_DIRECTORIES(../..)
-
- #add an install target here
- #INSTALL_FILES(...)
- #INSTALL_PROGRAMS(...)
- #INSTALL_TARGET(...)
-ELSE(VLC_FOUND)
- MESSAGE(WARNING "vlc libraries not found, not building ${module_name}")
-
-
-ENDIF(VLC_FOUND)
-
diff --git a/wwwdir/asterisk.html b/wwwdir/asterisk.html
index af6d1b3..1da8d79 100644
--- a/wwwdir/asterisk.html
+++ b/wwwdir/asterisk.html
@@ -17,7 +17,8 @@
</script>
-->
- <script type="text/javascript" src="synapse.js"></script>
+ <script type="text/javascript" src="synapse/synapse.js"></script>
+ <script type="text/javascript" src="synapse/common.js"></script>
<script type="text/javascript">
diff --git a/wwwdir/asterisk_admin.html b/wwwdir/asterisk_admin.html
index 3e690a9..b79c0b4 100644
--- a/wwwdir/asterisk_admin.html
+++ b/wwwdir/asterisk_admin.html
@@ -6,7 +6,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>Asterisk admin page</title>
- <script type="text/javascript" src="synapse.js"></script>
+ <script type="text/javascript" src="synapse/synapse.js"></script>
<script type="text/javascript">