diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt index cfb3febd1b5ddc8ef683f82fa3fa8bbd488f7a2e..f71d700eb033884e598fe67230c319d708e81181 100755 --- a/akka-bbb-apps/build.sbt +++ b/akka-bbb-apps/build.sbt @@ -76,4 +76,6 @@ daemonUser in Linux := user // group which will execute the application daemonGroup in Linux := group +javaOptions in Universal ++= Seq("-J-Xms130m", "-J-Xmx256m", "-Dconfig.file=conf/application.conf") + debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash") diff --git a/akka-bbb-apps/run.sh b/akka-bbb-apps/run.sh index fb253febdd48027f6337030036ed2384a76c1714..3e24e4cf0a4fe68b386aff857a8c6cf2d051f5fd 100755 --- a/akka-bbb-apps/run.sh +++ b/akka-bbb-apps/run.sh @@ -1 +1,6 @@ -sbt clean run +#!/usr/bin/env bash + +sbt clean stage +sudo service bbb-apps-akka stop +cd target/universal/stage +./bin/bbb-apps-akka diff --git a/akka-bbb-apps/src/main/resources/application.conf b/akka-bbb-apps/src/main/resources/application.conf deleted file mode 100755 index 591f22a88f5ef2613020407b8dc6f493bb6cf046..0000000000000000000000000000000000000000 --- a/akka-bbb-apps/src/main/resources/application.conf +++ /dev/null @@ -1,93 +0,0 @@ -akka { - actor { - debug { - # enable DEBUG logging of all AutoReceiveMessages (Kill, PoisonPill et.c.) - autoreceive = on - # enable DEBUG logging of actor lifecycle changes - lifecycle = on - } - } - loggers = ["akka.event.slf4j.Slf4jLogger"] - loglevel = "DEBUG" - - redis-publish-worker-dispatcher { - mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox" - # Throughput defines the maximum number of messages to be - # processed per actor before the thread jumps to the next actor. - # Set to 1 for as fair as possible. - throughput = 512 - } - - redis-subscriber-worker-dispatcher { - mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox" - # Throughput defines the maximum number of messages to be - # processed per actor before the thread jumps to the next actor. - # Set to 1 for as fair as possible. - throughput = 512 - } -} - -redis { - host="127.0.0.1" - port=6379 - password="" - # recording keys should expire in 14 days - keyExpiry=1209600 -} - -expire { - # time in seconds - lastUserLeft = 60 - neverJoined = 300 -} - -services { - bbbWebAPI = "http://192.168.23.33/bigbluebutton/api" - sharedSecret = "changeme" -} - -red5 { - deskshareip="10.130.218.89" - deskshareapp="video-broadcast" -} - -eventBus { - meetingManagerChannel = "MeetingManagerChannel" - outMessageChannel = "OutgoingMessageChannel" - incomingJsonMsgChannel = "IncomingJsonMsgChannel" - outBbbMsgMsgChannel = "OutBbbMsgChannel" -} - -sharedNotes { - maxNumberOfNotes = 3 - maxNumberOfUndos = 30 -} - -http { - interface = "0.0.0.0" - port = 9999 -} - -services { - telizeHost = "www.telize.com" - telizePort = 80 -} - -apps { - checkPermissions = true - endMeetingWhenNoMoreAuthedUsers = false - endMeetingWhenNoMoreAuthedUsersAfterMinutes = 2 -} - -voiceConf { - recordPath = "/var/freeswitch/meetings" -} - -recording { - chapterBreakLengthInMinutes = 180 -} - -whiteboard { - multiUserDefault = false -} - diff --git a/akka-bbb-apps/src/main/resources/logback.xml b/akka-bbb-apps/src/main/resources/logback.xml deleted file mode 100755 index 08455532747c4379ccce6eca3ce211a3bd9cca2d..0000000000000000000000000000000000000000 --- a/akka-bbb-apps/src/main/resources/logback.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> -<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX"} %-5level %logger{35} - %msg%n</Pattern> - </layout> -</appender> - - <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <File>logs/bbb-apps-akka.log</File> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <FileNamePattern>logs/bbb-apps-akka.%d{yyyy-MM-dd}.log</FileNamePattern> - <!-- keep 14 days worth of history --> - <MaxHistory>14</MaxHistory> - </rollingPolicy> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX"} %-5level %logger{35} - %msg%n</Pattern> - </layout> - </appender> - - <logger name="akka" level="INFO" /> - <logger name="org.bigbluebutton" level="DEBUG" /> - <logger name="io.lettuce" level="INFO" /> - - <root level="DEBUG"> - <appender-ref ref="STDOUT"/> - <appender-ref ref="FILE" /> - </root> - -</configuration> diff --git a/akka-bbb-apps/src/universal/conf/application.ini b/akka-bbb-apps/src/universal/conf/application.ini deleted file mode 100644 index fd2def1422e02c232613e5ac925ebd482d0e4508..0000000000000000000000000000000000000000 --- a/akka-bbb-apps/src/universal/conf/application.ini +++ /dev/null @@ -1,42 +0,0 @@ -# ################################# -# ##### Default configuration ##### -# ################################# - -# Available replacements -# ------------------------------------------------ -# ${{author}} debian author -# ${{descr}} debian package description -# ${{exec}} startup script name -# ${{chdir}} app directory -# ${{retries}} retries for startup -# ${{retryTimeout}} retry timeout -# ${{app_name}} normalized app name -# ${{daemon_user}} daemon user -# ------------------------------------------------- -# DEPRECATED, use -J-Xmx1024m instead -# -mem 1024 - -# Setting -X directly (-J is stripped) -# -J-X -# -J-Xmx1024 - -# Add additional jvm parameters -# -Dkey=val - -# For play applications you may set -# -Dpidfile.path=/var/run/${{app_name}}/play.pid - -# Turn on JVM debugging, open at the given port -# -jvm-debug <port> - -# Don't run the java version check -# -no-version-check - --J-Xms130m --J-Xmx256m - -# With universal:packageBin: -# - setup with a configuration tool after unzip -# - use the path to the application.ini file -# -Dconfig.file=${{path_to}}/conf/application.conf --Dconfig.file=/usr/share/bbb-apps-akka/conf/application.conf