API tools faq
paste
Advertisement
dashohoxha

etc.diff

dashohoxha
Mar 29th, 2013
142
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 17.05 KB | None | 0 0
raw download clone embed print report
  1. diff -rubB squeeze/etc/confconsole/services.txt core/etc/confconsole/services.txt
  2. --- squeeze/etc/confconsole/services.txt    2012-02-27 15:29:31.000000000 +0100
  3. +++ core/etc/confconsole/services.txt   2012-08-10 14:05:52.000000000 +0200
  4. @@ -1,5 +1,3 @@
  5. -Web:       http://$ipaddr
  6. -           https://$ipaddr
  7.  Web shell: https://$ipaddr:12320
  8.  Webmin:    https://$ipaddr:12321
  9.  SSH/SFTP:  root@$ipaddr (port 22)
  10. diff -rubB squeeze/etc/cron-apt/action.d/3-download core/etc/cron-apt/action.d/3-download
  11. --- squeeze/etc/cron-apt/action.d/3-download    2010-08-22 10:48:03.000000000 +0200
  12. +++ core/etc/cron-apt/action.d/3-download   2012-08-10 14:05:49.000000000 +0200
  13. @@ -1,2 +0,0 @@
  14. -autoclean -y
  15. -dist-upgrade -d -y -o APT::Get::Show-Upgraded=true
  16. diff -rubB squeeze/etc/cron-apt/config core/etc/cron-apt/config
  17. --- squeeze/etc/cron-apt/config 2010-08-22 10:48:03.000000000 +0200
  18. +++ core/etc/cron-apt/config    2012-08-10 14:05:49.000000000 +0200
  19. @@ -174,3 +174,5 @@
  20.  # Umask for the files created by the APT command used. In all other cases
  21.  # umask 077 will be used.
  22.  # UMASK_APT="022"
  23. +MAILON="never"
  24. +SYSLOGON="output"
  25. diff -rubB squeeze/etc/default/grub core/etc/default/grub
  26. --- squeeze/etc/default/grub    2013-03-27 15:55:25.832614049 +0100
  27. +++ core/etc/default/grub   2012-08-10 14:05:47.000000000 +0200
  28. @@ -2,18 +2,15 @@
  29.  # /boot/grub/grub.cfg.
  30.  
  31.  GRUB_DEFAULT=0
  32. -GRUB_TIMEOUT=5
  33. +GRUB_HIDDEN_TIMEOUT=0
  34. +GRUB_HIDDEN_TIMEOUT_QUIET=false
  35. +GRUB_TIMEOUT=3
  36.  GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
  37. -GRUB_CMDLINE_LINUX_DEFAULT="quiet"
  38. +GRUB_CMDLINE_LINUX_DEFAULT=""
  39.  GRUB_CMDLINE_LINUX=""
  40.  
  41. -# Uncomment to enable BadRAM filtering, modify to suit your needs
  42. -# This works with Linux (no patch required) and with any kernel that obtains
  43. -# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
  44. -#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
  45. -
  46.  # Uncomment to disable graphical terminal (grub-pc only)
  47. -#GRUB_TERMINAL=console
  48. +GRUB_TERMINAL=console
  49.  
  50.  # The resolution used on graphical terminal
  51.  # note that you can use only modes which your graphic card supports via VBE
  52. diff -rubB squeeze/etc/default/locale core/etc/default/locale
  53. --- squeeze/etc/default/locale  2013-03-27 15:29:57.518770151 +0100
  54. +++ core/etc/default/locale 2012-08-10 14:05:50.000000000 +0200
  55. @@ -1 +1,5 @@
  56.  #  File generated by update-locale
  57. +LANG=en_US.UTF-8
  58. +LANGUAGE=en_US.UTF-8
  59. +LC_ALL=C
  60. +LC_CTYPE=C
  61. diff -rubB squeeze/etc/default/shellinabox core/etc/default/shellinabox
  62. --- squeeze/etc/default/shellinabox 2012-07-30 15:26:22.000000000 +0200
  63. +++ core/etc/default/shellinabox    2012-08-10 14:05:51.000000000 +0200
  64. @@ -1,18 +1,4 @@
  65. -# Should shellinaboxd start automatically
  66.  SHELLINABOX_DAEMON_START=1
  67. -
  68. -# TCP port that shellinboxd's webserver listens on
  69. -SHELLINABOX_PORT=4200
  70. -
  71. -# Parameters that are managed by the system and usually should not need
  72. -# changing:
  73. -# SHELLINABOX_DATADIR=/var/lib/shellinabox
  74. -# SHELLINABOX_USER=shellinabox
  75. -# SHELLINABOX_GROUP=shellinabox
  76. -
  77. -# Any optional arguments (e.g. extra service definitions).  Make sure
  78. -# that that argument is quoted.
  79. -#
  80. -#   Beeps are disabled because of reports of the VLC plugin crashing
  81. -#   Firefox on Linux/x86_64.
  82. -SHELLINABOX_ARGS="--no-beep"
  83. +SHELLINABOX_PORT=12320
  84. +SHELLINABOX_GROUP=certssl
  85. +SHELLINABOX_ARGS=--no-beep
  86. diff -rubB squeeze/etc/etckeeper/etckeeper.conf core/etc/etckeeper/etckeeper.conf
  87. --- squeeze/etc/etckeeper/etckeeper.conf    2010-07-16 21:28:07.000000000 +0200
  88. +++ core/etc/etckeeper/etckeeper.conf   2012-08-10 14:05:47.000000000 +0200
  89. @@ -1,34 +1,18 @@
  90. -# The VCS to use.
  91. -#VCS="hg"
  92. -VCS="git"
  93. -#VCS="bzr"
  94. -#VCS="darcs"
  95. +export GIT_AUTHOR_NAME="etckeeper"
  96. +export GIT_AUTHOR_EMAIL="root@localhost"
  97. +export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
  98. +export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL
  99.  
  100. -# Options passed to git commit when run by etckeeper.
  101. +VCS="git"
  102.  GIT_COMMIT_OPTIONS=""
  103.  
  104. -# Options passed to hg commit when run by etckeeper.
  105. -HG_COMMIT_OPTIONS=""
  106. -
  107. -# Options passed to bzr commit when run by etckeeper.
  108. -BZR_COMMIT_OPTIONS=""
  109. -
  110. -# Options passed to darcs record when run by etckeeper.
  111. -DARCS_COMMIT_OPTIONS="-a"
  112. +HIGHLEVEL_PACKAGE_MANAGER=apt
  113. +LOWLEVEL_PACKAGE_MANAGER=dpkg
  114.  
  115. -# Uncomment to avoid etckeeper committing existing changes
  116. -# to /etc automatically once per day.
  117. +# Uncomment to avoid committing existing changes once per day.
  118.  #AVOID_DAILY_AUTOCOMMITS=1
  119.  
  120. -# Uncomment to avoid etckeeper committing existing changes to
  121. -# /etc before installation. It will cancel the installation,
  122. -# so you can commit the changes by hand.
  123. +# Uncomment to avoid committing existing changes to /etc prior to install.
  124. +# Warning: This will cancel installation so you can commit the changes by hand.
  125.  #AVOID_COMMIT_BEFORE_INSTALL=1
  126.  
  127. -# The high-level package manager that's being used.
  128. -# (apt, pacman-g2, yum etc)
  129. -HIGHLEVEL_PACKAGE_MANAGER=apt
  130. -
  131. -# The low-level package manager that's being used.
  132. -# (dpkg, rpm, pacman-g2, etc)
  133. -LOWLEVEL_PACKAGE_MANAGER=dpkg
  134. diff -rubB squeeze/etc/group core/etc/group
  135. --- squeeze/etc/group   2013-03-27 15:49:52.917953990 +0100
  136. +++ core/etc/group  2012-08-10 14:05:51.000000000 +0200
  137. @@ -42,3 +42,4 @@
  138.  ntp:x:103:
  139.  ssh:x:104:
  140.  shellinabox:x:105:
  141. +certssl:x:1000:
  142. diff -rubB squeeze/etc/group- core/etc/group-
  143. --- squeeze/etc/group-  2013-03-27 15:29:59.000000000 +0100
  144. +++ core/etc/group- 2012-08-10 14:05:29.000000000 +0200
  145. @@ -41,3 +41,4 @@
  146.  crontab:x:102:
  147.  ntp:x:103:
  148.  ssh:x:104:
  149. +shellinabox:x:105:
  150. diff -rubB squeeze/etc/gshadow core/etc/gshadow
  151. --- squeeze/etc/gshadow 2013-03-27 15:49:53.017934368 +0100
  152. +++ core/etc/gshadow    2012-08-10 14:05:51.000000000 +0200
  153. @@ -42,3 +42,4 @@
  154.  ntp:!::
  155.  ssh:!::
  156.  shellinabox:!::
  157. +certssl:!::
  158. diff -rubB squeeze/etc/gshadow- core/etc/gshadow-
  159. --- squeeze/etc/gshadow-    2013-03-27 15:29:59.000000000 +0100
  160. +++ core/etc/gshadow-   2012-08-10 14:05:29.000000000 +0200
  161. @@ -41,3 +41,4 @@
  162.  crontab:!::
  163.  ntp:!::
  164.  ssh:!::
  165. +shellinabox:!::
  166. diff -rubB squeeze/etc/hostname core/etc/hostname
  167. --- squeeze/etc/hostname    2012-07-27 23:59:06.817708826 +0200
  168. +++ core/etc/hostname   2012-08-10 14:05:49.000000000 +0200
  169. @@ -1 +1 @@
  170. -Dashamir-ThinkPad-R50e
  171. +core
  172. diff -rubB squeeze/etc/hosts core/etc/hosts
  173. --- squeeze/etc/hosts   2013-03-27 15:28:35.803923040 +0100
  174. +++ core/etc/hosts  2012-08-10 14:05:49.000000000 +0200
  175. @@ -1,7 +1,10 @@
  176.  127.0.0.1  localhost
  177. -::1        localhost ip6-localhost ip6-loopback
  178. +127.0.1.1 core
  179. +
  180. +#Required for IPv6 capable hosts
  181. +::1 ip6-localhost ip6-loopback
  182.  fe00::0        ip6-localnet
  183.  ff00::0        ip6-mcastprefix
  184.  ff02::1        ip6-allnodes
  185.  ff02::2        ip6-allrouters
  186. -
  187. +ff02::3 ip6-allhosts
  188. diff -rubB squeeze/etc/locale.nopurge core/etc/locale.nopurge
  189. --- squeeze/etc/locale.nopurge  2013-03-27 15:49:40.972298521 +0100
  190. +++ core/etc/locale.nopurge 2012-08-10 14:05:50.000000000 +0200
  191. @@ -1,35 +1,21 @@
  192. +# Keep these locales after package installations via apt-get(8)
  193. +en
  194. +en_US
  195. +en_US.UTF-8
  196. diff -rubB squeeze/etc/lvm/cache/.cache core/etc/lvm/cache/.cache
  197. --- squeeze/etc/lvm/cache/.cache    2013-03-27 15:56:19.374105657 +0100
  198. +++ core/etc/lvm/cache/.cache   2012-08-10 14:05:38.000000000 +0200
  199. @@ -3,6 +3,7 @@
  200.  persistent_filter_cache {
  201.     valid_devices=[
  202.         "/dev/ram11",
  203. +       "/dev/loop0",
  204.         "/dev/ram10",
  205.         "/dev/ram",
  206.         "/dev/ram12",
  207. diff -rubB squeeze/etc/ntp.conf core/etc/ntp.conf
  208. --- squeeze/etc/ntp.conf    2010-10-17 15:45:25.000000000 +0200
  209. +++ core/etc/ntp.conf   2012-08-10 14:05:47.000000000 +0200
  210. @@ -1,7 +1,14 @@
  211. -# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
  212. +# cope with large time drifts (useful in VM scenarios)
  213. +tinker panic 0
  214.  
  215. -driftfile /var/lib/ntp/ntp.drift
  216. +# ntp servers
  217. +server 0.pool.ntp.org
  218. +server 1.pool.ntp.org
  219. +server 2.pool.ntp.org
  220. +server 3.pool.ntp.org
  221.  
  222. +# drift file
  223. +driftfile /var/lib/ntp/ntp.drift
  224.  
  225.  # Enable this if you want statistics to be logged.
  226.  #statsdir /var/log/ntpstats/
  227. @@ -11,21 +18,8 @@
  228.  filegen peerstats file peerstats type day enable
  229.  filegen clockstats file clockstats type day enable
  230.  
  231. -
  232. -# You do need to talk to an NTP server or two (or three).
  233. -#server ntp.your-provider.example
  234. -
  235. -# pool.ntp.org maps to about 1000 low-stratum NTP servers.  Your server will
  236. -# pick a different set every time it starts up.  Please consider joining the
  237. -# pool: <http://www.pool.ntp.org/join.html>
  238. -server 0.debian.pool.ntp.org iburst
  239. -server 1.debian.pool.ntp.org iburst
  240. -server 2.debian.pool.ntp.org iburst
  241. -server 3.debian.pool.ntp.org iburst
  242. -
  243. -
  244.  # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
  245. diff -rubB squeeze/etc/securetty core/etc/securetty
  246. --- squeeze/etc/securetty   2011-02-15 21:50:10.000000000 +0100
  247. +++ core/etc/securetty  2012-08-10 14:05:51.000000000 +0200
  248. @@ -381,3 +381,46 @@
  249.  ttyama2
  250.  ttyama3
  251.  
  252. +
  253. +# shellinabox
  254. +pts/0
  255. +pts/1
  256. +pts/2
  257. +pts/3
  258. +pts/4
  259. +pts/5
  260. +pts/6
  261. +pts/7
  262. +pts/8
  263. +pts/9
  264. +pts/10
  265. +pts/11
  266. +pts/12
  267. +pts/13
  268. +pts/14
  269. +pts/15
  270. +pts/16
  271. +pts/17
  272. +pts/18
  273. +pts/19
  274. +pts/20
  275. +pts/21
  276. +pts/22
  277. +pts/23
  278. +pts/24
  279. +pts/25
  280. +pts/26
  281. +pts/27
  282. +pts/28
  283. +pts/29
  284. +pts/30
  285. +pts/31
  286. +pts/32
  287. +pts/33
  288. +pts/34
  289. +pts/35
  290. +pts/36
  291. +pts/37
  292. +pts/38
  293. +pts/39
  294. +pts/40
  295. diff -rubB squeeze/etc/skel/.bashrc core/etc/skel/.bashrc
  296. --- squeeze/etc/skel/.bashrc    2010-04-10 14:03:55.000000000 +0200
  297. +++ core/etc/skel/.bashrc   2012-08-10 14:05:47.000000000 +0200
  298. @@ -3,97 +3,111 @@
  299.  # for examples
  300.  
  301.  # If not running interactively, don't do anything
  302. -[ -z "$PS1" ] && return
  303. +#[ -z "$PS1" ] && return
  304.  
  305.  # don't put duplicate lines in the history. See bash(1) for more options
  306. -# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
  307. -HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
  308.  # ... or force ignoredups and ignorespace
  309. -HISTCONTROL=ignoreboth
  310. +HISTCONTROL=ignoredups:ignorespace
  311.  
  312.  # append to the history file, don't overwrite it
  313.  shopt -s histappend
  314.  
  315.  # for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
  316. +HISTSIZE=1000
  317. +HISTFILESIZE=2000
  318.  
  319.  # check the window size after each command and, if necessary,
  320.  # update the values of LINES and COLUMNS.
  321.  shopt -s checkwinsize
  322.  
  323.  # make less more friendly for non-text input files, see lesspipe(1)
  324. -#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
  325. +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
  326.  
  327.  # set variable identifying the chroot you work in (used in the prompt below)
  328.  if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
  329.      debian_chroot=$(cat /etc/debian_chroot)
  330.  fi
  331.  
  332. -# set a fancy prompt (non-color, unless we know we "want" color)
  333. -case "$TERM" in
  334. -    xterm-color) color_prompt=yes;;
  335. -esac
  336. +function realpath()
  337. +{
  338. +    f=$@
  339. +
  340. +    if [ -d "$f" ]; then
  341. +        base=""
  342. +        dir="$f"
  343. +    else
  344. +        base="/$(basename "$f")"
  345. +        dir=$(dirname "$f")
  346. +    fi
  347. +
  348. +    dir=$(cd "$dir" && /bin/pwd)
  349.  
  350. -# uncomment for a colored prompt, if the terminal has the capability; turned
  351. -# off by default to not distract the user: the focus in a terminal window
  352. -# should be on the output of commands, not on the prompt
  353. -#force_color_prompt=yes
  354. -
  355. -if [ -n "$force_color_prompt" ]; then
  356. -    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
  357. -   # We have color support; assume it's compliant with Ecma-48
  358. -   # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
  359. -   # a case would tend to support setf rather than setaf.)
  360. -   color_prompt=yes
  361. +    echo "$dir$base"
  362. +}
  363. +
  364. +# Set prompt path to max 2 levels for best compromise of readability and usefulness
  365. +promptpath () {
  366. +    realpwd=$(realpath $PWD)
  367. +    realhome=$(realpath $HOME)
  368. +
  369. +    # if we are in the home directory
  370. +    if echo $realpwd | grep -q "^$realhome"; then
  371. +        path=$(echo $realpwd | sed "s|^$realhome|\~|")
  372. +        if [ "$path" = "~" ] || [ "$(dirname "$path")" = "~" ]; then
  373. +            echo $path
  374.      else
  375. -   color_prompt=
  376. +            echo $(basename $(dirname "$path"))/$(basename "$path")
  377. +        fi
  378. +        return
  379.      fi
  380. -fi
  381.  
  382. -if [ "$color_prompt" = yes ]; then
  383. -    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
  384. -else
  385. -    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
  386. -fi
  387. -unset color_prompt force_color_prompt
  388. +    path_dir=$(dirname $PWD)
  389. +    # if our parent dir is a top-level directory, don't mangle it
  390. +    if [ $(dirname $path_dir) = "/" ]; then
  391. +        echo $PWD
  392. +    else
  393. +        path_parent=$(basename "$path_dir")
  394. +        path_base=$(basename "$PWD")
  395. +
  396. +        echo $path_parent/$path_base
  397. +    fi
  398. +}
  399.  
  400.  # If this is an xterm set the title to user@host:dir
  401.  case "$TERM" in
  402.  xterm*|rxvt*)
  403. -    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
  404. +    PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"'
  405.      ;;
  406.  *)
  407.      ;;
  408.  esac
  409.  
  410. -# enable color support of ls and also add handy aliases
  411. -if [ -x /usr/bin/dircolors ]; then
  412. -    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
  413. +if [ "$TERM" != "dumb" ]; then
  414. +    eval "`dircolors -b`"
  415.      alias ls='ls --color=auto'
  416. -    #alias dir='dir --color=auto'
  417. -    #alias vdir='vdir --color=auto'
  418. +    alias grep='grep --color=auto'
  419. +    alias fgrep='fgrep --color=auto'
  420. +    alias egrep='egrep --color=auto'
  421.  
  422. -    #alias grep='grep --color=auto'
  423. -    #alias fgrep='fgrep --color=auto'
  424. -    #alias egrep='egrep --color=auto'
  425. -fi
  426. -
  427. -# some more ls aliases
  428. -#alias ll='ls -l'
  429. -#alias la='ls -A'
  430. -#alias l='ls -CF'
  431. -
  432. -# Alias definitions.
  433. -# You may want to put all your additions into a separate file like
  434. -# ~/.bash_aliases, instead of adding them here directly.
  435. -# See /usr/share/doc/bash-doc/examples in the bash-doc package.
  436. +    # Set a terminal prompt style (default is fancy color prompt)
  437. +    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;33m\]\u@\h \[\033[01;34m\]$(promptpath)\[\033[00m\]\$ '
  438. +else
  439. +    alias ls="ls -F"
  440. +    alias ll='ls -alF'
  441. +    alias la='ls -A'
  442. +    alias l='ls -CF'
  443. +    PS1='${debian_chroot:+($debian_chroot)}\u@\h $(promptpath)\$ '
  444. +fi
  445. +
  446. +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
  447. +
  448. +run_scripts()
  449. +{
  450. +    for script in $1/*; do
  451. +        [ -x "$script" ] || continue
  452. +        . $script
  453. +    done
  454. +}
  455.  
  456. -if [ -f ~/.bash_aliases ]; then
  457. -    . ~/.bash_aliases
  458. -fi
  459. +run_scripts $HOME/.bashrc.d
  460.  
  461. -# enable programmable completion features (you don't need to enable
  462. -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
  463. -# sources /etc/bash.bashrc).
  464. -if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
  465. -    . /etc/bash_completion
  466. -fi
  467. diff -rubB squeeze/etc/sysctl.conf core/etc/sysctl.conf
  468. --- squeeze/etc/sysctl.conf 2010-02-25 00:20:09.000000000 +0100
  469. +++ core/etc/sysctl.conf    2012-08-10 14:05:51.000000000 +0200
  470. @@ -7,7 +7,7 @@
  471.  #kernel.domainname = example.com
  472.  
  473.  # Uncomment the following to stop low-level messages on console
  474. -#kernel.printk = 3 4 1 3
  475. +kernel.printk = 1 4 1 7
  476.  
  477.  ##############################################################3
  478.  # Functions previously found in netbase
  479. diff -rubB squeeze/etc/webmin/config core/etc/webmin/config
  480. --- squeeze/etc/webmin/config   2013-03-27 15:28:59.347501464 +0100
  481. +++ core/etc/webmin/config  2012-08-10 14:05:52.000000000 +0200
  482. @@ -16,3 +16,5 @@
  483.  referers_none=1
  484.  md5pass=1
  485.  product=webmin
  486. +deftab=system
  487. +theme=theme-stressfree
  488. diff -rubB squeeze/etc/webmin/miniserv.conf core/etc/webmin/miniserv.conf
  489. --- squeeze/etc/webmin/miniserv.conf    2013-03-27 15:29:01.619472901 +0100
  490. +++ core/etc/webmin/miniserv.conf   2012-08-10 14:05:52.000000000 +0200
  491. @@ -1,4 +1,4 @@
  492. -port=10000
  493. +port=12321
  494.  root=/usr/share/webmin
  495.  mimetypes=/usr/share/webmin/mime.types
  496.  addtype_cgi=internal/cgi
  497. @@ -13,7 +13,7 @@
  498.  env_WEBMIN_VAR=/var/webmin
  499.  atboot=0
  500.  logout=/etc/webmin/logout-flag
  501. -listen=10000
  502. +listen=12321
  503.  denyfile=\.pl$
  504.  log=1
  505.  blockhost_failures=5
  506. @@ -23,7 +23,7 @@
  507.  premodules=WebminCore
  508.  server=MiniServ/1.590
  509.  userfile=/etc/webmin/miniserv.users
  510. -keyfile=/etc/webmin/miniserv.pem
  511. +keyfile=/etc/ssl/certs/cert.pem
  512.  passwd_file=/etc/shadow
  513.  passwd_uindex=0
  514.  passwd_pindex=1
  515. @@ -32,3 +32,4 @@
  516.  passwd_mode=0
  517.  passdelay=1
  518.  sudo=1
  519. +preroot=theme-stressfree
  520. diff -rubB squeeze/etc/webmin/syslog/config core/etc/webmin/syslog/config
  521. --- squeeze/etc/webmin/syslog/config    2013-03-27 15:50:09.062785304 +0100
  522. +++ core/etc/webmin/syslog/config   2012-08-10 14:05:47.000000000 +0200
  523. @@ -2,13 +2,13 @@
  524.  pipe=1
  525.  others=1
  526.  lines=20
  527. -syslogd=/usr/sbin/rsyslogd
  528. +syslogd=/sbin/rsyslogd
  529.  pid_file=/var/run/rsyslogd.pid
  530.  restart_cmd=/etc/init.d/rsyslog reload
  531.  m4_path=
  532.  compressed=1
  533.  start_cmd=/etc/init.d/rsyslog start
  534. -signal_cmd=/etc/init.d/rsyslog restart ; /etc/init.d/klogd restart
  535. +signal_cmd=/etc/init.d/rsyslog restart
  536.  sync=1
  537.  pri_dir=1
  538.  tags=0
  539. diff -rubB squeeze/etc/webmin/webmin/config core/etc/webmin/webmin/config
  540. --- squeeze/etc/webmin/webmin/config    2013-03-27 15:29:00.711484316 +0100
  541. +++ core/etc/webmin/webmin/config   2012-08-10 14:05:52.000000000 +0200
  542. @@ -5,5 +5,7 @@
  543.  osdn=1
  544.  upmissing=0
  545.  update=0
  546. -uphour=15
  547. -upmins=54
  548. +uphour=12
  549. +upmins=33
  550. +last_version_number=0
  551. +last_version_check=9999999999
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!