From d18ba202e897c772a52dc2779d6cf8f8f82c988a Mon Sep 17 00:00:00 2001 From: Kay Marquardt Date: Sat, 27 Jan 2018 21:04:46 +0100 Subject: [PATCH 1/8] fix deleted lang strings german translator always sort strings, so I overlooked two new strings and there was removed ... fixed --- software/lang/de | 2 ++ 1 file changed, 2 insertions(+) diff --git a/software/lang/de b/software/lang/de index 11b1324b9..31445bb70 100644 --- a/software/lang/de +++ b/software/lang/de @@ -125,6 +125,8 @@ edit_title=Paket bearbeiten edit_uninst=Deinstallieren edit_vend=Hersteller edit_ver=Version +edit_listdesc=Zeige alle Dateien in diesem Paket und ihren aktuellen Überprüfungsstatus an. +edit_uninstdesc=Entfernt dieses Paket von Ihrem System. emerge_class=Klasse emerge_desc=Beschreibung emerge_failed=.. Installation fehlgeschlagen! From a0007fb56692701367d9ee8c209322746e026579 Mon Sep 17 00:00:00 2001 From: Kay Marquardt Date: Sat, 27 Jan 2018 21:07:04 +0100 Subject: [PATCH 2/8] re add synology ipkg to config.info --- software/config.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/config.info b/software/config.info index ba3407864..682509aaf 100644 --- a/software/config.info +++ b/software/config.info @@ -1,3 +1,3 @@ -package_system=Package management system,1,rpm-RPM,pkgadd-Solaris,hpux-HPUX,freebsd-FreeBSD,slackware-Slackware,debian-Debian,aix-AIX,emerge-Gentoo,cygwin-Cygwin,msi-Microsoft Installer,pkgsrc-PKGsrc +package_system=Package management system,1,rpm-RPM,pkgadd-Solaris,hpux-HPUX,freebsd-FreeBSD,slackware-Slackware,debian-Debian,aix-AIX,emerge-Gentoo,cygwin-Cygwin,msi-Microsoft Installer,pkgsrc-PKGsrc,ipkg-Synology Package Manager update_system=Package update system,1,-Detect automatically,apt-APT,yum-YUM,rhn-Redhat Network,csw-Blastwave CSW,urpmi-URPMI,emerge-Emerge,ports-FreeBSD Ports,pkg-FreeBSD pkgng,pkgsrc-PKGsrc,*-None apt_mode=Command to use for APT installs,1,0-apt-get,1-aptitude From 7ba5006b37f9b8368675d99fad753d9ed67576af Mon Sep 17 00:00:00 2001 From: Gnadelwartz Date: Sat, 27 Jan 2018 21:35:26 +0100 Subject: [PATCH 3/8] fix perl path in ipkg cgi's --- software/ipkg-close.cgi | 2 +- software/ipkg-closeall.cgi | 2 +- software/ipkg-edit_pack.cgi | 2 +- software/ipkg-open.cgi | 2 +- software/ipkg-openall.cgi | 2 +- software/ipkg-tree.cgi | 2 +- software/ipkg_upgrade.cgi | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/software/ipkg-close.cgi b/software/ipkg-close.cgi index 5dfacf74d..7ecf25f47 100755 --- a/software/ipkg-close.cgi +++ b/software/ipkg-close.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # close.cgi # Remove some class from the open list diff --git a/software/ipkg-closeall.cgi b/software/ipkg-closeall.cgi index 97dc1475d..54c38a4fc 100755 --- a/software/ipkg-closeall.cgi +++ b/software/ipkg-closeall.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # closeall.cgi # Empty the open list diff --git a/software/ipkg-edit_pack.cgi b/software/ipkg-edit_pack.cgi index e57c44e6e..eba60fa01 100755 --- a/software/ipkg-edit_pack.cgi +++ b/software/ipkg-edit_pack.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # edit_pack.cgi # Displays the details of an existing package, with links to uninstall and # other options diff --git a/software/ipkg-open.cgi b/software/ipkg-open.cgi index 586b651ad..c907cfd63 100755 --- a/software/ipkg-open.cgi +++ b/software/ipkg-open.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # open.cgi # Add some class to the open list diff --git a/software/ipkg-openall.cgi b/software/ipkg-openall.cgi index ef09863f4..9612295f0 100755 --- a/software/ipkg-openall.cgi +++ b/software/ipkg-openall.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # openall.cgi # Add all classes to the open list diff --git a/software/ipkg-tree.cgi b/software/ipkg-tree.cgi index f0bc6125b..0163799e7 100755 --- a/software/ipkg-tree.cgi +++ b/software/ipkg-tree.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # tree.cgi # Display the package tree diff --git a/software/ipkg_upgrade.cgi b/software/ipkg_upgrade.cgi index a94cfb353..4f3a7bf4b 100755 --- a/software/ipkg_upgrade.cgi +++ b/software/ipkg_upgrade.cgi @@ -1,4 +1,4 @@ -#!/opt/bin/perl +#!/usr/local/bin/perl # Upgrade all packages, or update the database of IPKG packages require './software-lib.pl'; From 2de07c851cc926088ffbe224636ac0e2c905cb4d Mon Sep 17 00:00:00 2001 From: Gnadelwartz Date: Sat, 27 Jan 2018 21:57:57 +0100 Subject: [PATCH 4/8] remove unneeded config-syno-linux --- ajaxterm/config-syno-linux | 2 -- backup-config/config-syno-linux | 5 --- bacula-backup/config-syno-linux | 11 ------- bandwidth/config-syno-linux | 1 - burner/config-syno-linux | 6 ---- cluster-copy/config-syno-linux | 1 - cluster-passwd/config-syno-linux | 3 -- cluster-software/config-syno-linux | 2 -- cluster-useradmin/config-syno-linux | 9 ------ cluster-usermin/config-syno-linux | 2 -- cluster-webmin/config-syno-linux | 2 -- custom/config-syno-linux | 4 --- dovecot/config-syno-linux | 3 -- exim/config-syno-linux | 7 ----- fdisk/config-syno-linux | 1 - filter/config-syno-linux | 6 ---- firewall/config-syno-linux | 6 ---- firewall6/config-syno-linux | 6 ---- firewalld/config-syno-linux | 2 -- format/config-syno-linux | 2 -- frox/config-syno-linux | 2 -- htaccess-htpasswd/config-syno-linux | 7 ----- idmapd/config-syno-linux | 3 -- ipfilter/config-syno-linux | 9 ------ ipfw/config-syno-linux | 6 ---- iscsi-client/config-syno-linux | 6 ---- iscsi-server/config-syno-linux | 6 ---- iscsi-target/config-syno-linux | 7 ----- krb5/config-syno-linux | 1 - lilo/config-syno-linux | 2 -- lvm/config-syno-linux | 2 -- mailboxes/config-syno-linux | 47 ----------------------------- mailcap/config-syno-linux | 1 - mon/config-syno-linux | 7 ----- package-updates/config-syno-linux | 2 -- passwd/config-syno-linux | 3 -- ppp-client/config-syno-linux | 3 -- pptp-client/config-syno-linux | 5 --- procmail/config-syno-linux | 3 -- pserver/config-syno-linux | 3 -- qmailadmin/config-syno-linux | 13 -------- raid/config-syno-linux | 3 -- rbac/config-syno-linux | 10 ------ sarg/config-syno-linux | 4 --- sgiexports/config-syno-linux | 2 -- shell/config-syno-linux | 3 -- shorewall/config-syno-linux | 5 --- shorewall6/config-syno-linux | 5 --- smart-status/config-syno-linux | 4 --- spam/config-syno-linux | 10 ------ tcpwrappers/config-syno-linux | 3 -- telnet/config-syno-linux | 6 ---- tunnel/config-syno-linux | 1 - updown/config-syno-linux | 4 --- usermin/config-syno-linux | 7 ----- vgetty/config-syno-linux | 2 -- webmin/config-syno-linux | 11 ------- webmincron/config-syno-linux | 0 webminlog/config-syno-linux | 1 - zones/config-syno-linux | 2 -- 60 files changed, 302 deletions(-) delete mode 100644 ajaxterm/config-syno-linux delete mode 100644 backup-config/config-syno-linux delete mode 100644 bacula-backup/config-syno-linux delete mode 100644 bandwidth/config-syno-linux delete mode 100644 burner/config-syno-linux delete mode 100644 cluster-copy/config-syno-linux delete mode 100644 cluster-passwd/config-syno-linux delete mode 100644 cluster-software/config-syno-linux delete mode 100644 cluster-useradmin/config-syno-linux delete mode 100644 cluster-usermin/config-syno-linux delete mode 100644 cluster-webmin/config-syno-linux delete mode 100644 custom/config-syno-linux delete mode 100644 dovecot/config-syno-linux delete mode 100644 exim/config-syno-linux delete mode 100644 fdisk/config-syno-linux delete mode 100644 filter/config-syno-linux delete mode 100644 firewall/config-syno-linux delete mode 100644 firewall6/config-syno-linux delete mode 100644 firewalld/config-syno-linux delete mode 100644 format/config-syno-linux delete mode 100644 frox/config-syno-linux delete mode 100644 htaccess-htpasswd/config-syno-linux delete mode 100644 idmapd/config-syno-linux delete mode 100644 ipfilter/config-syno-linux delete mode 100644 ipfw/config-syno-linux delete mode 100644 iscsi-client/config-syno-linux delete mode 100644 iscsi-server/config-syno-linux delete mode 100644 iscsi-target/config-syno-linux delete mode 100644 krb5/config-syno-linux delete mode 100644 lilo/config-syno-linux delete mode 100644 lvm/config-syno-linux delete mode 100644 mailboxes/config-syno-linux delete mode 100644 mailcap/config-syno-linux delete mode 100644 mon/config-syno-linux delete mode 100644 package-updates/config-syno-linux delete mode 100644 passwd/config-syno-linux delete mode 100644 ppp-client/config-syno-linux delete mode 100644 pptp-client/config-syno-linux delete mode 100644 procmail/config-syno-linux delete mode 100644 pserver/config-syno-linux delete mode 100644 qmailadmin/config-syno-linux delete mode 100644 raid/config-syno-linux delete mode 100644 rbac/config-syno-linux delete mode 100644 sarg/config-syno-linux delete mode 100644 sgiexports/config-syno-linux delete mode 100644 shell/config-syno-linux delete mode 100644 shorewall/config-syno-linux delete mode 100644 shorewall6/config-syno-linux delete mode 100644 smart-status/config-syno-linux delete mode 100644 spam/config-syno-linux delete mode 100644 tcpwrappers/config-syno-linux delete mode 100644 telnet/config-syno-linux delete mode 100644 tunnel/config-syno-linux delete mode 100644 updown/config-syno-linux delete mode 100644 usermin/config-syno-linux delete mode 100644 vgetty/config-syno-linux delete mode 100644 webmin/config-syno-linux delete mode 100644 webmincron/config-syno-linux delete mode 100644 webminlog/config-syno-linux delete mode 100644 zones/config-syno-linux diff --git a/ajaxterm/config-syno-linux b/ajaxterm/config-syno-linux deleted file mode 100644 index 2bfd50046..000000000 --- a/ajaxterm/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -timeout=120 -autologin=1-Open-Root diff --git a/backup-config/config-syno-linux b/backup-config/config-syno-linux deleted file mode 100644 index 2ffc6d065..000000000 --- a/backup-config/config-syno-linux +++ /dev/null @@ -1,5 +0,0 @@ -dest=/var/packages/webmin/target/backup/webmin_backup.tgz -apply=1 -date_subs=0 -mods=apache webmin -webmin_subs=0 diff --git a/bacula-backup/config-syno-linux b/bacula-backup/config-syno-linux deleted file mode 100644 index 66a6ddd13..000000000 --- a/bacula-backup/config-syno-linux +++ /dev/null @@ -1,11 +0,0 @@ -showdirs=0 -bls=bls -init_start=0 -wait=1 -bextract=bextract -btape=btape -driver=Pg -bacula_dir=/opt/etc/bacula -db=bacula -apply=1 -user=bacula diff --git a/bandwidth/config-syno-linux b/bandwidth/config-syno-linux deleted file mode 100644 index a8c41f7c1..000000000 --- a/bandwidth/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -bandwidth_log=/var/log/bandwidth diff --git a/burner/config-syno-linux b/burner/config-syno-linux deleted file mode 100644 index 91ecbfd4c..000000000 --- a/burner/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -speed=1 -mkisofs=mkisofs -sox=sox -mpg123=mpg123 -cdrdao=cdrdao -cdrecord=cdrecord diff --git a/cluster-copy/config-syno-linux b/cluster-copy/config-syno-linux deleted file mode 100644 index 9a3ce078b..000000000 --- a/cluster-copy/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -sort_mode=0 diff --git a/cluster-passwd/config-syno-linux b/cluster-passwd/config-syno-linux deleted file mode 100644 index 04110de95..000000000 --- a/cluster-passwd/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -max_users=200 -input_type=0 -sort_mode=0 diff --git a/cluster-software/config-syno-linux b/cluster-software/config-syno-linux deleted file mode 100644 index 470eaee86..000000000 --- a/cluster-software/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -sort_mode=0 -table_mode=0 diff --git a/cluster-useradmin/config-syno-linux b/cluster-useradmin/config-syno-linux deleted file mode 100644 index 3f57fc350..000000000 --- a/cluster-useradmin/config-syno-linux +++ /dev/null @@ -1,9 +0,0 @@ -conf_find_user=1 -conf_allow_sync=1 -sort_mode=0 -table_mode=0 -conf_host_links=1 -conf_add_group=1 -conf_allow_refresh=1 -conf_add_user=1 -conf_find_group=1 diff --git a/cluster-usermin/config-syno-linux b/cluster-usermin/config-syno-linux deleted file mode 100644 index fd788cb1e..000000000 --- a/cluster-usermin/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -table_mode=0 -sort_mode=0 diff --git a/cluster-webmin/config-syno-linux b/cluster-webmin/config-syno-linux deleted file mode 100644 index 470eaee86..000000000 --- a/cluster-webmin/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -sort_mode=0 -table_mode=0 diff --git a/custom/config-syno-linux b/custom/config-syno-linux deleted file mode 100644 index dc900c645..000000000 --- a/custom/config-syno-linux +++ /dev/null @@ -1,4 +0,0 @@ -params_file=0 -params_cmd=0 -columns=2 -display_mode=0 diff --git a/dovecot/config-syno-linux b/dovecot/config-syno-linux deleted file mode 100644 index 51921f156..000000000 --- a/dovecot/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -dovecot_config=/var/packages/MailServer/target/etc/dovecot/dovecot.conf -dovecot=/var/packages/MailServer/target/sbin/dovecot -pid_file=/var/run/dovecot/master.pid diff --git a/exim/config-syno-linux b/exim/config-syno-linux deleted file mode 100644 index 6f721234f..000000000 --- a/exim/config-syno-linux +++ /dev/null @@ -1,7 +0,0 @@ -exim_dbmext=.dbm -exim_virt_dir=/etc/exim4/aliases -exim_addrfile=/etc/exim4/email-addresses -exim_dir=/etc/exim4 -mail_system=1 -exim_dbmfile=/etc/exim4/local_domains -exim_mail_file=Maildir diff --git a/fdisk/config-syno-linux b/fdisk/config-syno-linux deleted file mode 100644 index 65c47488e..000000000 --- a/fdisk/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -format=msdos diff --git a/filter/config-syno-linux b/filter/config-syno-linux deleted file mode 100644 index 6e3042b4f..000000000 --- a/filter/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -reply_force=0 -virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl -warn_procmail=1 -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases -forward_procmail=0 -virtualmin_config=/etc/webmin/virtual-server diff --git a/firewall/config-syno-linux b/firewall/config-syno-linux deleted file mode 100644 index df57d6149..000000000 --- a/firewall/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -comment_mod=0 -force_init=0 -direct=0 -cluster_mode=1 -view_comment=0 -view_condition=1 diff --git a/firewall6/config-syno-linux b/firewall6/config-syno-linux deleted file mode 100644 index ca34210fa..000000000 --- a/firewall6/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -view_comment=0 -cluster_mode=1 -view_condition=1 -force_init=0 -comment_mod=0 -direct=0 diff --git a/firewalld/config-syno-linux b/firewalld/config-syno-linux deleted file mode 100644 index 0aae64fac..000000000 --- a/firewalld/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -init_name=firewalld -firewall_cmd=firewall-cmd diff --git a/format/config-syno-linux b/format/config-syno-linux deleted file mode 100644 index 6dd2c287f..000000000 --- a/format/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -metastat_path=/usr/opt/SUNWmd/sbin/metastat -metadb_path=/usr/opt/SUNWmd/sbin/metadb diff --git a/frox/config-syno-linux b/frox/config-syno-linux deleted file mode 100644 index 315052933..000000000 --- a/frox/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -frox=/usr/local/sbin/frox -frox_conf=/usr/local/etc/frox.conf diff --git a/htaccess-htpasswd/config-syno-linux b/htaccess-htpasswd/config-syno-linux deleted file mode 100644 index 3c1d2c388..000000000 --- a/htaccess-htpasswd/config-syno-linux +++ /dev/null @@ -1,7 +0,0 @@ -md5=1 -digest=1 -sha1=0 -htgroups=.htgroups -htpasswd=.htpasswd -htaccess=.htaccess -sort=0 diff --git a/idmapd/config-syno-linux b/idmapd/config-syno-linux deleted file mode 100644 index f32798d4d..000000000 --- a/idmapd/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -idmapd_path=/usr/sbin/rpc.idmapd -idmapd_conf=/etc/idmapd.conf -restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi diff --git a/ipfilter/config-syno-linux b/ipfilter/config-syno-linux deleted file mode 100644 index 97648d9c1..000000000 --- a/ipfilter/config-syno-linux +++ /dev/null @@ -1,9 +0,0 @@ -ipf=ipf -view_comment=0 -view_condition=1 -ipnat=ipnat -ipf_conf=/etc/ipf/ipf.conf -cluster_mode=0 -ipfstat=ipfstat -ipnat_conf=/etc/ipf/ipnat.conf -cluster_nat=1 diff --git a/ipfw/config-syno-linux b/ipfw/config-syno-linux deleted file mode 100644 index 403cb6c3f..000000000 --- a/ipfw/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -version=2 -view_counters=0 -view_comment=0 -cluster_mode=0 -view_condition=1 -ipfw=/sbin/ipfw diff --git a/iscsi-client/config-syno-linux b/iscsi-client/config-syno-linux deleted file mode 100644 index be1c570ec..000000000 --- a/iscsi-client/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -iscsiiname=/sbin/iscsi-iname -ifaces_dir=/var/lib/iscsi/ifaces -config_file=/etc/iscsi/iscsid.conf -init_name=iscsid iscsi -iscsiadm=/sbin/iscsiadm -initiator_file=/etc/iscsi/initiatorname.iscsi diff --git a/iscsi-server/config-syno-linux b/iscsi-server/config-syno-linux deleted file mode 100644 index b4f70c025..000000000 --- a/iscsi-server/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -pid_file=/var/run/iscsi-target.pid -auths_file=/etc/iscsi/auths -opts_file=/etc/sysconfig/netbsd-iscsi -iscsi_server=/usr/sbin/iscsi-target -init_name=netbsd-iscsi -targets_file=/etc/iscsi/targets diff --git a/iscsi-target/config-syno-linux b/iscsi-target/config-syno-linux deleted file mode 100644 index f897f138e..000000000 --- a/iscsi-target/config-syno-linux +++ /dev/null @@ -1,7 +0,0 @@ -opts_file=/etc/sysconfig/iscsi-target -pid_file=/var/run/ietd.pid -initiators_file=/etc/iet/initiators.allow -init_name=iscsi-target -targets_file=/etc/iet/targets.allow -config_file=/etc/iet/ietd.conf -ietadm=ietadm diff --git a/krb5/config-syno-linux b/krb5/config-syno-linux deleted file mode 100644 index 7a8278932..000000000 --- a/krb5/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -krb5_conf=/etc/krb5.conf diff --git a/lilo/config-syno-linux b/lilo/config-syno-linux deleted file mode 100644 index a9d74c2d5..000000000 --- a/lilo/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -lilo_conf=/etc/lilo.conf -lilo_cmd=/sbin/lilo diff --git a/lvm/config-syno-linux b/lvm/config-syno-linux deleted file mode 100644 index a5ef0ed4d..000000000 --- a/lvm/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -show_table=0 -lvm_conf=/etc/lvm/lvm.conf diff --git a/mailboxes/config-syno-linux b/mailboxes/config-syno-linux deleted file mode 100644 index cd99bf17b..000000000 --- a/mailboxes/config-syno-linux +++ /dev/null @@ -1,47 +0,0 @@ -maildir_deleted=0 -sync_perms=0700 -show_delall=0 -sort_mode=1 -column_count=4 -fwd_mode=0 -no_orig_ip=0 -show_mail=0 -sync_create=0 -spam_del=0 -wrap_width=80 -sync_delete=1 -mail_dir=Maildir -show_count=1 -show_size_below=0 -sync_modify=1 -no_mailer=0 -link_mode=1 -date_fmt=dmy -size_mode=1 -sig_file=.signature -view_html=1 -mail_style=0 -arrows=1 -from_virtualmin=1 -vpopmail_dir=/home/vpopmail -show_body=1 -delete_warn=y -no_crlf=0 -auto=1 -noindex_hostname=0 -show_sent=0 -max_records=200 -ignore_users_enabled=0 -html_quote=0 -track_read=0 -mail_system=0 -top_buttons=2 -show_unread=2 -check_mod=1 -log_read=0 -open_mode=0 -perpage=20 -show_to=0 -show_size=1 -spam_buttons=mail -html_edit=0 diff --git a/mailcap/config-syno-linux b/mailcap/config-syno-linux deleted file mode 100644 index cecb3e04d..000000000 --- a/mailcap/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -mailcap=/etc/mailcap diff --git a/mon/config-syno-linux b/mon/config-syno-linux deleted file mode 100644 index 9a3febb57..000000000 --- a/mon/config-syno-linux +++ /dev/null @@ -1,7 +0,0 @@ -pid_file=/var/run/mon.pid -start_cmd=/etc/init.d/mon start -cfbasedir=/etc/mon -monshow=/usr/bin/monshow -restart_cmd=/etc/init.d/mon restart -mon_cgi=/var/www/cgi-bin/mon.cgi -stop_cmd=/etc/init.d/mon stop diff --git a/package-updates/config-syno-linux b/package-updates/config-syno-linux deleted file mode 100644 index 195d872e7..000000000 --- a/package-updates/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -update_multiple=1 -cache_time=6 diff --git a/passwd/config-syno-linux b/passwd/config-syno-linux deleted file mode 100644 index 2ab4c6af1..000000000 --- a/passwd/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -input_type=0 -sort_mode=0 -max_users=200 diff --git a/ppp-client/config-syno-linux b/ppp-client/config-syno-linux deleted file mode 100644 index 54849d0a2..000000000 --- a/ppp-client/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -wvdialconf=wvdialconf -wvdial=wvdial -file=/etc/wvdial.conf diff --git a/pptp-client/config-syno-linux b/pptp-client/config-syno-linux deleted file mode 100644 index de156e886..000000000 --- a/pptp-client/config-syno-linux +++ /dev/null @@ -1,5 +0,0 @@ -pap_file=/etc/ppp/chap-secrets -timeout=30 -pptp=pptp -peers_dir=/etc/ppp/peers -pptp_options=/etc/ppp/options diff --git a/procmail/config-syno-linux b/procmail/config-syno-linux deleted file mode 100644 index 9b36ccfbe..000000000 --- a/procmail/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -procmail=procmail -procmailrc=/etc/procmailrc -includes=0 diff --git a/pserver/config-syno-linux b/pserver/config-syno-linux deleted file mode 100644 index fb8158089..000000000 --- a/pserver/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -cvsroot=/usr/local/cvsroot -view_header=header.html -cvs=cvs diff --git a/qmailadmin/config-syno-linux b/qmailadmin/config-syno-linux deleted file mode 100644 index 7d0a0f995..000000000 --- a/qmailadmin/config-syno-linux +++ /dev/null @@ -1,13 +0,0 @@ -columns=2 -mail_dir_qmail=Maildir -perpage=20 -delete_warn=1 -mailq_count=0 -qmail_dir=/var/qmail -fwd_mode=0 -mail_system=1 -sort_mode=0 -mail_file=Mailbox -max_records=200 -index_min=1000000 -mailq_sort=0 diff --git a/raid/config-syno-linux b/raid/config-syno-linux deleted file mode 100644 index 2819b647a..000000000 --- a/raid/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -mdadm=/etc/mdadm.conf -raidtab=/etc/raidtab -mdstat=/proc/mdstat diff --git a/rbac/config-syno-linux b/rbac/config-syno-linux deleted file mode 100644 index ef12575dd..000000000 --- a/rbac/config-syno-linux +++ /dev/null @@ -1,10 +0,0 @@ -project=/etc/project -crypt_conf=/etc/security/crypt.conf -exec_attr=/etc/security/exec_attr -user_attr=/etc/user_attr -auth_attr=/etc/security/auth_attr -prof_help_dir=/usr/lib/help/profiles/locale/C -auth_help_dir=/usr/lib/help/auths/locale/C -policy_conf=/etc/security/policy.conf -base_id=100 -prof_attr=/etc/security/prof_attr diff --git a/sarg/config-syno-linux b/sarg/config-syno-linux deleted file mode 100644 index d951d9c74..000000000 --- a/sarg/config-syno-linux +++ /dev/null @@ -1,4 +0,0 @@ -sarg=sarg -clear=1 -naked=0 -sarg_conf=/usr/local/sarg/sarg.conf diff --git a/sgiexports/config-syno-linux b/sgiexports/config-syno-linux deleted file mode 100644 index 476fa69a2..000000000 --- a/sgiexports/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -exports_file=/etc/exports -apply_cmd=exportfs -u -a ; exportfs -a diff --git a/shell/config-syno-linux b/shell/config-syno-linux deleted file mode 100644 index 4b3e40b52..000000000 --- a/shell/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -max_output=100000 -max_runtime=86400 -clear_envs=0 diff --git a/shorewall/config-syno-linux b/shorewall/config-syno-linux deleted file mode 100644 index 7e55b32a1..000000000 --- a/shorewall/config-syno-linux +++ /dev/null @@ -1,5 +0,0 @@ -macros=/usr/share/shorewall -shorewall=shorewall -display_zone_descriptions=1 -config_dir=/etc/shorewall -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std diff --git a/shorewall6/config-syno-linux b/shorewall6/config-syno-linux deleted file mode 100644 index 42ceae00a..000000000 --- a/shorewall6/config-syno-linux +++ /dev/null @@ -1,5 +0,0 @@ -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -shorewall6=shorewall6 -config_dir=/etc/shorewall6 -display_zone_descriptions=1 -macros=/usr/share/shorewall6 diff --git a/smart-status/config-syno-linux b/smart-status/config-syno-linux deleted file mode 100644 index 500f2f2e4..000000000 --- a/smart-status/config-syno-linux +++ /dev/null @@ -1,4 +0,0 @@ -mode=1 -attribs=1 -smartctl=smartctl -ata=1 diff --git a/spam/config-syno-linux b/spam/config-syno-linux deleted file mode 100644 index 9a2104b92..000000000 --- a/spam/config-syno-linux +++ /dev/null @@ -1,10 +0,0 @@ -mode=0 -addto=0 -sa_learn=/var/packages/MailServer/target/bin/sa-learn -spamassassin=/var/packages/MailServer/target/bin/spamassassin -local_cf=/var/packages/MailServer/target/etc/spamassassin/local.cf -procmail_cmd=* -call_spam=1 -max_awl=200 -processes=spamd amavisd -warn_procmail=1 diff --git a/tcpwrappers/config-syno-linux b/tcpwrappers/config-syno-linux deleted file mode 100644 index 9539a8514..000000000 --- a/tcpwrappers/config-syno-linux +++ /dev/null @@ -1,3 +0,0 @@ -hosts_deny=/etc/hosts.deny -inetd_services=0 -hosts_allow=/etc/hosts.allow diff --git a/telnet/config-syno-linux b/telnet/config-syno-linux deleted file mode 100644 index ea2877d4b..000000000 --- a/telnet/config-syno-linux +++ /dev/null @@ -1,6 +0,0 @@ -proxy=0 -no_test=0 -detach=0 -sizemode=0 -fontsize=12 -mode=1 diff --git a/tunnel/config-syno-linux b/tunnel/config-syno-linux deleted file mode 100644 index b205bdb97..000000000 --- a/tunnel/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -loginmode=0 diff --git a/updown/config-syno-linux b/updown/config-syno-linux deleted file mode 100644 index 1f8745078..000000000 --- a/updown/config-syno-linux +++ /dev/null @@ -1,4 +0,0 @@ -user=root -dir=/ -ddir=/ -duser=root diff --git a/usermin/config-syno-linux b/usermin/config-syno-linux deleted file mode 100644 index fcf9965ab..000000000 --- a/usermin/config-syno-linux +++ /dev/null @@ -1,7 +0,0 @@ -usermin_dir=/etc/usermin -updays=1 -upmissing=0 -update=0 -upshow=1 -cron_mode=0 -uphour=4 diff --git a/vgetty/config-syno-linux b/vgetty/config-syno-linux deleted file mode 100644 index bb4eec4d2..000000000 --- a/vgetty/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -vgetty_cmd=vgetty -vgetty_config=/etc/mgetty+sendfax/voice.conf diff --git a/webmin/config-syno-linux b/webmin/config-syno-linux deleted file mode 100644 index 0b9e34400..000000000 --- a/webmin/config-syno-linux +++ /dev/null @@ -1,11 +0,0 @@ -upmins=0 -last_version_number=1.870 -upmissing=0 -cron_mode=0 -warn_days=7 -updays=1 -update=0 -last_version_check=1514321133 -osdn=1 -uphour=0 -upshow=1 diff --git a/webmincron/config-syno-linux b/webmincron/config-syno-linux deleted file mode 100644 index e69de29bb..000000000 diff --git a/webminlog/config-syno-linux b/webminlog/config-syno-linux deleted file mode 100644 index 1b0a9a643..000000000 --- a/webminlog/config-syno-linux +++ /dev/null @@ -1 +0,0 @@ -host_search=0 diff --git a/zones/config-syno-linux b/zones/config-syno-linux deleted file mode 100644 index 85df22980..000000000 --- a/zones/config-syno-linux +++ /dev/null @@ -1,2 +0,0 @@ -base_dir=/zones -list_mode=0 From 37b51a7a2c38f81f39b3ff03cac87c873aad5c7c Mon Sep 17 00:00:00 2001 From: Gnadelwartz Date: Sat, 27 Jan 2018 22:28:37 +0100 Subject: [PATCH 5/8] some minor ipkg enhancements --- software/ipkg-edit_pack.cgi | 8 ++++---- software/ipkg-openall.cgi | 2 +- software/lang/de | 3 +-- software/lang/en | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/software/ipkg-edit_pack.cgi b/software/ipkg-edit_pack.cgi index eba60fa01..7e6b055c5 100755 --- a/software/ipkg-edit_pack.cgi +++ b/software/ipkg-edit_pack.cgi @@ -32,11 +32,11 @@ if (!$pinfo[7]) { &ui_hidden("search", $in{'search'})); } else { # Show botton to install - print &ui_form_start("install_pack.cgi"), + print &ui_buttons_row("install_pack.cgi", + $text{'IPKG_install_package'}, + $text{'IPKG_install_packagedesc'}, &ui_hidden("update", $pinfo[0]). - &ui_hidden("source", 3). - &ui_submit($text{'IPKG_install_package'}); - ui_form_end(); + &ui_hidden("source", 3)); } diff --git a/software/ipkg-openall.cgi b/software/ipkg-openall.cgi index 9612295f0..f09663798 100755 --- a/software/ipkg-openall.cgi +++ b/software/ipkg-openall.cgi @@ -3,7 +3,7 @@ # Add all classes to the open list require './software-lib.pl'; -$n = &list_packages(); +$n = &list_packages("ALL"); for($i=0; $i<$n; $i++) { @w = split(/\//, $packages{$i,'class'}); for($j=0; $j<@w; $j++) { diff --git a/software/lang/de b/software/lang/de index 31445bb70..39253f15d 100644 --- a/software/lang/de +++ b/software/lang/de @@ -125,8 +125,6 @@ edit_title=Paket bearbeiten edit_uninst=Deinstallieren edit_vend=Hersteller edit_ver=Version -edit_listdesc=Zeige alle Dateien in diesem Paket und ihren aktuellen Überprüfungsstatus an. -edit_uninstdesc=Entfernt dieses Paket von Ihrem System. emerge_class=Klasse emerge_desc=Beschreibung emerge_failed=.. Installation fehlgeschlagen! @@ -411,5 +409,6 @@ IPKG_ok=.. Installation erfolgreich. IPKG_failed=.. Installation fehlgeschlagen! IPKG_index_tree=Verwalte IPKG Pakete IPKG_install_package=Installieren +IPKG_install_packagedesc=Installiere dieses Paket auf Deinem System IPKG_noupgrade=Nichts zu aktualisieren IPKG-edit_title=Verwalte IPKG Paket diff --git a/software/lang/en b/software/lang/en index ec151bdb5..d7481de9a 100644 --- a/software/lang/en +++ b/software/lang/en @@ -443,5 +443,6 @@ IPKG_ok=.. install complete. IPKG_failed=.. install failed! IPKG_index_tree=Manage IPKG Packages IPKG_install_package=Install +IPKG_install_packagedesc=Install this package on your system IPKG_noupgrade=Nothing to upgrade IPKG-edit_title=Manage IPKG Package From 3952a2934fb50459a95f4bfa9ba34c9b4e90169a Mon Sep 17 00:00:00 2001 From: Gnadelwartz Date: Sat, 27 Jan 2018 22:42:12 +0100 Subject: [PATCH 6/8] ups, removed some config-syno-linux to much --- backup-config/config-syno-linux | 5 +++++ bacula-backup/config-syno-linux | 11 +++++++++++ dovecot/config-syno-linux | 3 +++ spam/config-syno-linux | 10 ++++++++++ 4 files changed, 29 insertions(+) create mode 100644 backup-config/config-syno-linux create mode 100644 bacula-backup/config-syno-linux create mode 100644 dovecot/config-syno-linux create mode 100644 spam/config-syno-linux diff --git a/backup-config/config-syno-linux b/backup-config/config-syno-linux new file mode 100644 index 000000000..2ffc6d065 --- /dev/null +++ b/backup-config/config-syno-linux @@ -0,0 +1,5 @@ +dest=/var/packages/webmin/target/backup/webmin_backup.tgz +apply=1 +date_subs=0 +mods=apache webmin +webmin_subs=0 diff --git a/bacula-backup/config-syno-linux b/bacula-backup/config-syno-linux new file mode 100644 index 000000000..66a6ddd13 --- /dev/null +++ b/bacula-backup/config-syno-linux @@ -0,0 +1,11 @@ +showdirs=0 +bls=bls +init_start=0 +wait=1 +bextract=bextract +btape=btape +driver=Pg +bacula_dir=/opt/etc/bacula +db=bacula +apply=1 +user=bacula diff --git a/dovecot/config-syno-linux b/dovecot/config-syno-linux new file mode 100644 index 000000000..51921f156 --- /dev/null +++ b/dovecot/config-syno-linux @@ -0,0 +1,3 @@ +dovecot_config=/var/packages/MailServer/target/etc/dovecot/dovecot.conf +dovecot=/var/packages/MailServer/target/sbin/dovecot +pid_file=/var/run/dovecot/master.pid diff --git a/spam/config-syno-linux b/spam/config-syno-linux new file mode 100644 index 000000000..9a2104b92 --- /dev/null +++ b/spam/config-syno-linux @@ -0,0 +1,10 @@ +mode=0 +addto=0 +sa_learn=/var/packages/MailServer/target/bin/sa-learn +spamassassin=/var/packages/MailServer/target/bin/spamassassin +local_cf=/var/packages/MailServer/target/etc/spamassassin/local.cf +procmail_cmd=* +call_spam=1 +max_awl=200 +processes=spamd amavisd +warn_procmail=1 From 9c41feeb08a1ae70f3e7c846a63bb3aa16e2f9ec Mon Sep 17 00:00:00 2001 From: Gnadelwartz Date: Sat, 27 Jan 2018 23:01:26 +0100 Subject: [PATCH 7/8] fix typo and version file in update-from-repo --- update-from-repo.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update-from-repo.sh b/update-from-repo.sh index 3df10ba33..f18bb7c08 100755 --- a/update-from-repo.sh +++ b/update-from-repo.sh @@ -162,9 +162,10 @@ if [[ $EUID -eq 0 ]]; then done #prepeare unattended upgrade + echo "${version}" >"${TEMP}/tarballs/${PROD}-${version}/version" cp "${TEMP}/maketemp.pl" "${TEMP}/tarballs/${PROD}-${version}" cp "${TEMP}/setup.sh" "${TEMP}/tarballs/${PROD}-${version}" - cp "${temp}/chinese-to-utf-8.pl" . + cp "${TEMP}/chinese-to-utf8.pl" . echo -en "${CYAN}search for config dir ... ${NC}" config_dir=`grep env_WEBMIN_CONFIG= ${MINICONF}| sed 's/.*_WEBMIN_CONFIG=//'` echo -e "${ORANGE}found: ${config_dir}${NC}" From d44d0db8d916cf01303f4d4dd3ab5eb86944b1a2 Mon Sep 17 00:00:00 2001 From: Gnadelwartz Date: Sat, 27 Jan 2018 23:08:17 +0100 Subject: [PATCH 8/8] lang strings again :-( --- software/lang/de | 2 ++ 1 file changed, 2 insertions(+) diff --git a/software/lang/de b/software/lang/de index 39253f15d..509cf4a3a 100644 --- a/software/lang/de +++ b/software/lang/de @@ -125,6 +125,8 @@ edit_title=Paket bearbeiten edit_uninst=Deinstallieren edit_vend=Hersteller edit_ver=Version +edit_listdesc=Zeige alle Dateien in diesem Paket und ihren aktuellen Überprüfungsstatus an. +edit_uninstdesc=Entfernt dieses Paket von Ihrem System. emerge_class=Klasse emerge_desc=Beschreibung emerge_failed=.. Installation fehlgeschlagen!