From 64991348daac7c12b991a071bd9db712869ef72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20G=C3=BCmpelein?= Date: Thu, 27 Jan 2022 20:30:35 +0100 Subject: [PATCH] example configuration --- .../LastenradBay_Standortpfeil_blau_03a.png | Bin 0 -> 1183 bytes .../LastenradBay_Standortpfeil_blau_03a.svg | 57 +++++ .../LastenradBay_Standortpfeil_gruen_03a.png | Bin 0 -> 1183 bytes .../LastenradBay_Standortpfeil_gruen_03a.svg | 32 +++ ...enradBay_Standortpfeil_klenze-blau_03a.png | Bin 0 -> 1183 bytes ...enradBay_Standortpfeil_klenze-blau_03a.svg | 57 +++++ .../LastenradBay_Standortpfeil_rot_03a.png | Bin 0 -> 1183 bytes .../LastenradBay_Standortpfeil_rot_03a.svg | 32 +++ copri4/main/src/Mod/Indexsharee.pm | 6 +- copri4/main/src/Mod/KMLout.pm | 16 +- copri4/main/src/Mod/NodeEdit.pm | 15 +- copri4/main/src/Mod/Prelib.pm | 9 +- .../apache/shareeapp-operator.conf | 22 +- copri4/shareeconf/apikeys.cfg | 2 +- copri4/shareeconf/examples/apikeys.cfg | 11 + copri4/shareeconf/examples/global.cfg | 195 ++++++++++++++++++ copri4/shareeconf/examples/mailx.cfg | 10 + copri4/shareeconf/global.cfg | 2 +- copri4/shareeconf/mailx.cfg | 2 +- .../apache/shareedms-operator.conf | 20 +- copri4/shareeweb-project/apache/index.html | 35 ---- .../apache/shareeweb-operator.conf | 115 ++++++++++- .../apache/shareeweb-operator_devel.conf | 114 ---------- 23 files changed, 563 insertions(+), 189 deletions(-) create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_blau_03a.png create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_blau_03a.svg create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_gruen_03a.png create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_gruen_03a.svg create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_klenze-blau_03a.png create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_klenze-blau_03a.svg create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_rot_03a.png create mode 100755 copri4/main/img/LastenradBay_Standortpfeil_rot_03a.svg create mode 100644 copri4/shareeconf/examples/apikeys.cfg create mode 100644 copri4/shareeconf/examples/global.cfg create mode 100644 copri4/shareeconf/examples/mailx.cfg delete mode 100644 copri4/shareeweb-project/apache/index.html mode change 120000 => 100644 copri4/shareeweb-project/apache/shareeweb-operator.conf delete mode 100644 copri4/shareeweb-project/apache/shareeweb-operator_devel.conf diff --git a/copri4/main/img/LastenradBay_Standortpfeil_blau_03a.png b/copri4/main/img/LastenradBay_Standortpfeil_blau_03a.png new file mode 100755 index 0000000000000000000000000000000000000000..6b608d4dcafc07d6bf2b78aaf1cfaa3b8a614500 GIT binary patch literal 1183 zcmV;Q1YrA#P)6!WMRN-L*6gX$I*r9KDm51sVO2+rzMS+M^=95y>e9nO#?c5EVekt0HQo*4@vrp&UqWCfJuM zRwPBqq=X>C481Q^Cga|ig7jg?v9)#`@WKFw7G;6DS3lYy@)k z{Equl#fs#n(%i{QH0{EggosVDG>mdf^oyhl<>`_zdhkdXA}@+U&$RcXik+xQ`Dq#5 zsyyiJw9{?f9OJS=jsY?c)6>koBB?ToYsS&FjO<*}a1^5NBj>}YFIB8aQk(aV?r6W% z3lb$wJPM)Co6nl(NtJ06g30w`4}SWnSDp~J2_brJeW|i}H$PT2;amwrv|0^&72KI3 z&b_jk9+vaRvB8vJ2vI*o9y!p$aI}yhO&BautzgI0aI83ND#+OVnqIN7saLbg)P3a$ zTW{C$djWzAYT->NWA^MJ&$coX;%y%8N+}+)#-dgIjiS>RfmF|ZO(EUti`*tiGrEk1 zTK#9>*Ia~sKE#M!vOhGbdr-{MLK5wq+x_KGTF1Ba`oxp3nVud3C?*}Fuq zHaTOXVp@R{?II?7ibH+|^f>@!DzWt6WzF)g5c z{Q+|(k13|aC;&~JZB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/copri4/main/img/LastenradBay_Standortpfeil_gruen_03a.png b/copri4/main/img/LastenradBay_Standortpfeil_gruen_03a.png new file mode 100755 index 0000000000000000000000000000000000000000..14b49997ac3576a38fbe6793daa1b40747d7b3da GIT binary patch literal 1183 zcmV;Q1YrA#P)?000tnQchF<|NsC0 z|NsC0|NsC0|NsC00OG&D5&!@L;Ymb6RCwCdn%R6!WMRN-L*6gX$I*r9KDm51sVO2+rzMS+M^=95y>e9nO#?c5EVekt0HQo*4@vrp&UqWCfJuM zRwPBqq=X>C481Q^Cga|ig7jg?v9)#`@WKFw7G;6DS3lYy@)k z{Equl#fs#n(%i{QH0{EggosVDG>mdf^oyhl<>`_zdhkdXA}@+U&$RcXik+xQ`Dq#5 zsyyiJw9{?f9OJS=jsY?c)6>koBB?ToYsS&FjO<*}a1^5NBj>}YFIB8aQk(aV?r6W% z3lb$wJPM)Co6nl(NtJ06g30w`4}SWnSDp~J2_brJeW|i}H$PT2;amwrv|0^&72KI3 z&b_jk9+vaRvB8vJ2vI*o9y!p$aI}yhO&BautzgI0aI83ND#+OVnqIN7saLbg)P3a$ zTW{C$djWzAYT->NWA^MJ&$coX;%y%8N+}+)#-dgIjiS>RfmF|ZO(EUti`*tiGrEk1 zTK#9>*Ia~sKE#M!vOhGbdr-{MLK5wq+x_KGTF1Ba`oxp3nVud3C?*}Fuq zHaTOXVp@R{?II?7ibH+|^f>@!DzWt6WzF)g5c z{Q+|(k13|aC;&~JZB + + + + + + + + + + + + + + + diff --git a/copri4/main/img/LastenradBay_Standortpfeil_klenze-blau_03a.png b/copri4/main/img/LastenradBay_Standortpfeil_klenze-blau_03a.png new file mode 100755 index 0000000000000000000000000000000000000000..e89273c2ef017e57d5cbebe14595f828624a04a0 GIT binary patch literal 1183 zcmV;Q1YrA#P)MO^v+pB)w#RCbx3p1gFG z)p`shmjnbd+rZ5V?yLipfxrtwHV3>!WMRN-L*6gX$I*r9KDm51sVO2+rzMS+M^=95y>e9nO#?c5EVekt0HQo*4@vrp&UqWCfJuM zRwPBqq=X>C481Q^Cga|ig7jg?v9)#`@WKFw7G;6DS3lYy@)k z{Equl#fs#n(%i{QH0{EggosVDG>mdf^oyhl<>`_zdhkdXA}@+U&$RcXik+xQ`Dq#5 zsyyiJw9{?f9OJS=jsY?c)6>koBB?ToYsS&FjO<*}a1^5NBj>}YFIB8aQk(aV?r6W% z3lb$wJPM)Co6nl(NtJ06g30w`4}SWnSDp~J2_brJeW|i}H$PT2;amwrv|0^&72KI3 z&b_jk9+vaRvB8vJ2vI*o9y!p$aI}yhO&BautzgI0aI83ND#+OVnqIN7saLbg)P3a$ zTW{C$djWzAYT->NWA^MJ&$coX;%y%8N+}+)#-dgIjiS>RfmF|ZO(EUti`*tiGrEk1 zTK#9>*Ia~sKE#M!vOhGbdr-{MLK5wq+x_KGTF1Ba`oxp3nVud3C?*}Fuq zHaTOXVp@R{?II?7ibH+|^f>@!DzWt6WzF)g5c z{Q+|(k13|aC;&~JZB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/copri4/main/img/LastenradBay_Standortpfeil_rot_03a.png b/copri4/main/img/LastenradBay_Standortpfeil_rot_03a.png new file mode 100755 index 0000000000000000000000000000000000000000..e862100f63795523584bde688d5bddc0d3471649 GIT binary patch literal 1183 zcmV;Q1YrA#P)vV%|6pMM z-{1f5@Bbhm{}2%WpP&EF&;L+R|1dEBkB|Saum5mx0001=J@i8W000tnQchF<|NsC0 z|NsC0|NsC0|NsC00OG&D5&!@L;Ymb6RCwCdn%R%oL?>0*TzrI|%0* zS3pT%Q3$)55G#UkHD1$uNaE%pbLv41lDc<=aHz=10E8mP@Nv1%jIS8P30UaZcwSfW zMax}DK-jWk_tqK0r5U8hc)a>xZBiGx4rR#9NG@8^Fz)jq&ro`%9@AtFpN0@2c=A&s z5O3-U2n7HLhHO~K*he4_wepRZ8boG7Ic99Z7fJ-8B1ymXQ;o3+<)|&05NiJYSf>^< zQ$vc93F*wAsb3`L6lC;6ZV$uSX^)EZMkJ>cWOiK%LR0`DuZpOVT6aIghH@ainP6Y4 zSdkPZlM;dmGxWYxnT&g53etxm(<+o$2!idLb6=`hkz@%74ne3p(%qThSF<9yBp}oW zx$8S*qfPKfs^CK;V@8}wxkC^c@kp#kBCvowMY2O;Mnfh<^ll<*%50<2Ba+86yLG#Z zQ^Ttt#x9K}Nl;wIt(I5MH-DNt->WJMCG8S7``!7xwYOrR8GvJuGD z^E>WK6)TdPN^>VK(XwI ztMZ_?(@wW_bBxOhIR?l)OiwfSiloXUt{F$yGO}|?!%>L7kDL#qzErUyNp0Rcx}*J4 zFG!R$@hF5kZ$4|DCsn3R2qxE$J^1OPUU@>?CWPp@^`*+@-TYY9gmWbf(P}m9Rd8pD zIQPnCdRWdM#|Be^Aw>NUdE`I~!_h*5G-0qrwSpZ}!?EJ9sUTzbYkI}Tre4h|Q}>l4 zY`tB}?*#}hsD(G7jM=k?Jlo1lh_`vTE2VhI8jDu-H;PVQ1X4ZsHHCDmFLIk8&FC^3 zYW1IiUvm-m`4A&^$^Ou!?m;n23rVzdZubjeRu3x7B4RP7q8gGdwx-O)uBNxuJ4Vq( z4nb!1+T2R*NbChD%4^uc%5KGc5+XPCVghGx2=?=i*(<7y4IHkT=E99fysB0kXYUfd z+T_gL?`lD*-{^d^Y5P|Y*_!cpJKUeytN+ZY!)MM<>L_1%-1MP?v(Fp>mQlX?#I%6& z^#{zElz(v^pF#OIpD!dR?Y{PS$M~L4O2U-3AIJD9vNc53Gi1pZLBIVik%uCG2O=vO xWe{1%D1^u=Mkz$rFp43vf>92U + + + + + + + + + + + + + + + diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm index 27137fa..b50ea1b 100755 --- a/copri4/main/src/Mod/Indexsharee.pm +++ b/copri4/main/src/Mod/Indexsharee.pm @@ -310,6 +310,7 @@ sub handler { #permissions #DMS Kunden rw if($R::base_edit && $node_meta->{ct_table} eq "contentadr"){ + $bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table}|$R::c_id with: $R::base_edit","",""); if($R::c_id && $R::base_edit eq "remove_chk4rel"){ my $delete_key = "delete_content"; $delete_key = "delete_adr"; @@ -325,6 +326,7 @@ sub handler { #DMS users accounts if($R::base_edit && $node_meta->{ct_table} eq "users"){#DMS-Account rw + $bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table} with: $R::base_edit","",""); if($R::u_id && $R::base_edit eq "remove_chk4rel"){#users my $delete_key = "delete_dmsusers"; $return = "failure::Datensatz wirklich löschen. ::?base_edit=$delete_key\&exit_box2=1\&u_id=$R::u_id ::löschen"; @@ -339,6 +341,7 @@ sub handler { #DMS Waren || Einstellung/Service* rw if($node_meta->{ct_table} eq "content" || $node_meta->{ct_table} eq "contentuser"){ + $bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table}|$R::main_id with: $R::rel_edit","",""); if(($node_meta->{ct_table} eq "content" && $users_dms->{int01} == 2) || ($node_meta->{ct_table} eq "contentuser" && $users_dms->{int08} == 2)){ if($R::rel_edit eq "save_relation" && $R::main_id && $R::main_id >= 200000){ $return = $pl->save_relation($R::main_id,$users_dms->{u_id}); @@ -346,7 +349,7 @@ sub handler { $return = $pl->delete_relation($R::main_id,$users_dms->{u_id}); }elsif($R::rel_edit eq "new_relation" && $R::main_id && $R::main_id >= 200000){ $return = $pl->new_relation($R::main_id,$users_dms->{u_id}); - }else{ + }elsif($R::rel_edit && $R::main_id && $R::main_id >= 200000){ $return = $pm->maininit($users_dms); } }elsif($R::rel_edit){ @@ -356,6 +359,7 @@ sub handler { #DMS Faktura if($node_meta->{ct_table} eq "contenttrans"){ + $bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table}|$R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans with: $R::ct_trans","",""); if($users_dms->{int03} == 1 && $R::ct_trans eq "open"){#DMS Faktura read $db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id}) if($R::c_id4trans && $R::tpl_id4trans); }elsif($users_dms->{int03} == 2){#DMS Faktura rw diff --git a/copri4/main/src/Mod/KMLout.pm b/copri4/main/src/Mod/KMLout.pm index 10d9bfc..6308bb9 100755 --- a/copri4/main/src/Mod/KMLout.pm +++ b/copri4/main/src/Mod/KMLout.pm @@ -78,6 +78,14 @@ sub kmlGenerator { $project = $dbt->{website}->{$varenv->{syshost}}->{project} if($dbt->{website}->{$varenv->{syshost}}->{project}); $project = $dbt->{operator}->{$varenv->{dbname}}->{project} if($dbt->{operator}->{$varenv->{dbname}}->{project}); #print "$project | $varenv->{syshost} | $users_sharee->{c_id} | $authcookie->{authcookie}"; + my $icon_green = "Open_Green.png"; + my $icon_red = "Open_Red.png"; + my $icon_blue = "Open_Blue.png"; + if($project eq "Bayern"){ + $icon_green = "LastenradBay_Standortpfeil_gruen_03a.png"; + $icon_red = "LastenradBay_Standortpfeil_rot_03a.png"; + $icon_blue = "LastenradBay_Standortpfeil_blau_03a.png"; + } my $timestamp = strftime "%Y%m%d%H%M%S", localtime; my $kmlfile = "sharee-$timestamp-$users_sharee->{c_id}.kml"; @@ -122,7 +130,7 @@ sub kmlGenerator { foreach my $station (keys (%{ $response_stations->{shareejson}->{stations} })) { $station_hash->{$station} = $response_stations->{shareejson}->{stations}->{$station}; - $place_pin{$station} = "Open_Red.png"; + $place_pin{$station} = $icon_red; my $station_desc = "Mietradstation $station"; if($response_stations->{shareejson}->{stations}->{$station}->{description}){ $station_desc = "Mietradstation: $response_stations->{shareejson}->{stations}->{$station}->{description} $station"; @@ -156,19 +164,19 @@ sub kmlGenerator { #if Lastenrad if($station_groupID == $lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){ - $place_pin{$station} = "Open_Green.png"; + $place_pin{$station} = $icon_green; $place_desc{$station} .= "

• Lastenrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike

"; #print "($station) Lastenrad $bike\n"; } #if E-Lastenrad if($station_groupID == $e_lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){ - $place_pin{$station} = "Open_Green.png"; + $place_pin{$station} = $icon_green; $place_desc{$station} .= "

• E-Lastenrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike

"; #print "($station) E-Lastenrad $bike\n"; } #if Stadtrad if($station_groupID == $stadtrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){ - $place_pin{$station} = "Open_Green.png"; + $place_pin{$station} = $icon_green; $place_desc{$station} .= "

• Stadtrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike

"; #print "($station) Stadtrad $bike\n"; } diff --git a/copri4/main/src/Mod/NodeEdit.pm b/copri4/main/src/Mod/NodeEdit.pm index 2b1fc3a..71ec02b 100755 --- a/copri4/main/src/Mod/NodeEdit.pm +++ b/copri4/main/src/Mod/NodeEdit.pm @@ -120,6 +120,14 @@ sub admin_tpl(){ #content container print "
$superu_id"; + + print $q->hidden(-name=>'last_node_name', -value=>"$node_meta->{node_name}"); + print $q->hidden(-name=>'owner', -value=>"$users_dms->{u_id}"); + print $q->hidden(-name=>'parent_id', -value=>"$node_meta->{parent_id}"); + print $q->hidden(-name=>'main_id', -value=>"$node_meta->{main_id}"); + print $q->hidden(-name=>'template_id', -value=>"$node_meta->{template_id}"); + print $q->hidden(-name=>'mode', -value=>"admin"); + print $q->start_table({-style=>'margin-top:6px;', -border=>'0', -width=>'100%', -align=>'left', -cellpadding=>'3', -cellspacing=>'3'}); print $q->Tr(); if(1==1){ @@ -137,13 +145,6 @@ sub admin_tpl(){ print $q->span({-style=>'margin-left:5em; font-size:0.91em;'}, "$u_name / $change") if($u_name); print "\n"; - print $q->hidden(-name=>'last_node_name', -value=>"$node_meta->{node_name}"); - print $q->hidden(-name=>'owner', -value=>"$users_dms->{u_id}"); - print $q->hidden(-name=>'parent_id', -value=>"$node_meta->{parent_id}"); - print $q->hidden(-name=>'main_id', -value=>"$node_meta->{main_id}"); - print $q->hidden(-name=>'mode', -value=>"admin"); - - print $q->Tr(); print $q->td({-colspan=>'2',-style=>'padding:5px;font-style:italic;'},"Path: $path"); foreach (@tpl_order){ diff --git a/copri4/main/src/Mod/Prelib.pm b/copri4/main/src/Mod/Prelib.pm index ab649df..7fe04d3 100755 --- a/copri4/main/src/Mod/Prelib.pm +++ b/copri4/main/src/Mod/Prelib.pm @@ -233,8 +233,8 @@ sub delete_relation { my $collect_rows=0; - if($R::template_id eq "205"){ - (my $collect_node,$collect_rows) = $dbt->collect_noderel($dbh,$noderel->{parent_id},$R::template_id); + if($noderel->{template_id} == 205){ + (my $collect_node,$collect_rows) = $dbt->collect_noderel($dbh,$noderel->{parent_id},$noderel->{template_id}); } my $subrelnode = $dbt->get_subrelnode($dbh,$main_id,"",""); @@ -242,6 +242,7 @@ sub delete_relation { my $deleteable_subnode = 1; my $deleteable_node = 1; my $deleteable_last_node = 1; + #TODO, $subrelnode->{template_id} must be unique in Flotte context if($subrelnode->{template_id} >= 400 && $subrelnode->{template_id} <= 499){ $deleteable_subnode = 1; if($collect_rows <= 1){ @@ -254,7 +255,9 @@ sub delete_relation { if($ct_record->{c_id} > 0){ $deleteable_node = 0; } - print FILE "$deleteable_subnode == 0 || $deleteable_node == 0 --> collect_rows: $collect_rows|c_id: $ct_record->{c_id}\n" if($debug); + #print "$deleteable_subnode|$deleteable_node|$deleteable_last_node|$collect_rows"; + + print FILE "deleteable_subnode:$deleteable_subnode | deleteable_node:$deleteable_node | deleteable_last_node:$deleteable_last_node --> collect_rows: $collect_rows|c_id: $ct_record->{c_id}\n" if($debug); if($deleteable_last_node == 0){ $ret = "failure::Abbruch, es muss mindestens eine Mietrad Flotte definiert sein. ($collect_rows on $noderel->{parent_id})"; diff --git a/copri4/shareeapp-operator/apache/shareeapp-operator.conf b/copri4/shareeapp-operator/apache/shareeapp-operator.conf index db26787..5f45e93 100644 --- a/copri4/shareeapp-operator/apache/shareeapp-operator.conf +++ b/copri4/shareeapp-operator/apache/shareeapp-operator.conf @@ -1,6 +1,6 @@ - ServerName shareeapp-operator.copri-bike.de - ServerAlias shareeapp-operator1.copri-bike.de + ServerName shareeapp-operator.example.tld + ServerAlias shareeapp-operator1.example.tld ServerAdmin info@gnu-systems.de DocumentRoot /var/www/copri4/shareeapp-operator @@ -10,13 +10,13 @@ CustomLog /var/log/apache2/shareeapp-operator-access.log combined ServerSignature Off RewriteEngine on - RewriteCond %{SERVER_NAME} =shareeapp-operator.copri-bike.de + RewriteCond %{SERVER_NAME} =shareeapp-operator.example.tld RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] - ServerName shareeapp-operator1.copri-bike.de + ServerName shareeapp-operator1.example.tld ServerAdmin info@gnu-systems.de DocumentRoot /var/www/copri4/shareeapp-operator AddHandler cgi-script .cgi .sh .pl @@ -27,7 +27,7 @@ - Header set Access-Control-Allow-Origin "copri-bike.de" + Header set Access-Control-Allow-Origin "example.tld" @@ -50,13 +50,13 @@ ServerSignature Off Include /etc/letsencrypt/options-ssl-apache.conf -SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem +SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem - ServerName shareeapp-operator.copri-bike.de + ServerName shareeapp-operator.example.tld ServerAdmin info@gnu-systems.de DocumentRoot /var/www/copri4/shareeapp-operator @@ -96,7 +96,7 @@ SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem RedirectMatch ^/$ /app/Anmelden SSLProxyEngine On RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery) - RewriteRule ^(.*)$ https://shareeapp-operator1.copri-bike.de/$1 [P,L] + RewriteRule ^(.*)$ https://shareeapp-operator1.example.tld/$1 [P,L] ErrorLog /var/log/apache2/shareeapp-operator-error.log @@ -104,8 +104,8 @@ SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem CustomLog /var/log/apache2/shareeapp-operator-access.log combined ServerSignature Off Include /etc/letsencrypt/options-ssl-apache.conf -SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem +SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem diff --git a/copri4/shareeconf/apikeys.cfg b/copri4/shareeconf/apikeys.cfg index dc6515e..a6ddb26 120000 --- a/copri4/shareeconf/apikeys.cfg +++ b/copri4/shareeconf/apikeys.cfg @@ -1 +1 @@ -/etc/shareeconf/apikeys.cfg \ No newline at end of file +../../../../etc/shareeconf/apikeys.cfg \ No newline at end of file diff --git a/copri4/shareeconf/examples/apikeys.cfg b/copri4/shareeconf/examples/apikeys.cfg new file mode 100644 index 0000000..3d28d01 --- /dev/null +++ b/copri4/shareeconf/examples/apikeys.cfg @@ -0,0 +1,11 @@ + + google_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + + + gtx_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + + + xxxkey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg new file mode 100644 index 0000000..03bfe9f --- /dev/null +++ b/copri4/shareeconf/examples/global.cfg @@ -0,0 +1,195 @@ +#sharee global configuration +# SPDX-License-Identifier: AGPL-3.0-or-later +# Copyright (c) Rainer Gümpelein, TeilRad GmbH + +#sub is the dbname of sharee COPRI-Instanz + + + merchant_id="your-operator-merchant_id" + owner=196 + operatorApp="https://shareeapp-operator.example.tld" + operatorDMS="https://shareedms-operator.example.tld" + operatorApp1="https://shareeapp-operator1.example.tld" + operatorDMS1="https://shareedms-operator1.example.tld" + syshost="shareedms-operator" + dir_app="shareeapp-operator" + dir_dms="shareedms-operator" + oprefix="EXA" + project="Example" + app_name="sharee.bike" + hwtype="none" + bgcolor1="009899" + initMap="47.976634, 7.825490" + map_zoom="13" + + dbname=sharee_operator + host=localhost + port=5432 + sslmode= + options="" + user=[your-psql-user] + passwd=[your-psql-pw] + + + + +#sub is the syshost path of website + + + parent_id=100007 + parent_node="frame" + merchant_id="your-webproject-merchant_id" + owner=294 + operatorWeb="https://shareeweb-project.example.tld" + operatorWeb1="https://shareeweb-project1.example.tld" + dir_web="shareeweb-project" + oprefix="EXA" + project="Example" + app_name="sharee.bike" + bgcolor1="009899" + initMap="47.976634, 7.825490" + map_zoom="13" + + dbname=sharee_operator + host=localhost + port=5432 + sslmode= + options="" + user=[your-psql-user] + passwd=[your-psql-pw] + + + + + #contact TeilRad GmbH to get access to our single-sign-on with sharee.bike App + + id = 275 + name = "example App" + project="Example" + user_agent = "" + initMap = "47.976634, 7.825490" + bgcolor1 = "009899" + + + + id = 296 + name = "example DMS" + project="all" + user_agent = "" + initMap = "47.976634, 7.825490" + bgcolor1 = "009899" + + + + id = 294 + name = "example Web" + project="Example" + user_agent = "" + initMap = "47.976634, 7.825490" + bgcolor1 = "009899" + + + +#sharee copri globals + + #stage = "test" + stage = "live" + sms_to = "017xxxxxxx2" + debug = 1 + superu_id = "1234567" + logdir = "/var/log/copri4" + basedir = "/var/www/copri4" + + 300101 = "Lastenrad" + 300102 = "E-Lastenrad" + 300103 = "Stadtrad" + + + 2 = "public" + 3 = "private" + 5 = "public-bonus" + + + 1 = "available" + 2 = "requested" + 3 = "occupied" + 4 = "maintanance" + 5 = "defect" + 6 = "canceled" + + + 1 = "available" + 5 = "defect" + + + 1 = "locked" + 2 = "unlocked" + 3 = "locking" + + + 1 = "locked" + 2 = "unlocked" + + + 2 = "Ilockit" + + + 0 = "nein" + 1 = "ja" + + + 0 = "keine" + 1 = "lesen" + 2 = "lesen & schreiben" + + jsscript = "js/mobile_script.js" + jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.js" + style_jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.css" + style_bootstrap_icons = "css/bootstrap-icons-1.5.0/bootstrap-icons.css" + jquery_resize = "js/jquery.autosize.js" + + +#sharee WebApp sepcific para + + parent_id = "100005" + parent_node="app" + + start = "Profil" + profile = "Profil" + accounting_1 = "1. Kundendaten" + accounting_1_5 = "1.5. Zahlungsart" + accounting_2 = "2.0. Zahlungsdaten" + accounting_3 = "3. Verleihdaten" + + local_style = "css/local_style1344.css" + jquery = "js/jquery-1.9.1.js" + js_bootstrap = "js/bootstrap-3.3.6-dist/js/bootstrap.min.js" + style_bootstrap = "js/bootstrap-3.3.6-dist/css/bootstrap.css" + mod_active = "Fahrradmietsystem|Karte|Anmelden|Kontakt" + + +#sharee DMS/COPRI specific para + + parent_id = "100002" + parent_node="DMS" + + start = "Mietjournal" + profile = "nothing" + + waren = "200013" + kunden = "200011" + faktura = "200007" + invoicejournal = "300011" + mietjournal = "200012" + alarmjournal = "200022" + einstellung = "200019" + + term_active_color = "f7ae37" + local_style = "css/local_style_2.css" + jquery = "js/jquery-3.3.1.min.js" + js_bootstrap = "js/bootstrap-5.0.2-dist/js/bootstrap.min.js" + style_bootstrap = "js/bootstrap-5.0.2-dist/css/bootstrap.min.css" + mod_active = "Waren|Faktur|Karte|Kunden|Mietjournal|Alarmjournal|Einstellung" + modes = "login|logout|logout_sharee|user|manager|supervisor|admin|maintainer" + + diff --git a/copri4/shareeconf/examples/mailx.cfg b/copri4/shareeconf/examples/mailx.cfg new file mode 100644 index 0000000..afebeb5 --- /dev/null +++ b/copri4/shareeconf/examples/mailx.cfg @@ -0,0 +1,10 @@ +#e-mail config + + mail_to = "admin@example.tld" + mail_from = "post@example.tld" + mail_gateway = "smtp.mailxchanger.tld" + sasl_username = "post@example.tld" + sasl_password = "xxxxxxxxxxxxxxx" + + + diff --git a/copri4/shareeconf/global.cfg b/copri4/shareeconf/global.cfg index c6bb9e9..51ee1de 120000 --- a/copri4/shareeconf/global.cfg +++ b/copri4/shareeconf/global.cfg @@ -1 +1 @@ -/etc/shareeconf/global.cfg \ No newline at end of file +../../../../etc/shareeconf/global.cfg \ No newline at end of file diff --git a/copri4/shareeconf/mailx.cfg b/copri4/shareeconf/mailx.cfg index b88542f..78242db 120000 --- a/copri4/shareeconf/mailx.cfg +++ b/copri4/shareeconf/mailx.cfg @@ -1 +1 @@ -/etc/shareeconf/mailx.cfg \ No newline at end of file +../../../../etc/shareeconf/mailx.cfg \ No newline at end of file diff --git a/copri4/shareedms-operator/apache/shareedms-operator.conf b/copri4/shareedms-operator/apache/shareedms-operator.conf index 682a7b5..bb388c4 100644 --- a/copri4/shareedms-operator/apache/shareedms-operator.conf +++ b/copri4/shareedms-operator/apache/shareedms-operator.conf @@ -1,6 +1,6 @@ - ServerName shareedms-operator.copri-bike.de - ServerAlias shareedms-operator1.copri-bike.de + ServerName shareedms-operator.example.tld + ServerAlias shareedms-operator1.example.tld ServerAdmin info@gnu-systems.de DocumentRoot /var/www/copri4/shareedms-operator @@ -10,14 +10,14 @@ CustomLog /var/log/apache2/shareedms-operator-access.log combined ServerSignature Off RewriteEngine on - RewriteCond %{SERVER_NAME} =shareedms-operator.copri-bike.de + RewriteCond %{SERVER_NAME} =shareedms-operator.example.tld RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] - ServerName shareedms-operator1.copri-bike.de + ServerName shareedms-operator1.example.tld ServerAdmin info@gnu-systems.de DocumentRoot /var/www/copri4/shareedms-operator AddHandler cgi-script .cgi .sh .pl @@ -52,12 +52,12 @@ ServerSignature Off Include /etc/letsencrypt/options-ssl-apache.conf - SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem + SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem - ServerName shareedms-operator.copri-bike.de + ServerName shareedms-operator.example.tld ServerAdmin info@gnu-systems.de DocumentRoot /var/www/copri4/shareedms-operator @@ -97,7 +97,7 @@ RedirectMatch ^/$ /DMS/Mietjournal SSLProxyEngine On RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery) - RewriteRule ^(.*)$ https://shareedms-operator1.copri-bike.de/$1 [P,L] + RewriteRule ^(.*)$ https://shareedms-operator1.example.tld/$1 [P,L] ErrorLog /var/log/apache2/shareedms-operator-error.log @@ -106,8 +106,8 @@ ServerSignature Off Include /etc/letsencrypt/options-ssl-apache.conf - SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem + SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem diff --git a/copri4/shareeweb-project/apache/index.html b/copri4/shareeweb-project/apache/index.html deleted file mode 100644 index d8964f8..0000000 --- a/copri4/shareeweb-project/apache/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - iFrame message passing test - - - - - -
-
Lastenrad Bayern
- - - -
Registrieren - -
- - - - - - - - - - - -
- - diff --git a/copri4/shareeweb-project/apache/shareeweb-operator.conf b/copri4/shareeweb-project/apache/shareeweb-operator.conf deleted file mode 120000 index 3706f94..0000000 --- a/copri4/shareeweb-project/apache/shareeweb-operator.conf +++ /dev/null @@ -1 +0,0 @@ -shareeweb-operator_devel.conf \ No newline at end of file diff --git a/copri4/shareeweb-project/apache/shareeweb-operator.conf b/copri4/shareeweb-project/apache/shareeweb-operator.conf new file mode 100644 index 0000000..0fb5a3c --- /dev/null +++ b/copri4/shareeweb-project/apache/shareeweb-operator.conf @@ -0,0 +1,114 @@ + + ServerName shareeweb-project.example.tld + ServerAlias shareeweb-project1.example.tld + + ServerAdmin info@gnu-systems.de + DocumentRoot /var/www/copri4/shareeweb-project + + ErrorLog /var/log/apache2/shareeweb-project-error.log + LogLevel info ssl:warn + CustomLog /var/log/apache2/shareeweb-project-access.log combined + ServerSignature Off + RewriteEngine on + RewriteCond %{SERVER_NAME} =shareeweb-project.example.tld + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + + + + + ServerName shareeweb-project1.example.tld + + ServerAdmin info@gnu-systems.de + DocumentRoot /var/www/copri4/shareeweb-project + AddHandler cgi-script .cgi .sh .pl + + + Options -Indexes +FollowSymLinks +ExecCGI + AllowOverride None + + + + Header set Access-Control-Allow-Origin "example.tld" + + + + Options -Indexes +FollowSymLinks -ExecCGI + Order allow,deny + Allow from all + + + + Options -Indexes +FollowSymLinks + Order allow,deny + Allow from all + ForceType application/octet-stream + Header set Content-Disposition attachment + + + ErrorLog /var/log/apache2/shareeweb-project-error.log + LogLevel info ssl:warn + CustomLog /var/log/apache2/shareeweb-project-access.log combined + ServerSignature Off +Include /etc/letsencrypt/options-ssl-apache.conf + +SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem + + + + + ServerName shareeweb-project.example.tld + + ServerAdmin info@gnu-systems.de + DocumentRoot /var/www/copri4/shareeweb-project + + PerlOptions +Parent + PerlRequire /var/www/copri4/shareeweb-project/startup.pl + + + SetHandler perl-script + PerlResponseHandler Mod::Indexsharee + PerlInitHandler Apache2::Reload + PerlOptions +ParseHeaders +GlobalRequest + Options -ExecCGI +FollowSymLinks + Order allow,deny + Allow from all + + + + SetHandler perl-script + PerlInitHandler Apache2::Reload + PerlResponseHandler Mod::APIvelo + + + + SetHandler perl-script + PerlInitHandler Apache2::Reload + PerlResponseHandler Mod::APIjsonserver + + + + SetHandler perl-script + PerlInitHandler Apache2::Reload + PerlResponseHandler Mod::FileOut + + + + RewriteEngine On + RedirectMatch ^/$ /frame/Karte + SSLProxyEngine On + RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery) + RewriteRule ^(.*)$ https://shareeweb-project1.example.tld/$1 [P,L] + + + ErrorLog /var/log/apache2/shareeweb-project-error.log + LogLevel info ssl:warn + CustomLog /var/log/apache2/shareeweb-project-access.log combined + ServerSignature Off +Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/example.tld-0003/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/example.tld-0003/privkey.pem + + + + diff --git a/copri4/shareeweb-project/apache/shareeweb-operator_devel.conf b/copri4/shareeweb-project/apache/shareeweb-operator_devel.conf deleted file mode 100644 index 45a41ec..0000000 --- a/copri4/shareeweb-project/apache/shareeweb-operator_devel.conf +++ /dev/null @@ -1,114 +0,0 @@ - - ServerName shareeweb-project.copri-bike.de - ServerAlias shareeweb-project1.copri-bike.de - - ServerAdmin info@gnu-systems.de - DocumentRoot /var/www/copri4/shareeweb-project - - ErrorLog /var/log/apache2/shareeweb-project-error.log - LogLevel info ssl:warn - CustomLog /var/log/apache2/shareeweb-project-access.log combined - ServerSignature Off - RewriteEngine on - RewriteCond %{SERVER_NAME} =shareeweb-project.copri-bike.de - RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] - - - - - ServerName shareeweb-project1.copri-bike.de - - ServerAdmin info@gnu-systems.de - DocumentRoot /var/www/copri4/shareeweb-project - AddHandler cgi-script .cgi .sh .pl - - - Options -Indexes +FollowSymLinks +ExecCGI - AllowOverride None - - - - Header set Access-Control-Allow-Origin "copri-bike.de" - - - - Options -Indexes +FollowSymLinks -ExecCGI - Order allow,deny - Allow from all - - - - Options -Indexes +FollowSymLinks - Order allow,deny - Allow from all - ForceType application/octet-stream - Header set Content-Disposition attachment - - - ErrorLog /var/log/apache2/shareeweb-project-error.log - LogLevel info ssl:warn - CustomLog /var/log/apache2/shareeweb-project-access.log combined - ServerSignature Off -Include /etc/letsencrypt/options-ssl-apache.conf - -SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem - - - - - ServerName shareeweb-project.copri-bike.de - - ServerAdmin info@gnu-systems.de - DocumentRoot /var/www/copri4/shareeweb-project - - PerlOptions +Parent - PerlRequire /var/www/copri4/shareeweb-project/startup.pl - - - SetHandler perl-script - PerlResponseHandler Mod::Indexsharee - PerlInitHandler Apache2::Reload - PerlOptions +ParseHeaders +GlobalRequest - Options -ExecCGI +FollowSymLinks - Order allow,deny - Allow from all - - - - SetHandler perl-script - PerlInitHandler Apache2::Reload - PerlResponseHandler Mod::APIvelo - - - - SetHandler perl-script - PerlInitHandler Apache2::Reload - PerlResponseHandler Mod::APIjsonserver - - - - SetHandler perl-script - PerlInitHandler Apache2::Reload - PerlResponseHandler Mod::FileOut - - - - RewriteEngine On - RedirectMatch ^/$ /frame/Karte - SSLProxyEngine On - RewriteCond %{REQUEST_URI} ^/(site|img|data|css|js|jquery) - RewriteRule ^(.*)$ https://shareeweb-project1.copri-bike.de/$1 [P,L] - - - ErrorLog /var/log/apache2/shareeweb-project-error.log - LogLevel info ssl:warn - CustomLog /var/log/apache2/shareeweb-project-access.log combined - ServerSignature Off -Include /etc/letsencrypt/options-ssl-apache.conf -SSLCertificateFile /etc/letsencrypt/live/copri-bike.de-0003/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/copri-bike.de-0003/privkey.pem - - - -