首页 发现
登录
clementinecomputing
/
popufare
1
0
派生 0
文件 工单管理 12 合并请求 0 Wiki
浏览代码

Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

clementinecomputing 5 年之前
父节点
f6313eeff9 264d11caec
当前提交
17d05fec3b
共有 8 个文件被更改，包括 380 次插入 和 12 次删除
合并视图 显示文件统计
  1. 2 1
      aux/deploy-busunit-interactive
  2. 52 1
      busunit/DIUv2/html/index-ORG.html
  3. 102 10
      busunit/DIUv2/html/js/diu_ui-ORG.js
  4. 57 0
      busunit/rootfs/etc/security/limits.conf
  5. 24 0
      meta/ISSUE_TEMPLATE.md
  6. 6 0
      meta/README.md
  7. 84 0
      meta/citizen_code_of_conduct.md
  8. 53 0
      meta/reporting_guidelines.md

+ 2 - 1
aux/deploy-busunit-interactive
查看文件 

@@ -123,7 +123,7 @@ read adddeps
 
 
 
 if [[ "$adddeps" =~ ^[yY]?$ ]]; then
 
 if [[ "$adddeps" =~ ^[yY]?$ ]]; then
 
 
 
-  deps="espeak mplayer git"
 
+  deps="espeak mplayer git ppp ppp-dev"
 
 
 
   echo ""
 
   echo ""
 
   echo "  Installing: $deps"
 
   echo "  Installing: $deps"
 
@@ -231,6 +231,7 @@ sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/connection_tether.sh . ; c
 
 
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/apply_update.sh . ; cp -fRL $bd/scripts/apply_update_legacy.sh . ; cp -fRL $bd/scripts/apply_update_popufare.sh . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/apply_update.sh . ; cp -fRL $bd/scripts/apply_update_legacy.sh . ; cp -fRL $bd/scripts/apply_update_popufare.sh . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/fix_pkg_perm.sh . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/fix_pkg_perm.sh . "
 
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/unpack_server_data.sh . "
 
 
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/say . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/say . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/volumeset . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/volumeset . "

+ 52 - 1
busunit/DIUv2/html/index-ORG.html
查看文件 

@@ -32,6 +32,26 @@
 
 
 
   <body id='body'>
 
   <body id='body'>
 
 
 
+    <!-- ************************* -->
 
+    <!-- ******            ******* -->
 
+    <!-- ******  Watchdog  ******* -->
 
+    <!-- ******            ******* -->
 
+    <!-- ************************* -->
 
+
 
+    <div id='ui_watchdog' style='display:none;'>
 
+
 
+      <div style='width:100%; height:100%;'>
 
+
 
+        <div class='pure-g row' style='width:100%; height:100%;' >
 
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
 
+            <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_watchdog_btn'>Watchdog Timer Expired! <br> Press Button to Reset UI </button>
 
+          </div>
 
+        </div>
 
+
 
+      </div>
 
+
 
+    </div>
 
+
 
     <!-- ************************* -->
 
     <!-- ************************* -->
 
     <!-- ******            ******* -->
 
     <!-- ******            ******* -->
 
     <!-- ******    Login   ******* -->
 
     <!-- ******    Login   ******* -->
 
@@ -327,6 +347,18 @@
 
 
 
     <div id='ui_driververify' style='display:none;'>
 
     <div id='ui_driververify' style='display:none;'>
 
 
 
+      <div style='width:100%; height:100%;'>
 
+
 
+        <div class='pure-g row' style='width:100%; height:100%;' >
 
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
 
+            <button class='bstatus bkeyHuge' id='ui_driververify_btn'>Verifying Driver</button>
 
+          </div>
 
+        </div>
 
+
 
+      </div>
 
+
 
+      <!--
 
+
 
       <br>
 
       <br>
 
       <div class='pure-g'> </div>
 
       <div class='pure-g'> </div>
 
       <br> <br> <br>
 
       <br> <br> <br>
 
@@ -338,6 +370,9 @@
 
       </div>
 
       </div>
 
 
 
       <br> <br> <br> 
       <br> <br> <br> 
+
 
+      -->
 
+
 
     </div>
 
     </div>
 
 
 
 
 
@@ -354,7 +389,9 @@
 
       <div style='width:100%; height:100%;'>
 
       <div style='width:100%; height:100%;'>
 
 
 
         <div class='pure-g row' style='width:100%; height:100%;' >
 
         <div class='pure-g row' style='width:100%; height:100%;' >
 
-          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '> <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_driverincorrect_btn'>Incorrect Login</button> </div>
 
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
 
+            <button onmousedown='_beep();' class='bdropinp bkeyHuge' id='ui_driverincorrect_btn'>Incorrect Login</button>
 
+          </div>
 
         </div>
 
         </div>
 
 
 
       </div>
 
       </div>
 
@@ -434,6 +471,18 @@
 
 
 
     <div id='ui_paddleverify' style='display:none;'>
 
     <div id='ui_paddleverify' style='display:none;'>
 
 
 
+
 
+      <div style='width:100%; height:100%;'>
 
+
 
+        <div class='pure-g row' style='width:100%; height:100%;' >
 
+          <div class='pure-u-1-6 col' style=' position:absolute; top:10vh; margin-left:10vw; '>
 
+            <button class='bstatus bkeyHuge' id='ui_paddleverify_btn'>Verifying Paddle</button>
 
+          </div>
 
+        </div>
 
+
 
+      </div>
 
+
 
+      <!--
 
       <br>
 
       <br>
 
       <div class='pure-g'> </div>
 
       <div class='pure-g'> </div>
 
       <br> <br> <br>
 
       <br> <br> <br>
 
@@ -445,6 +494,8 @@
 
       </div>
 
       </div>
 
 
 
       <br> <br> <br> 
       <br> <br> <br> 
+      -->
 
+
 
     </div>
 
     </div>
 
 
 
     <!-- ************************* -->
 
     <!-- ************************* -->

+ 102 - 10
busunit/DIUv2/html/js/diu_ui-ORG.js
查看文件 

@@ -27,8 +27,8 @@ var _fqADDRESS = _ADDRESS + ":" + _PORT;
 
 var BG_COLOR = "#f7f7f7";
 
 var BG_COLOR = "#f7f7f7";
 
 var TEXT_COLOR = "#444444";
 
 var TEXT_COLOR = "#444444";
 
 
 
-var DIU_UI_VERSION = "0.1.8";
 
-var DIU_UI_VERSION_DATE = "2019-12-10";
 
+var DIU_UI_VERSION = "0.1.9";
 
+var DIU_UI_VERSION_DATE = "2020-01-30";
 
 
 
 var g_snd = {
 
 var g_snd = {
 
   "reject_fare" : "",
 
   "reject_fare" : "",
 
@@ -71,6 +71,7 @@ var g_ctx = {
 
   "current_ui" : "ui_login",
 
   "current_ui" : "ui_login",
 
 
 
   "ui_change_timeoutid": -1,
 
   "ui_change_timeoutid": -1,
 
+  "ui_watchdog_timeoutid": -1,
 
 
 
   "bulkfare" : "",
 
   "bulkfare" : "",
 
   "bulkfare_count" : "",
 
   "bulkfare_count" : "",
 
@@ -181,6 +182,30 @@ function _block_status_window(ui_id) {
 
   block_ele.style.y = rect.y;
 
   block_ele.style.y = rect.y;
 
 }
 
 }
 
 
 
+function _clear_ui_watchdog() {
 
+  if (g_ctx.ui_watchdog_timeoutid >= 0) {
 
+    window.clearTimeout(g_ctx.ui_watchdog_timeoutid);
 
+  }
 
+}
 
+
 
+function _set_ui_watchdog(failsafe_ui, _dt) {
 
+
 
+  // default to 'ui_watchdog' and 5s
 
+  //
 
+  failsafe_ui = (( typeof failsafe_ui === "undefined") ? "ui_watchdog" : failsafe_ui);
 
+  _dt = (( typeof _dt === "undefined") ? 5000 : _dt);
 
+
 
+  _clear_ui_watchdog();
 
+
 
+  g_ctx.ui_watchdog_timeoutid = window.setTimeout(
 
+    (function(_fsui) {
 
+      return function() { console.log("???", _fsui); _switch_ui(_fsui); };
 
+    })(failsafe_ui),
 
+    _dt);
 
+
 
+}
 
+
 
+
 
 
 
 function _switch_ui(to) {
 
 function _switch_ui(to) {
 
   var ele;
 
   var ele;
 
@@ -322,14 +347,36 @@ function _verify_driver() {
 
   var driver = g_ctx.driver;
 
   var driver = g_ctx.driver;
 
   var pin = g_ctx.pin;
 
   var pin = g_ctx.pin;
 
 
 
+  // have a fail safe for the verification
 
+  //
 
+  _set_ui_watchdog();
 
+
 
   _api_request("driverlogin", {"driver":driver, "pin":pin}, _verify_driver_ok, _verify_driver_fail);
 
   _api_request("driverlogin", {"driver":driver, "pin":pin}, _verify_driver_ok, _verify_driver_fail);
 
   return;
 
   return;
 
 }
 
 }
 
 
 
-function _verify_driver_ok()      { _switch_ui("ui_paddle"); }
 
-function _verify_driver_fail()    { _switch_ui("ui_driverincorrect");  }
 
+function _verify_driver_ok() {
 
+  console.log("driver ok");
 
+
 
+  _clear_ui_watchdog();
 
+
 
+  _switch_ui("ui_paddle");
 
+}
 
+
 
+function _verify_driver_fail() {
 
+  console.log("driver fail");
 
+
 
+  _clear_ui_watchdog();
 
+
 
+  _switch_ui("ui_driverincorrect");
 
+}
 
+
 
 function _driver_incorrect(inp)  {
 
 function _driver_incorrect(inp)  {
 
+  console.log("driver incorrect");
 
+
 
+  _clear_ui_watchdog();
 
   _clear_ui_driver();
 
   _clear_ui_driver();
 
+
 
   _switch_ui("ui_driver");
 
   _switch_ui("ui_driver");
 
 }
 
 }
 
 
 
@@ -410,19 +457,51 @@ function _driver_login(inp) {
 
 function _verify_paddle() {
 
 function _verify_paddle() {
 
   var paddle = g_ctx.paddle;
 
   var paddle = g_ctx.paddle;
 
 
 
+  // have a fail safe for the verification
 
+  //
 
+  _set_ui_watchdog();
 
+
 
   _api_request("paddleinput", {"paddle":paddle}, _verify_paddle_ack, _verify_paddle_fail);
 
   _api_request("paddleinput", {"paddle":paddle}, _verify_paddle_ack, _verify_paddle_fail);
 
   return;
 
   return;
 
 }
 
 }
 
 
 
-function _verify_paddle_ack()    { console.log("got ack for push paddle message\n"); }
 
-function _verify_paddle_ok()    { _switch_ui("ui_main"); }
 
-function _verify_paddle_fail()  { _switch_ui("ui_paddleunknown"); }
 
+function _verify_paddle_ack() {
 
+  console.log("got ack for push paddle message\n");
 
+
 
+}
 
+
 
+function _verify_paddle_ok() {
 
+  console.log("verify paddle ok");
 
+
 
+  _clear_ui_watchdog();
 
+
 
+  _switch_ui("ui_main");
 
+
 
+}
 
+
 
+function _verify_paddle_fail() {
 
+  console.log("verify paddle fail");
 
+
 
+  _clear_ui_watchdog();
 
+
 
+  _switch_ui("ui_paddleunknown");
 
+}
 
 
 
 function _paddle_unknown(inp)   {
 
 function _paddle_unknown(inp)   {
 
+
 
+  console.log("paddle unknown...");
 
+
 
+  _clear_ui_watchdog();
 
   _clear_ui_paddle();
 
   _clear_ui_paddle();
 
+
 
   _switch_ui("ui_paddle");
 
   _switch_ui("ui_paddle");
 
 }
 
 }
 
 
 
+function _watchdog_tripped(inp)   {
 
+  console.log("watchdog UI expired!...");
 
+  _reset();
 
+}
 
+
 
 //------------
 
 //------------
 
 
 
 function _paddle_input(inp) {
 
 function _paddle_input(inp) {
 
@@ -839,6 +918,8 @@ function _main_message_add(msg, bg_color, text_color) {
 
 
 
 function _ws_process(dat) {
 
 function _ws_process(dat) {
 
 
 
+  console.log("_ws_process:", dat);
 
+
 
   var tok = dat.split(" ");
 
   var tok = dat.split(" ");
 
 
 
   if (tok.length < 2) { return; }
 
   if (tok.length < 2) { return; }
 
@@ -872,8 +953,15 @@ function _init_websocket() {
 
 
 
   sock.onopen = function(e) { console.log("open", e); }
 
   sock.onopen = function(e) { console.log("open", e); }
 
   sock.onmessage = function(e) { _ws_process(e.data); }
 
   sock.onmessage = function(e) { _ws_process(e.data); }
 
-  sock.onclose = function(e) { console.log("close", e); }
 
-  sock.onerror = function(e) { console.log("error", e); }
 
+
 
+  sock.onclose = function(e) {
 
+    console.log("close", e);
 
+    setTimeout( function() { _init_websocket(); }, 1000);
 
+  }
 
+
 
+  sock.onerror = function(e) {
 
+    console.log("error", e);
 
+  }
 
 }
 
 }
 
 
 
 //-------------
 
 //-------------
 
@@ -1091,6 +1179,10 @@ function init() {
 
 
 
   _init_websocket();
 
   _init_websocket();
 
 
 
+  // watchdog
 
+  //
 
+  document.getElementById('ui_watchdog_btn').onclick = _watchdog_tripped;
 
+
 
   // diagnostics
 
   // diagnostics
 
   //
 
   //
 
   document.getElementById('ui_diagnostic_mainscreen').onclick = _mainscreen;
 
   document.getElementById('ui_diagnostic_mainscreen').onclick = _mainscreen;
 
@@ -1122,7 +1214,7 @@ function init() {
 
   document.getElementById('ui_login_login').onclick = _login;
 
   document.getElementById('ui_login_login').onclick = _login;
 
   document.getElementById('ui_login_configuration').onclick = _configuration;
 
   document.getElementById('ui_login_configuration').onclick = _configuration;
 
   document.getElementById('ui_driverincorrect_btn').onclick = _driver_incorrect;
 
   document.getElementById('ui_driverincorrect_btn').onclick = _driver_incorrect;
 
-  document.getElementById('ui_paddleunknown_btn').onclick = _paddle_unknown;;
 
+  document.getElementById('ui_paddleunknown_btn').onclick = _paddle_unknown;
 
 
 
   // main menu buttons
 
   // main menu buttons
 
   //
 
   //

+ 57 - 0
busunit/rootfs/etc/security/limits.conf
查看文件 

@@ -0,0 +1,57 @@
 
+# /etc/security/limits.conf
 
+#
 
+#Each line describes a limit for a user in the form:
 
+#
 
+#<domain>        <type>  <item>  <value>
 
+#
 
+#Where:
 
+#<domain> can be:
 
+#        - a user name
 
+#        - a group name, with @group syntax
 
+#        - the wildcard *, for default entry
 
+#        - the wildcard %, can be also used with %group syntax,
 
+#                 for maxlogin limit
 
+#        - NOTE: group and wildcard limits are not applied to root.
 
+#          To apply a limit to the root user, <domain> must be
 
+#          the literal username root.
 
+#
 
+#<type> can have the two values:
 
+#        - "soft" for enforcing the soft limits
 
+#        - "hard" for enforcing hard limits
 
+#
 
+#<item> can be one of the following:
 
+#        - core - limits the core file size (KB)
 
+#        - data - max data size (KB)
 
+#        - fsize - maximum filesize (KB)
 
+#        - memlock - max locked-in-memory address space (KB)
 
+#        - nofile - max number of open file descriptors
 
+#        - rss - max resident set size (KB)
 
+#        - stack - max stack size (KB)
 
+#        - cpu - max CPU time (MIN)
 
+#        - nproc - max number of processes
 
+#        - as - address space limit (KB)
 
+#        - maxlogins - max number of logins for this user
 
+#        - maxsyslogins - max number of logins on the system
 
+#        - priority - the priority to run user process with
 
+#        - locks - max number of file locks the user can hold
 
+#        - sigpending - max number of pending signals
 
+#        - msgqueue - max memory used by POSIX message queues (bytes)
 
+#        - nice - max nice priority allowed to raise to values: [-20, 19]
 
+#        - rtprio - max realtime priority
 
+#        - chroot - change root to directory (Debian-specific)
 
+#
 
+#<domain>      <type>  <item>         <value>
 
+#
 
+
 
+*               soft    core            unlimited
 
+#*               soft    core            0
 
+#root            hard    core            100000
 
+#*               hard    rss             10000
 
+#@student        hard    nproc           20
 
+#@faculty        soft    nproc           20
 
+#@faculty        hard    nproc           50
 
+#ftp             hard    nproc           0
 
+#ftp             -       chroot          /ftp
 
+#@student        -       maxlogins       4
 
+
 
+# End of file

+ 24 - 0
meta/ISSUE_TEMPLATE.md
查看文件 

@@ -0,0 +1,24 @@
 
+When submitting an issue through the issue tracker, please indicate whether it's a bug, feature or other issue.
 
+
 
+* **I'm submitting a(n) ...**
 
+  - [ ] bug report
 
+  - [ ] feature request
 
+  - [ ] other issue (please describe)
 
+
 
+* **Do you want to request a *feature* or report a *bug*?**
 
+
 
+* **What is the current behavior?**
 
+
 
+* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo, screenshot or any other information that will help highlight the problem** 
+
 
+* **What is the expected behavior?**
 
+
 
+* **What is the motivation / use case for changing the behavior?**
 
+
 
+* **Please tell us about your environment, if relevant:**
 
+  
+  - Software Version:
 
+  - Operating System:
 
+  - Browser:
 
+
 
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context)

+ 6 - 0
meta/README.md
查看文件 

@@ -0,0 +1,6 @@
 
+Popufare Repository Management (meta)
 
+===
 
+
 
+This directory is for process related documents or other data files
 
+relating to the management of the repository itself.
 
+

文件差异内容过多而无法显示
+ 84 - 0
meta/citizen_code_of_conduct.md


+ 53 - 0
meta/reporting_guidelines.md
查看文件 

@@ -0,0 +1,53 @@
 
+# Reporting Guidelines
 
+
 
+If you believe someone is violating the code of conduct we ask that you report it to Clementine Computing LLC by emailing info@clementinecomputing.com. 
+
 
+**All reports will be kept confidential.** In some cases we may determine that a public statement will need to be made. If that's the case, the identities of all victims and reporters will remain confidential unless those individuals instruct us otherwise.
 
+
 
+If you believe anyone is in physical danger, please notify appropriate emergency services first. If you are unsure what service or agency is appropriate to contact, include this in your report and we will attempt to notify them.
 
+
 
+In your report please include:
 
+
 
+* Your contact info for follow-up contact.
 
+* Names (legal, nicknames, or pseudonyms) of any individuals involved.
 
+  * If there were other witnesses besides you, please try to include them as well.
 
+* When and where the incident occurred. Please be as specific as possible.
 
+* Your account of what occurred. 
+  * If there is a publicly available record (e.g. a mailing list archive or a public IRC logger) please include a link.
 
+* Any extra context you believe existed for the incident.
 
+* If you believe this incident is ongoing.
 
+* Any other information you believe we should have.
 
+
 
+## What happens after you file a report?
 
+
 
+You will receive an email from Clementine Computing's Code of Conduct response team acknowledging receipt as soon as possible, but within 24 hours.
 
+
 
+The working group will immediately meet to review the incident and determine:
 
+
 
+* What happened.
 
+* Whether this event constitutes a code of conduct violation.
 
+* What kind of response is appropriate.
 
+
 
+If this is determined to be an ongoing incident or a threat to physical safety, the team's immediate priority will be to protect everyone involved. This means we may delay an "official" response until we believe that the situation has ended and that everyone is physically safe.
 
+
 
+Once the team has a complete account of the events they will make a decision as to how to respond. Responses may include:
 
+
 
+* Nothing (if we determine no code of conduct violation occurred).
 
+* A private reprimand from the Code of Conduct response team to the individual(s) involved.
 
+* A public reprimand.
 
+* An imposed vacation (i.e. asking someone to "take a week off" from a mailing list or IRC).
 
+* A permanent or temporary ban from some or all Clementine Computing's spaces (events, meetings, mailing lists, IRC, etc.)
 
+* A request to engage in mediation and/or an accountability plan.
 
+
 
+We'll respond within one week to the person who filed the report with either a resolution or an explanation of why the situation is not yet resolved.
 
+
 
+Once we've determined our final action, we'll contact the original reporter to let them know what action (if any) we'll be taking. We'll take into account feedback from the reporter on the appropriateness of our response, but our response will be determined by what will be best for community safety.
 
+
 
+Finally, the response team will make a report on the situation to Clementine Computing LLC's management. The Clementine Computing LLC's management may choose to issue a public report of the incident or take additional actions.
 
+
 
+## Appealing the response
 
+
 
+Only permanent resolutions (such as bans) may be appealed. To appeal a decision of the working group, contact Clementine Computing LLC at info@clementinecomputing.com with your appeal and Clementine Computing will review the case.
 
+
 
+_Revision 1.0, DRAFT, proposed June 2014_
 
+_Reporting Guidelines derived from those of the [Django Software Foundation](https://www.djangoproject.com/conduct/reporting/)._