From 88dc6cd59a4efb4eb2189af6e6405aa3190ce467 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 29 Jan 2014 15:30:44 +0100 Subject: [server/configs] new module for ubuntu 13.10: fixes the unity panel not starting. Activate this in your server/configs/! Not activated by default for now ... --- .../share/dbus-1/services/com.canonical.Unity.Panel.Service.service | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service (limited to 'server/modules') diff --git a/server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service b/server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service new file mode 100644 index 00000000..c0e729ab --- /dev/null +++ b/server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=com.canonical.Unity.Panel.Service +Exec=/usr/lib/unity/unity-panel-service -- cgit v1.2.3-55-g7522 From 3893788e1cc74114e015ea483f0180b08959f9c2 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 29 Jan 2014 16:00:02 +0100 Subject: [pam-freiburg] deleted unneeded nss-ldap hack, since with nss-ldapd its ok to have the ldap switch in the nsswitch before ldap is actually "queryable" --- server/modules/pam-freiburg/etc/nsswitch.conf | 19 +++++++++++++++++++ .../etc/systemd/system/activate-nss-ldap.service | 10 ---------- .../getty.target.wants/activate-nss-ldap.service | 1 - 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 server/modules/pam-freiburg/etc/nsswitch.conf delete mode 100644 server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service delete mode 120000 server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service (limited to 'server/modules') diff --git a/server/modules/pam-freiburg/etc/nsswitch.conf b/server/modules/pam-freiburg/etc/nsswitch.conf new file mode 100644 index 00000000..85c1719a --- /dev/null +++ b/server/modules/pam-freiburg/etc/nsswitch.conf @@ -0,0 +1,19 @@ +# /etc/nsswitch.conf +# +# Example configuration of GNU Name Service Switch functionality. +# If you have the `glibc-doc-reference' and `info' packages installed, try: +# `info libc "Name Service Switch"' for information about this file. + +passwd: cache compat ldap +group: cache compat ldap +shadow: compat + +hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 +networks: files + +protocols: db files +services: db files +ethers: db files +rpc: db files + +netgroup: nis diff --git a/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service b/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service deleted file mode 100644 index 664f7dd7..00000000 --- a/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Activate NSS-LDAP lookups -Before=graphical.target - -[Service] -Type=oneshot -ExecStart=-/opt/openslx/bin/mkdir /tmp/ldap -ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd:.*$/passwd:\t\tcache files ldap/;s/^group:.*$/group:\t\tcache files ldap/' /etc/nsswitch.conf -ExecStart=/usr/bin/systemctl restart nscd - diff --git a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service b/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service deleted file mode 120000 index 1102840c..00000000 --- a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service +++ /dev/null @@ -1 +0,0 @@ -../activate-nss-ldap.service \ No newline at end of file -- cgit v1.2.3-55-g7522 From 567ab5a78d155d9463717411db3e5780222ef5ea Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 29 Jan 2014 16:17:06 +0100 Subject: bye bye plymouth. You won't be missed... --- remote/targets/stage31/plymouth | 1 - remote/targets/stage32-bwlp/plymouth | 1 - remote/targets/stage32-lightdm/plymouth | 1 - remote/targets/stage32-opensuse/plymouth | 1 - remote/targets/stage32-scientific/plymouth | 1 - remote/targets/stage32/plymouth | 1 - server/configs/freiburg/plymouth-freiburg | 1 - .../plymouth-freiburg/etc/systemd/system/plymouth-quit.service | 9 --------- 8 files changed, 16 deletions(-) delete mode 120000 remote/targets/stage31/plymouth delete mode 120000 remote/targets/stage32-bwlp/plymouth delete mode 120000 remote/targets/stage32-lightdm/plymouth delete mode 120000 remote/targets/stage32-opensuse/plymouth delete mode 120000 remote/targets/stage32-scientific/plymouth delete mode 120000 remote/targets/stage32/plymouth delete mode 120000 server/configs/freiburg/plymouth-freiburg delete mode 100644 server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service (limited to 'server/modules') diff --git a/remote/targets/stage31/plymouth b/remote/targets/stage31/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage31/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/remote/targets/stage32-bwlp/plymouth b/remote/targets/stage32-bwlp/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage32-bwlp/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/remote/targets/stage32-lightdm/plymouth b/remote/targets/stage32-lightdm/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage32-lightdm/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/remote/targets/stage32-opensuse/plymouth b/remote/targets/stage32-opensuse/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage32-opensuse/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/remote/targets/stage32-scientific/plymouth b/remote/targets/stage32-scientific/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage32-scientific/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/remote/targets/stage32/plymouth b/remote/targets/stage32/plymouth deleted file mode 120000 index 66a16832..00000000 --- a/remote/targets/stage32/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth \ No newline at end of file diff --git a/server/configs/freiburg/plymouth-freiburg b/server/configs/freiburg/plymouth-freiburg deleted file mode 120000 index 8a14eb6a..00000000 --- a/server/configs/freiburg/plymouth-freiburg +++ /dev/null @@ -1 +0,0 @@ -../../modules/plymouth-freiburg \ No newline at end of file diff --git a/server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service b/server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service deleted file mode 100644 index 0dd31ee4..00000000 --- a/server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Terminate Plymouth Boot Screen -Before=display-manager.service -After=systemd-user-sessions.service - -[Service] -ExecStart=-/bin/plymouth --retain-splash quit -Type=oneshot -TimeoutSec=20 -- cgit v1.2.3-55-g7522 From b9e172c56a991c7e3978fe5ab3c08f907c8c9b2a Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Tue, 4 Feb 2014 14:54:56 +0100 Subject: [freiburg-config] +ppd for Dell 1.OG, printer.conf --- .../etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd | 197 +++++++++++++++++++++ .../modules/cups-freiburg/etc/cups/printers.conf | 19 ++ 2 files changed, 216 insertions(+) create mode 100644 server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd (limited to 'server/modules') diff --git a/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd b/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd new file mode 100644 index 00000000..7fdf40ad --- /dev/null +++ b/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd @@ -0,0 +1,197 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Dell-3100cn-Postscript.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "POSTSCRI.PPD" +*Manufacturer: "Dell" +*Product: "(Laser Printer 3100cn)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Dell 3100cn" +*ShortNickName: "Dell 3100cn Postscript" +*NickName: "Dell 3100cn Foomatic/Postscript" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "MFG:Dell;MDL:Laser Printer 3100cn;CMD:PJL,RASTER,DOWNLOAD,PCLXL,PCL,POSTSCRIPT;DES:Dell Laser Printer 3100cn;DRV:DPostscript,R0,M0,TP;" + +*driverName Postscript/Postscript: "" +*driverType P/PostScript: "" +*driverUrl: "http://partners.adobe.com/public/developer/ps/index_specs.html" +*driverObsolete: False + + + + +*VariablePaperSize: False + +*FoomaticIDs: Dell-3100cn Postscript +*FoomaticRIPCommandLine: "cat%A%B%Z" +*FoomaticRIPNoPageAccounting: True + +*OpenGroup: General/General + +*OpenUI *PageSize/Page Size: PickOne +*OrderDependency: 100 AnySetup *PageSize +*DefaultPageSize: A4 +*PageSize A4/A4: "<>setpagedevice" +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize 11x17/11x17: "<>setpagedevice" +*PageSize A3/A3: "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize B5/B5 (JIS): "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC5/Envelope C5: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" +*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageSize Executive/Executive: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 100 AnySetup *PageRegion +*DefaultPageRegion: A4 +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion 11x17/11x17: "<>setpagedevice" +*PageRegion A3/A3: "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion B5/B5 (JIS): "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC5/Envelope C5: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" +*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageRegion Executive/Executive: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageRegion + +*DefaultImageableArea: A4 +*ImageableArea A4/A4: "18 36 577 806" +*ImageableArea Letter/US Letter: "18 36 594 756" +*ImageableArea 11x17/11x17: "18 36 774 1188" +*ImageableArea A3/A3: "18 36 824 1155" +*ImageableArea A5/A5: "18 36 403 559" +*ImageableArea B5/B5 (JIS): "18 36 498 693" +*ImageableArea Env10/Envelope #10: "18 36 279 648" +*ImageableArea EnvC5/Envelope C5: "18 36 441 613" +*ImageableArea EnvDL/Envelope DL: "18 36 294 588" +*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673" +*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" +*ImageableArea Executive/Executive: "18 36 504 720" +*ImageableArea Legal/US Legal: "18 36 594 972" + +*DefaultPaperDimension: A4 +*PaperDimension A4/A4: "595 842" +*PaperDimension Letter/US Letter: "612 792" +*PaperDimension 11x17/11x17: "792 1224" +*PaperDimension A3/A3: "842 1191" +*PaperDimension A5/A5: "421 595" +*PaperDimension B5/B5 (JIS): "516 729" +*PaperDimension Env10/Envelope #10: "297 684" +*PaperDimension EnvC5/Envelope C5: "459 649" +*PaperDimension EnvDL/Envelope DL: "312 624" +*PaperDimension EnvISOB5/Envelope B5: "499 709" +*PaperDimension EnvMonarch/Envelope Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension Legal/US Legal: "612 1008" + +*OpenUI *Resolution/Resolution: PickOne +*OrderDependency: 110 AnySetup *Resolution +*DefaultResolution: Unknown +*Resolution 150x150dpi/150 DPI: "<>setpagedevice" +*Resolution 300x300dpi/300 DPI: "<>setpagedevice" +*Resolution 600x600dpi/600 DPI: "<>setpagedevice" +*Resolution 1200x1200dpi/1200 DPI: "<>setpagedevice" +*CloseUI: *Resolution + +*OpenUI *Duplex/Double-Sided Printing: PickOne +*OrderDependency: 130 AnySetup *Duplex +*DefaultDuplex: DuplexTumble +*Duplex DuplexNoTumble/Long Edge (Standard): "<>setpagedevice" +*Duplex DuplexTumble/Short Edge (Flip): "<>setpagedevice" +*Duplex None/Off: "<>setpagedevice" +*CloseUI: *Duplex + +*CloseGroup: General + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff --git a/server/modules/cups-freiburg/etc/cups/printers.conf b/server/modules/cups-freiburg/etc/cups/printers.conf index 9031ca2d..2dd9791e 100644 --- a/server/modules/cups-freiburg/etc/cups/printers.conf +++ b/server/modules/cups-freiburg/etc/cups/printers.conf @@ -168,3 +168,22 @@ KLimit 0 OpPolicy default ErrorPolicy abort-job + +UUID urn:uuid:5409dd74-e2fe-354e-5f95-a1c9187cbc5e +AuthInfoRequired none +Info Rechenzentrum 1.OG, Farbdrucker, nicht öffentlich! +Location Rechenzentrum H.-Herder-Str., 1. Obergeschoss, Raum 117 +MakeModel Dell 3100cn Foomatic/Postscript +DeviceURI ipp://vm-pri.ruf.uni-freiburg.de:631/RZKCOLOR +State Idle +StateTime 1390844591 +Type 8400924 +Accepting Yes +Shared Yes +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy stop-printer + -- cgit v1.2.3-55-g7522 From 368943b673bdcfc4ae89409ed55454b7d05d98ac Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Tue, 4 Feb 2014 16:02:55 +0100 Subject: [freiburg-config] Better name f. printer --- .../cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd | 197 +++++++++++++++++++++ .../modules/cups-freiburg/etc/cups/printers.conf | 8 +- 2 files changed, 201 insertions(+), 4 deletions(-) create mode 100644 server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd (limited to 'server/modules') diff --git a/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd new file mode 100644 index 00000000..7fdf40ad --- /dev/null +++ b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd @@ -0,0 +1,197 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Dell-3100cn-Postscript.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "POSTSCRI.PPD" +*Manufacturer: "Dell" +*Product: "(Laser Printer 3100cn)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Dell 3100cn" +*ShortNickName: "Dell 3100cn Postscript" +*NickName: "Dell 3100cn Foomatic/Postscript" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "MFG:Dell;MDL:Laser Printer 3100cn;CMD:PJL,RASTER,DOWNLOAD,PCLXL,PCL,POSTSCRIPT;DES:Dell Laser Printer 3100cn;DRV:DPostscript,R0,M0,TP;" + +*driverName Postscript/Postscript: "" +*driverType P/PostScript: "" +*driverUrl: "http://partners.adobe.com/public/developer/ps/index_specs.html" +*driverObsolete: False + + + + +*VariablePaperSize: False + +*FoomaticIDs: Dell-3100cn Postscript +*FoomaticRIPCommandLine: "cat%A%B%Z" +*FoomaticRIPNoPageAccounting: True + +*OpenGroup: General/General + +*OpenUI *PageSize/Page Size: PickOne +*OrderDependency: 100 AnySetup *PageSize +*DefaultPageSize: A4 +*PageSize A4/A4: "<>setpagedevice" +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize 11x17/11x17: "<>setpagedevice" +*PageSize A3/A3: "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize B5/B5 (JIS): "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC5/Envelope C5: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" +*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageSize Executive/Executive: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 100 AnySetup *PageRegion +*DefaultPageRegion: A4 +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion 11x17/11x17: "<>setpagedevice" +*PageRegion A3/A3: "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion B5/B5 (JIS): "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC5/Envelope C5: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" +*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" +*PageRegion Executive/Executive: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*CloseUI: *PageRegion + +*DefaultImageableArea: A4 +*ImageableArea A4/A4: "18 36 577 806" +*ImageableArea Letter/US Letter: "18 36 594 756" +*ImageableArea 11x17/11x17: "18 36 774 1188" +*ImageableArea A3/A3: "18 36 824 1155" +*ImageableArea A5/A5: "18 36 403 559" +*ImageableArea B5/B5 (JIS): "18 36 498 693" +*ImageableArea Env10/Envelope #10: "18 36 279 648" +*ImageableArea EnvC5/Envelope C5: "18 36 441 613" +*ImageableArea EnvDL/Envelope DL: "18 36 294 588" +*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673" +*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" +*ImageableArea Executive/Executive: "18 36 504 720" +*ImageableArea Legal/US Legal: "18 36 594 972" + +*DefaultPaperDimension: A4 +*PaperDimension A4/A4: "595 842" +*PaperDimension Letter/US Letter: "612 792" +*PaperDimension 11x17/11x17: "792 1224" +*PaperDimension A3/A3: "842 1191" +*PaperDimension A5/A5: "421 595" +*PaperDimension B5/B5 (JIS): "516 729" +*PaperDimension Env10/Envelope #10: "297 684" +*PaperDimension EnvC5/Envelope C5: "459 649" +*PaperDimension EnvDL/Envelope DL: "312 624" +*PaperDimension EnvISOB5/Envelope B5: "499 709" +*PaperDimension EnvMonarch/Envelope Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension Legal/US Legal: "612 1008" + +*OpenUI *Resolution/Resolution: PickOne +*OrderDependency: 110 AnySetup *Resolution +*DefaultResolution: Unknown +*Resolution 150x150dpi/150 DPI: "<>setpagedevice" +*Resolution 300x300dpi/300 DPI: "<>setpagedevice" +*Resolution 600x600dpi/600 DPI: "<>setpagedevice" +*Resolution 1200x1200dpi/1200 DPI: "<>setpagedevice" +*CloseUI: *Resolution + +*OpenUI *Duplex/Double-Sided Printing: PickOne +*OrderDependency: 130 AnySetup *Duplex +*DefaultDuplex: DuplexTumble +*Duplex DuplexNoTumble/Long Edge (Standard): "<>setpagedevice" +*Duplex DuplexTumble/Short Edge (Flip): "<>setpagedevice" +*Duplex None/Off: "<>setpagedevice" +*CloseUI: *Duplex + +*CloseGroup: General + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff --git a/server/modules/cups-freiburg/etc/cups/printers.conf b/server/modules/cups-freiburg/etc/cups/printers.conf index 2dd9791e..b487522d 100644 --- a/server/modules/cups-freiburg/etc/cups/printers.conf +++ b/server/modules/cups-freiburg/etc/cups/printers.conf @@ -168,11 +168,11 @@ KLimit 0 OpPolicy default ErrorPolicy abort-job - + UUID urn:uuid:5409dd74-e2fe-354e-5f95-a1c9187cbc5e AuthInfoRequired none -Info Rechenzentrum 1.OG, Farbdrucker, nicht öffentlich! -Location Rechenzentrum H.-Herder-Str., 1. Obergeschoss, Raum 117 +Info interner Drucker - nicht oeffentlich! +Location RZ/OG/117 MakeModel Dell 3100cn Foomatic/Postscript DeviceURI ipp://vm-pri.ruf.uni-freiburg.de:631/RZKCOLOR State Idle @@ -185,5 +185,5 @@ QuotaPeriod 0 PageLimit 0 KLimit 0 OpPolicy default -ErrorPolicy stop-printer +ErrorPolicy abort-job -- cgit v1.2.3-55-g7522 From a3339867c7f85e0c92fee09234a32e8cd7c9125e Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Tue, 4 Feb 2014 16:50:52 +0100 Subject: [freiburg-config] -ppd, old ppd for Dell 1. OG --- .../etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd | 197 --------------------- 1 file changed, 197 deletions(-) delete mode 100644 server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd (limited to 'server/modules') diff --git a/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd b/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd deleted file mode 100644 index 7fdf40ad..00000000 --- a/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd +++ /dev/null @@ -1,197 +0,0 @@ -*PPD-Adobe: "4.3" -*% -*% For information on using this, and to obtain the required backend -*% script, consult http://www.openprinting.org/ -*% -*% This file is published under the GNU General Public License -*% -*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with -*% all programs and environments which use PPD files for dealing with -*% printer capability information. The printer must be configured with the -*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This -*% file and "foomatic-rip" work together to support PPD-controlled printer -*% driver option access with arbitrary free software printer drivers and -*% printing spoolers. -*% -*% To save this file on your disk, wait until the download has completed -*% (the animation of the browser logo must stop) and then use the -*% "Save as..." command in the "File" menu of your browser or in the -*% pop-up manu when you click on this document with the right mouse button. -*% DO NOT cut and paste this file into an editor with your mouse. This can -*% introduce additional line breaks which lead to unexpected results. -*% -*% You may save this file as 'Dell-3100cn-Postscript.ppd' -*% -*% -*FormatVersion: "4.3" -*FileVersion: "1.1" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PCFileName: "POSTSCRI.PPD" -*Manufacturer: "Dell" -*Product: "(Laser Printer 3100cn)" -*cupsVersion: 1.0 -*cupsManualCopies: True -*cupsModelNumber: 2 -*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" -*%pprRIP: foomatic-rip other -*ModelName: "Dell 3100cn" -*ShortNickName: "Dell 3100cn Postscript" -*NickName: "Dell 3100cn Foomatic/Postscript" -*PSVersion: "(3010.000) 550" -*PSVersion: "(3010.000) 651" -*PSVersion: "(3010.000) 652" -*PSVersion: "(3010.000) 653" -*PSVersion: "(3010.000) 704" -*PSVersion: "(3010.000) 705" -*PSVersion: "(3010.000) 800" -*LanguageLevel: "3" -*ColorDevice: True -*DefaultColorSpace: RGB -*FileSystem: False -*Throughput: "1" -*LandscapeOrientation: Plus90 -*TTRasterizer: Type42 -*1284DeviceID: "MFG:Dell;MDL:Laser Printer 3100cn;CMD:PJL,RASTER,DOWNLOAD,PCLXL,PCL,POSTSCRIPT;DES:Dell Laser Printer 3100cn;DRV:DPostscript,R0,M0,TP;" - -*driverName Postscript/Postscript: "" -*driverType P/PostScript: "" -*driverUrl: "http://partners.adobe.com/public/developer/ps/index_specs.html" -*driverObsolete: False - - - - -*VariablePaperSize: False - -*FoomaticIDs: Dell-3100cn Postscript -*FoomaticRIPCommandLine: "cat%A%B%Z" -*FoomaticRIPNoPageAccounting: True - -*OpenGroup: General/General - -*OpenUI *PageSize/Page Size: PickOne -*OrderDependency: 100 AnySetup *PageSize -*DefaultPageSize: A4 -*PageSize A4/A4: "<>setpagedevice" -*PageSize Letter/US Letter: "<>setpagedevice" -*PageSize 11x17/11x17: "<>setpagedevice" -*PageSize A3/A3: "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize B5/B5 (JIS): "<>setpagedevice" -*PageSize Env10/Envelope #10: "<>setpagedevice" -*PageSize EnvC5/Envelope C5: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" -*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" -*PageSize Executive/Executive: "<>setpagedevice" -*PageSize Legal/US Legal: "<>setpagedevice" -*CloseUI: *PageSize - -*OpenUI *PageRegion: PickOne -*OrderDependency: 100 AnySetup *PageRegion -*DefaultPageRegion: A4 -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion Letter/US Letter: "<>setpagedevice" -*PageRegion 11x17/11x17: "<>setpagedevice" -*PageRegion A3/A3: "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion B5/B5 (JIS): "<>setpagedevice" -*PageRegion Env10/Envelope #10: "<>setpagedevice" -*PageRegion EnvC5/Envelope C5: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" -*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" -*PageRegion Executive/Executive: "<>setpagedevice" -*PageRegion Legal/US Legal: "<>setpagedevice" -*CloseUI: *PageRegion - -*DefaultImageableArea: A4 -*ImageableArea A4/A4: "18 36 577 806" -*ImageableArea Letter/US Letter: "18 36 594 756" -*ImageableArea 11x17/11x17: "18 36 774 1188" -*ImageableArea A3/A3: "18 36 824 1155" -*ImageableArea A5/A5: "18 36 403 559" -*ImageableArea B5/B5 (JIS): "18 36 498 693" -*ImageableArea Env10/Envelope #10: "18 36 279 648" -*ImageableArea EnvC5/Envelope C5: "18 36 441 613" -*ImageableArea EnvDL/Envelope DL: "18 36 294 588" -*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673" -*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" -*ImageableArea Executive/Executive: "18 36 504 720" -*ImageableArea Legal/US Legal: "18 36 594 972" - -*DefaultPaperDimension: A4 -*PaperDimension A4/A4: "595 842" -*PaperDimension Letter/US Letter: "612 792" -*PaperDimension 11x17/11x17: "792 1224" -*PaperDimension A3/A3: "842 1191" -*PaperDimension A5/A5: "421 595" -*PaperDimension B5/B5 (JIS): "516 729" -*PaperDimension Env10/Envelope #10: "297 684" -*PaperDimension EnvC5/Envelope C5: "459 649" -*PaperDimension EnvDL/Envelope DL: "312 624" -*PaperDimension EnvISOB5/Envelope B5: "499 709" -*PaperDimension EnvMonarch/Envelope Monarch: "279 540" -*PaperDimension Executive/Executive: "522 756" -*PaperDimension Legal/US Legal: "612 1008" - -*OpenUI *Resolution/Resolution: PickOne -*OrderDependency: 110 AnySetup *Resolution -*DefaultResolution: Unknown -*Resolution 150x150dpi/150 DPI: "<>setpagedevice" -*Resolution 300x300dpi/300 DPI: "<>setpagedevice" -*Resolution 600x600dpi/600 DPI: "<>setpagedevice" -*Resolution 1200x1200dpi/1200 DPI: "<>setpagedevice" -*CloseUI: *Resolution - -*OpenUI *Duplex/Double-Sided Printing: PickOne -*OrderDependency: 130 AnySetup *Duplex -*DefaultDuplex: DuplexTumble -*Duplex DuplexNoTumble/Long Edge (Standard): "<>setpagedevice" -*Duplex DuplexTumble/Short Edge (Flip): "<>setpagedevice" -*Duplex None/Off: "<>setpagedevice" -*CloseUI: *Duplex - -*CloseGroup: General - - -*% Generic boilerplate PPD stuff as standard PostScript fonts and so on - -*DefaultFont: Courier -*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM -*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM -*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM -*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM -*Font Bookman-Demi: Standard "(001.004S)" Standard ROM -*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM -*Font Bookman-Light: Standard "(001.004S)" Standard ROM -*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM -*Font Courier: Standard "(002.004S)" Standard ROM -*Font Courier-Bold: Standard "(002.004S)" Standard ROM -*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM -*Font Courier-Oblique: Standard "(002.004S)" Standard ROM -*Font Helvetica: Standard "(001.006S)" Standard ROM -*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM -*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM -*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM -*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM -*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM -*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM -*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM -*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM -*Font Palatino-Bold: Standard "(001.005S)" Standard ROM -*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM -*Font Palatino-Italic: Standard "(001.005S)" Standard ROM -*Font Palatino-Roman: Standard "(001.005S)" Standard ROM -*Font Symbol: Special "(001.007S)" Special ROM -*Font Times-Bold: Standard "(001.007S)" Standard ROM -*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM -*Font Times-Italic: Standard "(001.007S)" Standard ROM -*Font Times-Roman: Standard "(001.007S)" Standard ROM -*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM -*Font ZapfDingbats: Special "(001.004S)" Standard ROM - -- cgit v1.2.3-55-g7522 From 077bbe211a42f2ca1cf511f387dd61c34529dbb3 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 4 Feb 2014 16:51:08 +0100 Subject: [pam-fr] dont delete WIP file while its beeing sent --- .../pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'server/modules') diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent index 8b75b810..9f48d98d 100644 --- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent +++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent @@ -39,8 +39,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then fi SIGNAL=$(mktemp) + MOUNT_OUTPUT=$(mktemp) rm -f -- "${SIGNAL}" - ( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) & + ( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "$MOUNT_OUTPUT" 2>&1 || touch "${SIGNAL}" ) & MOUNT_PID=$! for COUNTER in 1 2 4 4; do kill -0 "${MOUNT_PID}" 2>/dev/null || break @@ -48,14 +49,14 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then done if [ -e "${SIGNAL}" ]; then - slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" + slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "$MOUNT_OUTPUT" rm -f -- "${SIGNAL}" elif kill -9 "${MOUNT_PID}" 2>/dev/null; then - slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" + slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "$MOUNT_OUTPUT" else PERSISTENT_OK=yes fi - rm -f -- "/tmp/home.$PAM_USER" + ( sleep 2; rm -f -- "$MOUNT_OUTPUT" ) & fi -- cgit v1.2.3-55-g7522 From 44883de473af5b6f287e43cfe8cc4eb3ba7557ce Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Tue, 4 Feb 2014 17:30:27 +0100 Subject: [cups-freiburg] ZRZ_DELL.ppd patched: cat path hardcoded as cat's not found (should be ameliorated, as hard coded paths are evil). --- server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/modules') diff --git a/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd index 7fdf40ad..6e042097 100644 --- a/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd +++ b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd @@ -65,7 +65,7 @@ *VariablePaperSize: False *FoomaticIDs: Dell-3100cn Postscript -*FoomaticRIPCommandLine: "cat%A%B%Z" +*FoomaticRIPCommandLine: "/opt/openslx/bin/cat%A%B%Z" *FoomaticRIPNoPageAccounting: True *OpenGroup: General/General -- cgit v1.2.3-55-g7522 From 49914e9d2800ffd683fdbb5bee33ee9ceacd1d1d Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 5 Feb 2014 14:07:35 +0100 Subject: [config] add config module to fix pulseaudio not exiting --- .../etc/pulse/daemon.conf | 87 ++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf (limited to 'server/modules') diff --git a/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf b/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf new file mode 100644 index 00000000..e96f3cf4 --- /dev/null +++ b/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf @@ -0,0 +1,87 @@ +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values are commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +allow-exit = yes +; use-pid-file = yes +; system-instance = no +; local-server-type = user +; enable-shm = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +; realtime-scheduling = yes +; realtime-priority = 5 + +exit-idle-time = 0 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = /etc/pulse/default.pa + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +resample-method = speex-float-1 +; enable-remixing = yes +; enable-lfe-remixing = no + +flat-volumes = no + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 1000000 + +; default-sample-format = s16le +; default-sample-rate = 44100 +; alternate-sample-rate = 48000 +; default-sample-channels = 2 +; default-channel-map = front-left,front-right + +default-fragments = 8 +default-fragment-size-msec = 10 + +; enable-deferred-volume = yes +deferred-volume-safety-margin-usec = 1 +; deferred-volume-extra-delay-usec = 0 -- cgit v1.2.3-55-g7522 From 807fef41a83dda69b526cde8ebe1fcdc953910bf Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 5 Feb 2014 14:09:04 +0100 Subject: renamed --- .../etc/pulse/daemon.conf | 87 ++++++++++++++++++++++ .../etc/pulse/daemon.conf | 87 ---------------------- 2 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf delete mode 100644 server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf (limited to 'server/modules') diff --git a/server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf b/server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf new file mode 100644 index 00000000..e96f3cf4 --- /dev/null +++ b/server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf @@ -0,0 +1,87 @@ +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values are commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +allow-exit = yes +; use-pid-file = yes +; system-instance = no +; local-server-type = user +; enable-shm = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +; realtime-scheduling = yes +; realtime-priority = 5 + +exit-idle-time = 0 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = /etc/pulse/default.pa + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +resample-method = speex-float-1 +; enable-remixing = yes +; enable-lfe-remixing = no + +flat-volumes = no + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 1000000 + +; default-sample-format = s16le +; default-sample-rate = 44100 +; alternate-sample-rate = 48000 +; default-sample-channels = 2 +; default-channel-map = front-left,front-right + +default-fragments = 8 +default-fragment-size-msec = 10 + +; enable-deferred-volume = yes +deferred-volume-safety-margin-usec = 1 +; deferred-volume-extra-delay-usec = 0 diff --git a/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf b/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf deleted file mode 100644 index e96f3cf4..00000000 --- a/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf +++ /dev/null @@ -1,87 +0,0 @@ -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for -## more information. Default values are commented out. Use either ; or # for -## commenting. - -; daemonize = no -; fail = yes -; allow-module-loading = yes -allow-exit = yes -; use-pid-file = yes -; system-instance = no -; local-server-type = user -; enable-shm = yes -; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB -; lock-memory = no -; cpu-limit = no - -; high-priority = yes -; nice-level = -11 - -; realtime-scheduling = yes -; realtime-priority = 5 - -exit-idle-time = 0 -; scache-idle-time = 20 - -; dl-search-path = (depends on architecture) - -; load-default-script-file = yes -; default-script-file = /etc/pulse/default.pa - -; log-target = auto -; log-level = notice -; log-meta = no -; log-time = no -; log-backtrace = 0 - -resample-method = speex-float-1 -; enable-remixing = yes -; enable-lfe-remixing = no - -flat-volumes = no - -; rlimit-fsize = -1 -; rlimit-data = -1 -; rlimit-stack = -1 -; rlimit-core = -1 -; rlimit-as = -1 -; rlimit-rss = -1 -; rlimit-nproc = -1 -; rlimit-nofile = 256 -; rlimit-memlock = -1 -; rlimit-locks = -1 -; rlimit-sigpending = -1 -; rlimit-msgqueue = -1 -; rlimit-nice = 31 -; rlimit-rtprio = 9 -; rlimit-rttime = 1000000 - -; default-sample-format = s16le -; default-sample-rate = 44100 -; alternate-sample-rate = 48000 -; default-sample-channels = 2 -; default-channel-map = front-left,front-right - -default-fragments = 8 -default-fragment-size-msec = 10 - -; enable-deferred-volume = yes -deferred-volume-safety-margin-usec = 1 -; deferred-volume-extra-delay-usec = 0 -- cgit v1.2.3-55-g7522