Browse Source

Добавлены шаблоны net-misc

* dhcp
* modemmanager
* modem-manager-gui
* netifrc
* openssh
master
parent
commit
00d6273d1f
  1. 1
      merge/net-misc/.calculate_directory
  2. 1
      merge/net-misc/dhcp/.calculate_directory
  3. 14
      merge/net-misc/dhcp/dhclient.conf
  4. 1
      merge/net-misc/modem-manager-gui/.calculate_directory
  5. 1
      merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
  6. 1
      merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
  7. 3
      merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
  8. 2
      merge/net-misc/modemmanager/.calculate_directory
  9. 1
      merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
  10. 4
      merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
  11. 1
      merge/net-misc/netifrc/.calculate_directory
  12. 6
      merge/net-misc/netifrc/01_unpack_net.example
  13. 3
      merge/net-misc/netifrc/02_link_net.example
  14. 1
      merge/net-misc/openssh/.calculate_directory
  15. 2
      merge/net-misc/openssh/ssh/ssh_config
  16. 24
      merge/net-misc/openssh/ssh/sshd_config

1
merge/net-misc/.calculate_directory

@ -0,0 +1 @@
{% calculate append = 'skip' %}

1
merge/net-misc/dhcp/.calculate_directory

@ -0,0 +1 @@
{% calculate path='/etc', package='net-misc/dhcp' %}

14
merge/net-misc/dhcp/dhclient.conf

@ -0,0 +1,14 @@
{% calculate format='regex', dotall, comment='#' %}
<reg>(?:(?:
#--- Start block generated by Calculate Utilities ---
.*
#--- End block generated by Calculate Utilities ---)|(?:
$))(.*$)</reg>
<text>
#--- Start block generated by Calculate Utilities ---
# передавать dhcp серверу hostname
send host-name = pick-first-value(gethostname(), "ISC-dhclient");
# запрашивать у dhcp сервера в дополнение к стандартным параметрам domain-search
request subnet-mask, broadcast-address, time-offset, routers,
domain-name, domain-name-servers, host-name, domain-search;
#--- End block generated by Calculate Utilities ---\1</text>

1
merge/net-misc/modem-manager-gui/.calculate_directory

@ -0,0 +1 @@
{% calculate path='/usr/share', name='applications', package='net-misc/modem-manager-gui' %}

1
merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png

@ -0,0 +1 @@
{% calculate path='/usr/share/icons/gnome/128x128/apps' name='modem-manager-gui.png' source='/usr/share/pixmaps/modem-manager-gui.png', mirror %}

1
merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png

@ -0,0 +1 @@
{% calculate path='/usr/share/icons/hicolor/128x128/apps' name='modem-manager-gui.png' source='/usr/share/pixmaps/modem-manager-gui.png', mirror %}

3
merge/net-misc/modem-manager-gui/modem-manager-gui.desktop

@ -0,0 +1,3 @@
{% calculate format='kde' %}
[Desktop Entry]
Icon=modem-manager-gui

2
merge/net-misc/modemmanager/.calculate_directory

@ -0,0 +1,2 @@
{% calculater append='skip', package='net-misc/modemmanager' %}

1
merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory

@ -0,0 +1 @@
{% calculate path='/usr/share/dbus-1' name='system-services', exists('/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service') %}

4
merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service

@ -0,0 +1,4 @@
{% calculate format='kde' %}
[D-BUS Service]
Exec=/usr/sbin/ModemManager --log-level=ERR

1
merge/net-misc/netifrc/.calculate_directory

@ -0,0 +1 @@
{% calculate path='/etc', name='conf.d', package='net-misc/netifrc' %}

6
merge/net-misc/netifrc/01_unpack_net.example

@ -0,0 +1,6 @@
{% calculate run='/bin/bash' %}
SOURCE="{{ main.cl_chroot_path }}/usr/share/doc/netifrc-*/net.example.bz2"
DEST="{{ main.cl_chroot_path }}/etc/conf.d/net.example"
[[ -f $SOURCE ]] && bzip2 -dc "$SOURCE" >"$DEST"
exit 0

3
merge/net-misc/netifrc/02_link_net.example

@ -0,0 +1,3 @@
{% calculate format='regex', name='net.example', exists('/etc/conf.d/net.example') %}
<reg>QUICK-START</reg>
<text>QUICK-START</text>

1
merge/net-misc/openssh/.calculate_directory

@ -0,0 +1 @@
{% calculate name='etc', package='net-misc/openssh' %}

2
merge/net-misc/openssh/ssh/ssh_config

@ -0,0 +1,2 @@
{% calculate append='after', (not grep('/etc/ssh/ssh_config', '^SendEnv LANG LC_' )) %}
SendEnv LANG LC_*

24
merge/net-misc/openssh/ssh/sshd_config

@ -0,0 +1,24 @@
{% calculate format='regex', multiline %}
<!--
Добавление DenyUser в конец файла, если параметра нет,
Добавление Subsystem sftp /usr/lib64/misc/sftp-server если нет
Включение опции PermitRootLogin yes
-->
<reg>([^\n])\Z</reg>
<text>\1\n</text>
{% if not grep('/etc/ssh/sshd_config', '^DenyUsers guest') %}
<reg>\Z</reg>
<text>DenyUsers guest\n</text>
{% endif %}
{% if not grep('/etc/ssh/sshd_config', '^Subsystem sftp.*sftp-server') %}
<reg>\Z</reg>
{% if main.os.arch.machine == 'x86_64' %}
<text>Subsystem sftp /usr/lib64/misc/sftp-server\n</text>
{% else %}
<text>Subsystem sftp /usr/lib/misc/sftp-server\n</text>
{% endif %}
{% endif %}
<reg>\n.*[^"]PermitRootLogin.*</reg>
<text></text>
<reg>\nUsePAM</reg>
<text>\nPermitRootLogin yes\nUsePAM</text>
Loading…
Cancel
Save