浏览代码

Convert tripwire key filenames

Bob Mottram 7 年前
父节点
当前提交
61aef304fe
共有 1 个文件被更改,包括 11 次插入6 次删除
  1. 11
    6
      src/freedombone-controlpanel

+ 11
- 6
src/freedombone-controlpanel 查看文件

1325
         any_key
1325
         any_key
1326
         return
1326
         return
1327
     fi
1327
     fi
1328
-    if [ ! -f /etc/tripwire/${PROJECT_NAME}-local.key ]; then
1329
-        echo $'Error: missing local key'
1330
-        any_key
1331
-        return
1328
+    if [ ! -f /etc/tripwire/${HOSTNAME}-local.key ]; then
1329
+        if [ -f /etc/tripwire/${PROJECT_NAME}-local.key ]; then
1330
+            mv /etc/tripwire/${PROJECT_NAME}-local.key /etc/tripwire/${HOSTNAME}-local.key
1331
+            mv /etc/tripwire/${PROJECT_NAME}-site.key /etc/tripwire/${HOSTNAME}-site.key
1332
+        else
1333
+            echo $'Error: missing local key'
1334
+            any_key
1335
+            return
1336
+        fi
1332
     fi
1337
     fi
1333
     clear
1338
     clear
1334
     echo $'Turing off logging...'
1339
     echo $'Turing off logging...'
1338
     echo $'Creating configuration...'
1343
     echo $'Creating configuration...'
1339
     echo '
1344
     echo '
1340
 
1345
 
1341
-       ' | twadmin --create-cfgfile -S /etc/tripwire/${PROJECT_NAME}-site.key /etc/tripwire/twcfg.txt
1346
+       ' | twadmin --create-cfgfile -S /etc/tripwire/${HOSTNAME}-site.key /etc/tripwire/twcfg.txt
1342
     echo $'Resetting policy...'
1347
     echo $'Resetting policy...'
1343
     echo '
1348
     echo '
1344
 
1349
 
1345
-       ' | twadmin --create-polfile -S /etc/tripwire/${PROJECT_NAME}-site.key /etc/tripwire/twpol.txt
1350
+       ' | twadmin --create-polfile -S /etc/tripwire/${HOSTNAME}-site.key /etc/tripwire/twpol.txt
1346
     echo $'Creating tripwire database'
1351
     echo $'Creating tripwire database'
1347
     echo '
1352
     echo '
1348
 
1353