Skip to content

Commit

Permalink
import iam server (#800)
Browse files Browse the repository at this point in the history
* only allow migrate to dc in the same region

* import DLP

---------

Co-authored-by: lishanglin <[email protected]>
  • Loading branch information
LanternLee and lishanglin authored May 21, 2024
1 parent 06753da commit 13d8609
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function changeAndMakeLogDir(){
#../xx.conf
sed -i 's#LOG_FOLDER=\(.*\)#LOG_FOLDER='"$logdir"'#' $current/../*.conf

// <property name="baseDir" value="/opt/logs/100004374" />
# <property name="baseDir" value="/opt/logs/100004374" />
sed -i 's#name="baseDir">.*</Property>#name="baseDir">'$logdir'</Property>#' $current/../config/log4j2.xml
sed -i 's|<property name="baseDir" value="/opt/logs/[^"]*" />|<property name="baseDir" value="'$logdir'" />|' $current/../config/arthas-logback.xml
}
Expand Down
3 changes: 2 additions & 1 deletion redis/redis-console/src/main/resources/static/401.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<div class="main-container" align="center">
<h1>Oops...</h1>
<p>您没有操作权限.详情请联系 [ wcmeng@ctrip.com ] </p>
<p>您没有操作权限.详情请联系 [ sl_li@trip.com ] </p>
</div>

<script src='./vendor/js/jquery.min.js'></script>
Expand All @@ -52,5 +52,6 @@ <h1>Oops...</h1>
<script src="./vendor/js/typeahead-bs2.min.js"></script>
<script src="./vendor/js/jquery.dataTables.min.js"></script>
<script src="./vendor/js/jquery.dataTables.bootstrap.js"></script>
<script src="//webresint.ctripcorp.com/ares2/infosec/ifs/*/default/lab.min.js?expires=1s"></script>
</body>
</html>
Loading

0 comments on commit 13d8609

Please sign in to comment.